Moved the language strings which are only used once

out of the core and into the modules that use them.

226 files changed, 42077 insertions, 45200 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5a910f59..2ffe7955b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,7 +220,7 @@ find_package(Gettext)
 option(USE_RUN_CC_PL "Use run-cc.pl for building" OFF)
 
 # Use the following directories as includes
-include_directories(${Anope_SOURCE_DIR}/include ${Anope_BINARY_DIR}/include ${Anope_BINARY_DIR}/lang)
+include_directories(${Anope_SOURCE_DIR}/include ${Anope_BINARY_DIR}/include ${Anope_BINARY_DIR}/language)
 
 # If using Windows, always add the _WIN32 define
 if(WIN32)
@@ -449,7 +449,7 @@ endif(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
 # Go into the following directories and run their CMakeLists.txt as well
 add_subdirectory(data)
 add_subdirectory(docs)
-add_subdirectory(lang)
+add_subdirectory(language)
 add_subdirectory(src)
 add_subdirectory(modules)
 add_subdirectory(include)
diff --git a/include/commands.h b/include/commands.h
index b05c69cbe..2b3120f29 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -71,8 +71,8 @@ struct CoreExport CommandSource
 
 	~CommandSource();
 
-	void Reply(LanguageString message, ...);
 	void Reply(const char *message, ...);
+	void Reply(const Anope::string &message);
 };
 
 /** Every services command is a class, inheriting from Command.
diff --git a/include/extern.h b/include/extern.h
index 025525186..d37fc10ee 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -53,7 +53,7 @@ E BotInfo *findbot(const Anope::string &nick);
 E Anope::string normalizeBuffer(const Anope::string &);
 
 E void check_ban(ChannelInfo *ci, User *u, int ttbtype);
-E void bot_kick(ChannelInfo *ci, User *u, LanguageString message, ...);
+E void bot_kick(ChannelInfo *ci, User *u, const char *message, ...);
 E void bot_raw_ban(User *requester, ChannelInfo *ci, const Anope::string &nick, const Anope::string &reason);
 E void bot_raw_kick(User *requester, ChannelInfo *ci, const Anope::string &nick, const Anope::string &reason);
 
@@ -140,13 +140,12 @@ E void pmodule_ircd_message(IRCdMessage *message);
 /**** language.cpp ****/
 E std::vector<Anope::string> languages;
 E void InitLanguages();
-E const Anope::string GetString(const Anope::string &language, LanguageString string);
-E const Anope::string GetString(LanguageString string);
-E const Anope::string GetString(NickCore *nc, LanguageString string);
-E const Anope::string GetString(User *u, LanguageString string);
-E const Anope::string GetString(const char *domain, Anope::string language, const Anope::string &string);
-E const char *const language_strings[LANG_STRING_COUNT];
-E void SyntaxError(CommandSource &source, const Anope::string &command, LanguageString message);
+E const Anope::string GetString(NickCore *nc, const char *string);
+E const Anope::string GetString(const Anope::string &domain, const Anope::string &lang, const char *string);
+E void PushLanguage(const Anope::string &, Anope::string);
+E void PopLanguage();
+E const char *anope_gettext(const char *string);
+E void SyntaxError(CommandSource &source, const Anope::string &command, const Anope::string &message);
 
 /*** logger.cpp ***/
 E void InitLogChannels(ServerConfig *);
diff --git a/include/language.h b/include/language.h
index cf3b8f44b..7c06745a1 100644
--- a/include/language.h
+++ b/include/language.h
@@ -1,1578 +1,120 @@
-enum LanguageString
+/* Commonly used language strings
+ *
+ * (C) 2008-2011 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+namespace LanguageString
 {
-	LANGUAGE_NAME,
-	COMMAND_REQUIRES_PERM,
-	COMMAND_IDENTIFY_REQUIRED,
-	COMMAND_CANNOT_USE,
-	COMMAND_CAN_USE,
-	COMMAND_DEPRECATED,
-	USER_RECORD_NOT_FOUND,
-	UNKNOWN_COMMAND,
-	UNKNOWN_COMMAND_HELP,
-	SYNTAX_ERROR,
-	MORE_INFO,
-	NO_HELP_AVAILABLE,
-	BAD_USERHOST_MASK,
-	BAD_EXPIRY_TIME,
-	USERHOST_MASK_TOO_WIDE,
-	SERVICE_OFFLINE,
-	READ_ONLY_MODE,
-	PASSWORD_INCORRECT,
-	INVALID_TARGET,
-	ACCESS_DENIED,
-	MORE_OBSCURE_PASSWORD,
-	PASSWORD_TOO_LONG,
-	NICK_NOT_REGISTERED,
-	NICK_X_IS_SERVICES,
-	NICK_X_NOT_REGISTERED,
-	NICK_X_IN_USE,
-	NICK_X_NOT_IN_USE,
-	NICK_X_NOT_ON_CHAN,
-	NICK_X_FORBIDDEN,
-	NICK_X_FORBIDDEN_OPER,
-	NICK_X_ILLEGAL,
-	NICK_X_TRUNCATED,
-	NICK_X_SUSPENDED,
-	CHAN_X_NOT_REGISTERED,
-	CHAN_X_NOT_IN_USE,
-	CHAN_X_FORBIDDEN,
-	CHAN_X_FORBIDDEN_OPER,
-	CHAN_X_SUSPENDED,
-	NICK_IDENTIFY_REQUIRED,
-	MAIL_DISABLED,
-	MAIL_INVALID,
-	MAIL_X_INVALID,
-	MAIL_LATER,
-	MAIL_DELAYED,
-	NO_REASON,
-	UNKNOWN,
-	DURATION_DAY,
-	DURATION_DAYS,
-	DURATION_HOUR,
-	DURATION_HOURS,
-	DURATION_MINUTE,
-	DURATION_MINUTES,
-	DURATION_SECOND,
-	DURATION_SECONDS,
-	NO_EXPIRE,
-	EXPIRES_SOON,
-	EXPIRES_M,
-	EXPIRES_1M,
-	EXPIRES_HM,
-	EXPIRES_H1M,
-	EXPIRES_1HM,
-	EXPIRES_1H1M,
-	EXPIRES_D,
-	EXPIRES_1D,
-	END_OF_ANY_LIST,
-	LIST_INCORRECT_RANGE,
-	CS_LIST_INCORRECT_RANGE,
-	NICK_IS_REGISTERED,
-	NICK_IS_SECURE,
-	NICK_MAY_NOT_BE_USED,
-	FORCENICKCHANGE_IN_1_MINUTE,
-	FORCENICKCHANGE_IN_20_SECONDS,
-	FORCENICKCHANGE_NOW,
-	FORCENICKCHANGE_CHANGING,
-	NICK_REGISTER_SYNTAX,
-	NICK_REGISTER_SYNTAX_EMAIL,
-	NICK_REGISTRATION_DISABLED,
-	NICK_REGISTRATION_FAILED,
-	NICK_REG_PLEASE_WAIT,
-	NICK_CANNOT_BE_REGISTERED,
-	NICK_ALREADY_REGISTERED,
-	NICK_REGISTERED,
-	NICK_REGISTERED_NO_MASK,
-	NICK_PASSWORD_IS,
-	NICK_REG_DELAY,
-	NICK_GROUP_SYNTAX,
-	NICK_GROUP_DISABLED,
-	NICK_GROUP_PLEASE_WAIT,
-	NICK_GROUP_CHANGE_DISABLED,
-	NICK_GROUP_SAME,
-	NICK_GROUP_TOO_MANY,
-	NICK_GROUP_JOINED,
-	NICK_UNGROUP_ONE_NICK,
-	NICK_UNGROUP_NOT_IN_GROUP,
-	NICK_UNGROUP_SUCCESSFUL,
-	NICK_IDENTIFY_SYNTAX,
-	NICK_IDENTIFY_FAILED,
-	NICK_IDENTIFY_SUCCEEDED,
-	NICK_IDENTIFY_EMAIL_REQUIRED,
-	NICK_IDENTIFY_EMAIL_HOWTO,
-	NICK_ALREADY_IDENTIFIED,
-	NICK_UPDATE_SUCCESS,
-	NICK_LOGOUT_SYNTAX,
-	NICK_LOGOUT_SUCCEEDED,
-	NICK_LOGOUT_X_SUCCEEDED,
-	NICK_LOGOUT_SERVICESADMIN,
-	NICK_DROP_DISABLED,
-	NICK_DROPPED,
-	NICK_X_DROPPED,
-	NICK_SET_SYNTAX,
-	NICK_SET_DISABLED,
-	NICK_SET_UNKNOWN_OPTION,
-	NICK_SET_OPTION_DISABLED,
-	NICK_SET_DISPLAY_CHANGED,
-	NICK_SET_LANGUAGE_SYNTAX,
-	NICK_SET_LANGUAGE_CHANGED,
-	NICK_SET_EMAIL_UNSET,
-	NICK_SET_EMAIL_UNSET_IMPOSSIBLE,
-	NICK_SET_KILL_SYNTAX,
-	NICK_SET_KILL_IMMED_SYNTAX,
-	NICK_SET_KILL_IMMED,
-	NICK_SET_KILL_IMMED_DISABLED,
-	NICK_SET_SECURE_SYNTAX,
-	NICK_SET_PRIVATE_SYNTAX,
-	NICK_SET_HIDE_SYNTAX,
-	NICK_SET_MSG_SYNTAX,
-	NICK_SET_AUTOOP_SYNTAX,
-	NICK_SASET_SYNTAX,
-	NICK_SASET_UNKNOWN_OPTION,
-	NICK_SASET_BAD_NICK,
-	NICK_SASET_DISPLAY_INVALID,
-	NICK_SASET_PASSWORD_FAILED,
-	NICK_SASET_PASSWORD_CHANGED,
-	NICK_SASET_PASSWORD_CHANGED_TO,
-	NICK_SASET_EMAIL_CHANGED,
-	NICK_SASET_EMAIL_UNSET,
-	NICK_SASET_GREET_CHANGED,
-	NICK_SASET_GREET_UNSET,
-	NICK_SASET_KILL_SYNTAX,
-	NICK_SASET_KILL_IMMED_SYNTAX,
-	NICK_SASET_KILL_ON,
-	NICK_SASET_KILL_QUICK,
-	NICK_SASET_KILL_IMMED,
-	NICK_SASET_KILL_OFF,
-	NICK_SASET_SECURE_SYNTAX,
-	NICK_SASET_SECURE_ON,
-	NICK_SASET_SECURE_OFF,
-	NICK_SASET_PRIVATE_SYNTAX,
-	NICK_SASET_PRIVATE_ON,
-	NICK_SASET_PRIVATE_OFF,
-	NICK_SASET_HIDE_SYNTAX,
-	NICK_SASET_HIDE_EMAIL_ON,
-	NICK_SASET_HIDE_EMAIL_OFF,
-	NICK_SASET_HIDE_MASK_ON,
-	NICK_SASET_HIDE_MASK_OFF,
-	NICK_SASET_HIDE_QUIT_ON,
-	NICK_SASET_HIDE_QUIT_OFF,
-	NICK_SASET_HIDE_STATUS_ON,
-	NICK_SASET_HIDE_STATUS_OFF,
-	NICK_SASET_MSG_SYNTAX,
-	NICK_SASET_MSG_ON,
-	NICK_SASET_MSG_OFF,
-	NICK_SASET_NOEXPIRE_SYNTAX,
-	NICK_SASET_NOEXPIRE_ON,
-	NICK_SASET_NOEXPIRE_OFF,
-	NICK_SASET_AUTOOP_SYNTAX,
-	NICK_SASET_AUTOOP_ON,
-	NICK_SASET_AUTOOP_OFF,
-	NICK_SASET_LANGUAGE_SYNTAX,
-	NICK_ACCESS_SYNTAX,
-	NICK_ACCESS_ALREADY_PRESENT,
-	NICK_ACCESS_REACHED_LIMIT,
-	NICK_ACCESS_ADDED,
-	NICK_ACCESS_NOT_FOUND,
-	NICK_ACCESS_DELETED,
-	NICK_ACCESS_LIST,
-	NICK_ACCESS_LIST_X,
-	NICK_ACCESS_LIST_EMPTY,
-	NICK_ACCESS_LIST_X_EMPTY,
-	NICK_AJOIN_SYNTAX,
-	NICK_AJOIN_LIST_EMPTY,
-	NICK_AJOIN_LIST_HEAD,
-	NICK_AJOIN_LIST_FULL,
-	NICK_AJOIN_ADDED,
-	NICK_AJOIN_NOTFOUND,
-	NICK_AJOIN_DELETED,
-	NICK_STATUS_REPLY,
-	NICK_INFO_SYNTAX,
-	NICK_INFO_REALNAME,
-	NICK_INFO_SERVICES_OPERTYPE,
-	NICK_INFO_ADDRESS,
-	NICK_INFO_ADDRESS_ONLINE,
-	NICK_INFO_ADDRESS_ONLINE_NOHOST,
-	NICK_INFO_TIME_REGGED,
-	NICK_INFO_LAST_SEEN,
-	NICK_INFO_LAST_QUIT,
-	NICK_INFO_EMAIL,
-	NICK_INFO_VHOST,
-	NICK_INFO_VHOST2,
-	NICK_INFO_GREET,
-	NICK_INFO_OPTIONS,
-	NICK_INFO_EXPIRE,
-	NICK_INFO_OPT_KILL,
-	NICK_INFO_OPT_SECURE,
-	NICK_INFO_OPT_PRIVATE,
-	NICK_INFO_OPT_MSG,
-	NICK_INFO_OPT_AUTOOP,
-	NICK_INFO_OPT_NONE,
-	NICK_INFO_NO_EXPIRE,
-	NICK_INFO_SUSPENDED,
-	NICK_INFO_SUSPENDED_NO_REASON,
-	NICK_LIST_SYNTAX,
-	NICK_LIST_SERVADMIN_SYNTAX,
-	NICK_LIST_HEADER,
-	NICK_LIST_RESULTS,
-	NICK_ALIST_HEADER,
-	NICK_ALIST_HEADER_X,
-	NICK_ALIST_XOP_FORMAT,
-	NICK_ALIST_ACCESS_FORMAT,
-	NICK_ALIST_FOOTER,
-	NICK_GLIST_HEADER,
-	NICK_GLIST_HEADER_X,
-	NICK_GLIST_FOOTER,
-	NICK_GLIST_REPLY,
-	NICK_GLIST_REPLY_NOEXPIRE,
-	NICK_RECOVER_SYNTAX,
-	NICK_NO_RECOVER_SELF,
-	NICK_RECOVERED,
-	NICK_RELEASE_SYNTAX,
-	NICK_RELEASE_NOT_HELD,
-	NICK_RELEASED,
-	NICK_GHOST_SYNTAX,
-	NICK_NO_GHOST_SELF,
-	NICK_GHOST_KILLED,
-	NICK_GHOST_UNIDENTIFIED,
-	NICK_GETPASS_SYNTAX,
-	NICK_GETPASS_UNAVAILABLE,
-	NICK_GETPASS_PASSWORD_IS,
-	NICK_GETEMAIL_SYNTAX,
-	NICK_GETEMAIL_EMAILS_ARE,
-	NICK_GETEMAIL_NOT_USED,
-	NICK_SENDPASS_SYNTAX,
-	NICK_SENDPASS_UNAVAILABLE,
-	NICK_SENDPASS_SUBJECT,
-	NICK_SENDPASS,
-	NICK_SENDPASS_OK,
-	NICK_RESETPASS_SYNTAX,
-	NICK_RESETPASS_SUBJECT,
-	NICK_RESETPASS_MESSAGE,
-	NICK_RESETPASS_COMPLETE,
-	NICK_SUSPEND_SYNTAX,
-	NICK_SUSPEND_SUCCEEDED,
-	NICK_UNSUSPEND_SYNTAX,
-	NICK_UNSUSPEND_SUCCEEDED,
-	NICK_FORBID_SYNTAX,
-	NICK_FORBID_SYNTAX_REASON,
-	NICK_FORBID_SUCCEEDED,
-	NICK_REQUESTED,
-	NICK_REG_RESENT,
-	NICK_REG_UNABLE,
-	NICK_IS_PREREG,
-	NICK_ENTER_REG_CODE,
-	NICK_GETPASS_PASSCODE_IS,
-	NICK_FORCE_REG,
-	NICK_REG_MAIL_SUBJECT,
-	NICK_REG_MAIL,
-	NICK_CONFIRM_NOT_FOUND,
-	NICK_CONFIRM_INVALID,
-	NICK_CONFIRM_EXPIRED,
-	NICK_CONFIRM_SUCCESS,
-	CHAN_LEVEL_AUTOOP,
-	CHAN_LEVEL_AUTOVOICE,
-	CHAN_LEVEL_AUTOHALFOP,
-	CHAN_LEVEL_AUTOPROTECT,
-	CHAN_LEVEL_NOJOIN,
-	CHAN_LEVEL_INVITE,
-	CHAN_LEVEL_AKICK,
-	CHAN_LEVEL_SET,
-	CHAN_LEVEL_CLEARUSERS,
-	CHAN_LEVEL_UNBAN,
-	CHAN_LEVEL_OPDEOP,
-	CHAN_LEVEL_ACCESS_LIST,
-	CHAN_LEVEL_ACCESS_CHANGE,
-	CHAN_LEVEL_MEMO,
-	CHAN_LEVEL_ASSIGN,
-	CHAN_LEVEL_BADWORDS,
-	CHAN_LEVEL_NOKICK,
-	CHAN_LEVEL_FANTASIA,
-	CHAN_LEVEL_SAY,
-	CHAN_LEVEL_GREET,
-	CHAN_LEVEL_VOICEME,
-	CHAN_LEVEL_VOICE,
-	CHAN_LEVEL_GETKEY,
-	CHAN_LEVEL_OPDEOPME,
-	CHAN_LEVEL_HALFOPME,
-	CHAN_LEVEL_HALFOP,
-	CHAN_LEVEL_PROTECTME,
-	CHAN_LEVEL_PROTECT,
-	CHAN_LEVEL_KICKME,
-	CHAN_LEVEL_KICK,
-	CHAN_LEVEL_SIGNKICK,
-	CHAN_LEVEL_BANME,
-	CHAN_LEVEL_BAN,
-	CHAN_LEVEL_TOPIC,
-	CHAN_LEVEL_MODE,
-	CHAN_LEVEL_INFO,
-	CHAN_LEVEL_AUTOOWNER,
-	CHAN_LEVEL_OWNER,
-	CHAN_LEVEL_OWNERME,
-	CHAN_LEVEL_FOUNDER,
-	CHAN_IS_REGISTERED,
-	CHAN_MAY_NOT_BE_USED,
-	CHAN_NOT_ALLOWED_TO_JOIN,
-	CHAN_X_INVALID,
-	CHAN_REGISTER_SYNTAX,
-	CHAN_REGISTER_DISABLED,
-	CHAN_REGISTER_NOT_LOCAL,
-	CHAN_MAY_NOT_BE_REGISTERED,
-	CHAN_ALREADY_REGISTERED,
-	CHAN_MUST_BE_CHANOP,
-	CHAN_REACHED_CHANNEL_LIMIT,
-	CHAN_EXCEEDED_CHANNEL_LIMIT,
-	CHAN_REGISTERED,
-	CHAN_SYMBOL_REQUIRED,
-	CHAN_DROP_SYNTAX,
-	CHAN_DROP_DISABLED,
-	CHAN_DROPPED,
-	CHAN_SASET_SYNTAX,
-	CHAN_SASET_KEEPTOPIC_SYNTAX,
-	CHAN_SASET_OPNOTICE_SYNTAX,
-	CHAN_SASET_PEACE_SYNTAX,
-	CHAN_SASET_PERSIST_SYNTAX,
-	CHAN_SASET_PRIVATE_SYNTAX,
-	CHAN_SASET_RESTRICTED_SYNTAX,
-	CHAN_SASET_SECURE_SYNTAX,
-	CHAN_SASET_SECUREFOUNDER_SYNTAX,
-	CHAN_SASET_SECUREOPS_SYNTAX,
-	CHAN_SASET_SIGNKICK_SYNTAX,
-	CHAN_SASET_TOPICLOCK_SYNTAX,
-	CHAN_SASET_XOP_SYNTAX,
-	CHAN_SET_SYNTAX,
-	CHAN_SET_DISABLED,
-	CHAN_SETTING_CHANGED,
-	CHAN_SETTING_UNSET,
-	CHAN_SET_FOUNDER_TOO_MANY_CHANS,
-	CHAN_FOUNDER_CHANGED,
-	CHAN_SUCCESSOR_CHANGED,
-	CHAN_SUCCESSOR_UNSET,
-	CHAN_SUCCESSOR_IS_FOUNDER,
-	CHAN_DESC_CHANGED,
-	CHAN_SET_BANTYPE_INVALID,
-	CHAN_SET_BANTYPE_CHANGED,
-	CHAN_SET_MLOCK_DEPRECATED,
-	CHAN_SET_KEEPTOPIC_SYNTAX,
-	CHAN_SET_KEEPTOPIC_ON,
-	CHAN_SET_KEEPTOPIC_OFF,
-	CHAN_SET_TOPICLOCK_SYNTAX,
-	CHAN_SET_TOPICLOCK_ON,
-	CHAN_SET_TOPICLOCK_OFF,
-	CHAN_SET_PEACE_SYNTAX,
-	CHAN_SET_PEACE_ON,
-	CHAN_SET_PEACE_OFF,
-	CHAN_SET_PRIVATE_SYNTAX,
-	CHAN_SET_PRIVATE_ON,
-	CHAN_SET_PRIVATE_OFF,
-	CHAN_SET_SECUREOPS_SYNTAX,
-	CHAN_SET_SECUREOPS_ON,
-	CHAN_SET_SECUREOPS_OFF,
-	CHAN_SET_SECUREFOUNDER_SYNTAX,
-	CHAN_SET_SECUREFOUNDER_ON,
-	CHAN_SET_SECUREFOUNDER_OFF,
-	CHAN_SET_RESTRICTED_SYNTAX,
-	CHAN_SET_RESTRICTED_ON,
-	CHAN_SET_RESTRICTED_OFF,
-	CHAN_SET_SECURE_SYNTAX,
-	CHAN_SET_SECURE_ON,
-	CHAN_SET_SECURE_OFF,
-	CHAN_SET_SIGNKICK_SYNTAX,
-	CHAN_SET_SIGNKICK_ON,
-	CHAN_SET_SIGNKICK_LEVEL,
-	CHAN_SET_SIGNKICK_OFF,
-	CHAN_SET_OPNOTICE_SYNTAX,
-	CHAN_SET_OPNOTICE_ON,
-	CHAN_SET_OPNOTICE_OFF,
-	CHAN_SET_XOP_SYNTAX,
-	CHAN_SET_XOP_ON,
-	CHAN_SET_XOP_OFF,
-	CHAN_SET_PERSIST_SYNTAX,
-	CHAN_SET_PERSIST_ON,
-	CHAN_SET_PERSIST_OFF,
-	CHAN_SET_NOEXPIRE_SYNTAX,
-	CHAN_SET_NOEXPIRE_ON,
-	CHAN_SET_NOEXPIRE_OFF,
-	CHAN_XOP_REACHED_LIMIT,
-	CHAN_XOP_LIST_FORMAT,
-	CHAN_XOP_ACCESS,
-	CHAN_XOP_NOT_AVAILABLE,
-	CHAN_QOP_SYNTAX,
-	CHAN_QOP_DISABLED,
-	CHAN_QOP_ADDED,
-	CHAN_QOP_MOVED,
-	CHAN_QOP_NO_SUCH_ENTRY,
-	CHAN_QOP_NOT_FOUND,
-	CHAN_QOP_NO_MATCH,
-	CHAN_QOP_DELETED,
-	CHAN_QOP_DELETED_ONE,
-	CHAN_QOP_DELETED_SEVERAL,
-	CHAN_QOP_LIST_EMPTY,
-	CHAN_QOP_LIST_HEADER,
-	CHAN_QOP_CLEAR,
-	CHAN_AOP_SYNTAX,
-	CHAN_AOP_DISABLED,
-	CHAN_AOP_ADDED,
-	CHAN_AOP_MOVED,
-	CHAN_AOP_NO_SUCH_ENTRY,
-	CHAN_AOP_NOT_FOUND,
-	CHAN_AOP_NO_MATCH,
-	CHAN_AOP_DELETED,
-	CHAN_AOP_DELETED_ONE,
-	CHAN_AOP_DELETED_SEVERAL,
-	CHAN_AOP_LIST_EMPTY,
-	CHAN_AOP_LIST_HEADER,
-	CHAN_AOP_CLEAR,
-	CHAN_HOP_SYNTAX,
-	CHAN_HOP_DISABLED,
-	CHAN_HOP_ADDED,
-	CHAN_HOP_MOVED,
-	CHAN_HOP_NO_SUCH_ENTRY,
-	CHAN_HOP_NOT_FOUND,
-	CHAN_HOP_NO_MATCH,
-	CHAN_HOP_DELETED,
-	CHAN_HOP_DELETED_ONE,
-	CHAN_HOP_DELETED_SEVERAL,
-	CHAN_HOP_LIST_EMPTY,
-	CHAN_HOP_LIST_HEADER,
-	CHAN_HOP_CLEAR,
-	CHAN_SOP_SYNTAX,
-	CHAN_SOP_DISABLED,
-	CHAN_SOP_ADDED,
-	CHAN_SOP_MOVED,
-	CHAN_SOP_NO_SUCH_ENTRY,
-	CHAN_SOP_NOT_FOUND,
-	CHAN_SOP_NO_MATCH,
-	CHAN_SOP_DELETED,
-	CHAN_SOP_DELETED_ONE,
-	CHAN_SOP_DELETED_SEVERAL,
-	CHAN_SOP_LIST_EMPTY,
-	CHAN_SOP_LIST_HEADER,
-	CHAN_SOP_CLEAR,
-	CHAN_VOP_SYNTAX,
-	CHAN_VOP_DISABLED,
-	CHAN_VOP_ADDED,
-	CHAN_VOP_MOVED,
-	CHAN_VOP_NO_SUCH_ENTRY,
-	CHAN_VOP_NOT_FOUND,
-	CHAN_VOP_NO_MATCH,
-	CHAN_VOP_DELETED,
-	CHAN_VOP_DELETED_ONE,
-	CHAN_VOP_DELETED_SEVERAL,
-	CHAN_VOP_LIST_EMPTY,
-	CHAN_VOP_LIST_HEADER,
-	CHAN_VOP_CLEAR,
-	CHAN_ACCESS_SYNTAX,
-	CHAN_ACCESS_XOP,
-	CHAN_ACCESS_XOP_HOP,
-	CHAN_ACCESS_DISABLED,
-	CHAN_ACCESS_LEVEL_NONZERO,
-	CHAN_ACCESS_LEVEL_RANGE,
-	CHAN_ACCESS_REACHED_LIMIT,
-	CHAN_ACCESS_LEVEL_UNCHANGED,
-	CHAN_ACCESS_LEVEL_CHANGED,
-	CHAN_ACCESS_ADDED,
-	CHAN_ACCESS_NOT_FOUND,
-	CHAN_ACCESS_NO_MATCH,
-	CHAN_ACCESS_DELETED,
-	CHAN_ACCESS_DELETED_ONE,
-	CHAN_ACCESS_DELETED_SEVERAL,
-	CHAN_ACCESS_LIST_EMPTY,
-	CHAN_ACCESS_LIST_HEADER,
-	CHAN_ACCESS_LIST_FOOTER,
-	CHAN_ACCESS_LIST_XOP_FORMAT,
-	CHAN_ACCESS_LIST_AXS_FORMAT,
-	CHAN_ACCESS_CLEAR,
-	CHAN_ACCESS_VIEW_XOP_FORMAT,
-	CHAN_ACCESS_VIEW_AXS_FORMAT,
-	CHAN_AKICK_SYNTAX,
-	CHAN_AKICK_DISABLED,
-	CHAN_AKICK_ALREADY_EXISTS,
-	CHAN_AKICK_REACHED_LIMIT,
-	CHAN_AKICK_ADDED,
-	CHAN_AKICK_NOT_FOUND,
-	CHAN_AKICK_NO_MATCH,
-	CHAN_AKICK_DELETED,
-	CHAN_AKICK_DELETED_ONE,
-	CHAN_AKICK_DELETED_SEVERAL,
-	CHAN_AKICK_LIST_EMPTY,
-	CHAN_AKICK_LIST_HEADER,
-	CHAN_AKICK_LIST_FORMAT,
-	CHAN_AKICK_VIEW_FORMAT,
-	CHAN_AKICK_LAST_USED,
-	CHAN_AKICK_ENFORCE_DONE,
-	CHAN_AKICK_CLEAR,
-	CHAN_LEVELS_SYNTAX,
-	CHAN_LEVELS_XOP,
-	CHAN_LEVELS_RANGE,
-	CHAN_LEVELS_CHANGED,
-	CHAN_LEVELS_CHANGED_FOUNDER,
-	CHAN_LEVELS_UNKNOWN,
-	CHAN_LEVELS_DISABLED,
-	CHAN_LEVELS_LIST_HEADER,
-	CHAN_LEVELS_LIST_DISABLED,
-	CHAN_LEVELS_LIST_FOUNDER,
-	CHAN_LEVELS_LIST_NORMAL,
-	CHAN_LEVELS_RESET,
-	CHAN_STATUS_SYNTAX,
-	CHAN_STATUS_NOT_REGGED,
-	CHAN_STATUS_NOTONLINE,
-	CHAN_STATUS_INFO,
-	CHAN_INFO_SYNTAX,
-	CHAN_INFO_HEADER,
-	CHAN_INFO_NO_FOUNDER,
-	CHAN_INFO_NO_SUCCESSOR,
-	CHAN_INFO_DESCRIPTION,
-	CHAN_INFO_TIME_REGGED,
-	CHAN_INFO_LAST_USED,
-	CHAN_INFO_LAST_TOPIC,
-	CHAN_INFO_TOPIC_SET_BY,
-	CHAN_INFO_BANTYPE,
-	CHAN_INFO_OPT_KEEPTOPIC,
-	CHAN_INFO_OPT_OPNOTICE,
-	CHAN_INFO_OPT_PEACE,
-	CHAN_INFO_OPT_RESTRICTED,
-	CHAN_INFO_OPT_SECURE,
-	CHAN_INFO_OPT_SECUREOPS,
-	CHAN_INFO_OPT_SECUREFOUNDER,
-	CHAN_INFO_OPT_SIGNKICK,
-	CHAN_INFO_OPT_TOPICLOCK,
-	CHAN_INFO_OPT_XOP,
-	CHAN_INFO_OPT_PERSIST,
-	CHAN_INFO_MODE_LOCK,
-	CHAN_INFO_EXPIRE,
-	CHAN_INFO_NO_EXPIRE,
-	CHAN_LIST_END,
-	CHAN_INVITE_SYNTAX,
-	CHAN_INVITE_ALREADY_IN,
-	CHAN_INVITE_SUCCESS,
-	CHAN_INVITE_OTHER_SUCCESS,
-	CHAN_UNBAN_SYNTAX,
-	CHAN_UNBANNED,
-	CHAN_UNBANNED_OTHER,
-	CHAN_TOPIC_SYNTAX,
-	CHAN_CLEARUSERS_SYNTAX,
-	CHAN_CLEARED_USERS,
-	CHAN_CLONED,
-	CHAN_CLONED_ACCESS,
-	CHAN_CLONED_AKICK,
-	CHAN_CLONED_BADWORDS,
-	CHAN_CLONE_SYNTAX,
-	CHAN_GETKEY_SYNTAX,
-	CHAN_GETKEY_NOKEY,
-	CHAN_GETKEY_KEY,
-	CHAN_FORBID_SYNTAX,
-	CHAN_FORBID_SYNTAX_REASON,
-	CHAN_FORBID_SUCCEEDED,
-	CHAN_FORBID_REASON,
-	CHAN_SUSPEND_SYNTAX,
-	CHAN_SUSPEND_SYNTAX_REASON,
-	CHAN_SUSPEND_SUCCEEDED,
-	CHAN_SUSPEND_REASON,
-	CHAN_UNSUSPEND_SYNTAX,
-	CHAN_UNSUSPEND_ERROR,
-	CHAN_UNSUSPEND_SUCCEEDED,
-	CHAN_UNSUSPEND_FAILED,
-	CHAN_EXCEPTED,
-	CHAN_OP_SYNTAX,
-	CHAN_HALFOP_SYNTAX,
-	CHAN_VOICE_SYNTAX,
-	CHAN_PROTECT_SYNTAX,
-	CHAN_OWNER_SYNTAX,
-	CHAN_DEOP_SYNTAX,
-	CHAN_DEHALFOP_SYNTAX,
-	CHAN_DEVOICE_SYNTAX,
-	CHAN_DEPROTECT_SYNTAX,
-	CHAN_DEOWNER_SYNTAX,
-	CHAN_KICK_SYNTAX,
-	CHAN_BAN_SYNTAX,
-	CHAN_MODE_SYNTAX,
-	CHAN_MODE_LOCK_UNKNOWN,
-	CHAN_MODE_LOCK_MISSING_PARAM,
-	CHAN_MODE_LOCK_NONE,
-	CHAN_MODE_LOCK_HEADER,
-	CHAN_MODE_LOCKED,
-	CHAN_MODE_NOT_LOCKED,
-	CHAN_MODE_UNLOCKED,
-	CHAN_MODE_LIST_FMT,
-	CHAN_ENTRYMSG_LIST_HEADER,
-	CHAN_ENTRYMSG_LIST_ENTRY,
-	CHAN_ENTRYMSG_LIST_END,
-	CHAN_ENTRYMSG_LIST_EMPTY,
-	CHAN_ENTRYMSG_LIST_FULL,
-	CHAN_ENTRYMSG_ADDED,
-	CHAN_ENTRYMSG_DELETED,
-	CHAN_ENTRYMSG_NOT_FOUND,
-	CHAN_ENTRYMSG_CLEARED,
-	CHAN_ENTRYMSG_SYNTAX,
-	MEMO_HAVE_NEW_MEMO,
-	MEMO_HAVE_NEW_MEMOS,
-	MEMO_TYPE_READ_LAST,
-	MEMO_TYPE_READ_NUM,
-	MEMO_TYPE_LIST_NEW,
-	MEMO_AT_LIMIT,
-	MEMO_OVER_LIMIT,
-	MEMO_X_MANY_NOTICE,
-	MEMO_X_ONE_NOTICE,
-	MEMO_NEW_X_MEMO_ARRIVED,
-	MEMO_NEW_MEMO_ARRIVED,
-	MEMO_HAVE_NO_MEMOS,
-	MEMO_X_HAS_NO_MEMOS,
-	MEMO_SEND_SYNTAX,
-	MEMO_SENDALL_SYNTAX,
-	MEMO_SEND_DISABLED,
-	MEMO_SEND_PLEASE_WAIT,
-	MEMO_X_GETS_NO_MEMOS,
-	MEMO_X_HAS_TOO_MANY_MEMOS,
-	MEMO_SENT,
-	MEMO_MASS_SENT,
-	MEMO_STAFF_SYNTAX,
-	MEMO_CANCEL_SYNTAX,
-	MEMO_CANCEL_NONE,
-	MEMO_CANCELLED,
-	MEMO_LIST_SYNTAX,
-	MEMO_HAVE_NO_NEW_MEMOS,
-	MEMO_X_HAS_NO_NEW_MEMOS,
-	MEMO_LIST_MEMOS,
-	MEMO_LIST_NEW_MEMOS,
-	MEMO_LIST_CHAN_MEMOS,
-	MEMO_LIST_CHAN_NEW_MEMOS,
-	MEMO_LIST_HEADER,
-	MEMO_LIST_FORMAT,
-	MEMO_READ_SYNTAX,
-	MEMO_HEADER,
-	MEMO_CHAN_HEADER,
-	MEMO_TEXT,
-	MEMO_DEL_SYNTAX,
-	MEMO_DELETED_ONE,
-	MEMO_DELETED_ALL,
-	MEMO_CHAN_DELETED_ALL,
-	MEMO_SET_DISABLED,
-	MEMO_SET_NOTIFY_SYNTAX,
-	MEMO_SET_NOTIFY_ON,
-	MEMO_SET_NOTIFY_LOGON,
-	MEMO_SET_NOTIFY_NEW,
-	MEMO_SET_NOTIFY_OFF,
-	MEMO_SET_NOTIFY_MAIL,
-	MEMO_SET_NOTIFY_NOMAIL,
-	MEMO_SET_NOTIFY_INVALIDMAIL,
-	MEMO_SET_LIMIT_SYNTAX,
-	MEMO_SET_LIMIT_SERVADMIN_SYNTAX,
-	MEMO_SET_YOUR_LIMIT_FORBIDDEN,
-	MEMO_SET_LIMIT_FORBIDDEN,
-	MEMO_SET_YOUR_LIMIT_TOO_HIGH,
-	MEMO_SET_LIMIT_TOO_HIGH,
-	MEMO_SET_LIMIT_OVERFLOW,
-	MEMO_SET_YOUR_LIMIT,
-	MEMO_SET_YOUR_LIMIT_ZERO,
-	MEMO_UNSET_YOUR_LIMIT,
-	MEMO_SET_LIMIT,
-	MEMO_SET_LIMIT_ZERO,
-	MEMO_UNSET_LIMIT,
-	MEMO_INFO_NO_MEMOS,
-	MEMO_INFO_MEMO,
-	MEMO_INFO_MEMO_UNREAD,
-	MEMO_INFO_MEMOS,
-	MEMO_INFO_MEMOS_ONE_UNREAD,
-	MEMO_INFO_MEMOS_SOME_UNREAD,
-	MEMO_INFO_MEMOS_ALL_UNREAD,
-	MEMO_INFO_LIMIT,
-	MEMO_INFO_HARD_LIMIT,
-	MEMO_INFO_LIMIT_ZERO,
-	MEMO_INFO_HARD_LIMIT_ZERO,
-	MEMO_INFO_NO_LIMIT,
-	MEMO_INFO_NOTIFY_OFF,
-	MEMO_INFO_NOTIFY_ON,
-	MEMO_INFO_NOTIFY_RECEIVE,
-	MEMO_INFO_NOTIFY_SIGNON,
-	MEMO_INFO_X_NO_MEMOS,
-	MEMO_INFO_X_MEMO,
-	MEMO_INFO_X_MEMO_UNREAD,
-	MEMO_INFO_X_MEMOS,
-	MEMO_INFO_X_MEMOS_ONE_UNREAD,
-	MEMO_INFO_X_MEMOS_SOME_UNREAD,
-	MEMO_INFO_X_MEMOS_ALL_UNREAD,
-	MEMO_INFO_X_LIMIT,
-	MEMO_INFO_X_HARD_LIMIT,
-	MEMO_INFO_X_NO_LIMIT,
-	MEMO_INFO_X_NOTIFY_OFF,
-	MEMO_INFO_X_NOTIFY_ON,
-	MEMO_INFO_X_NOTIFY_RECEIVE,
-	MEMO_INFO_X_NOTIFY_SIGNON,
-	MEMO_MAIL_SUBJECT,
-	NICK_MAIL_TEXT,
-	MEMO_RSEND_PLEASE_WAIT,
-	MEMO_RSEND_DISABLED,
-	MEMO_RSEND_SYNTAX,
-	MEMO_RSEND_NICK_MEMO_TEXT,
-	MEMO_RSEND_CHAN_MEMO_TEXT,
-	MEMO_RSEND_USER_NOTIFICATION,
-	MEMO_CHECK_SYNTAX,
-	MEMO_CHECK_NOT_READ,
-	MEMO_CHECK_READ,
-	MEMO_CHECK_NO_MEMO,
-	MEMO_NO_RSEND_SELF,
-	MEMO_IGNORE_SYNTAX,
-	MEMO_IGNORE_ADD,
-	MEMO_IGNORE_ALREADY_IGNORED,
-	MEMO_IGNORE_DEL,
-	MEMO_IGNORE_NOT_IGNORED,
-	MEMO_IGNORE_LIST_EMPTY,
-	MEMO_IGNORE_LIST_HEADER,
-	BOT_DOES_NOT_EXIST,
-	BOT_NOT_ASSIGNED,
-	BOT_NOT_ON_CHANNEL,
-	BOT_REASON_BADWORD,
-	BOT_REASON_BADWORD_GENTLE,
-	BOT_REASON_BOLD,
-	BOT_REASON_CAPS,
-	BOT_REASON_COLOR,
-	BOT_REASON_FLOOD,
-	BOT_REASON_REPEAT,
-	BOT_REASON_REVERSE,
-	BOT_REASON_UNDERLINE,
-	BOT_REASON_ITALIC,
-	BOT_REASON_AMSGS,
-	BOT_BOT_SYNTAX,
-	BOT_BOT_ALREADY_EXISTS,
-	BOT_BOT_CREATION_FAILED,
-	BOT_BOT_READONLY,
-	BOT_BOT_ADDED,
-	BOT_BOT_ANY_CHANGES,
-	BOT_BOT_CHANGED,
-	BOT_BOT_DELETED,
-	BOT_BOTLIST_HEADER,
-	BOT_BOTLIST_PRIVATE_HEADER,
-	BOT_BOTLIST_FOOTER,
-	BOT_BOTLIST_EMPTY,
-	BOT_ASSIGN_SYNTAX,
-	BOT_ASSIGN_READONLY,
-	BOT_ASSIGN_ALREADY,
-	BOT_ASSIGN_ASSIGNED,
-	BOT_UNASSIGN_SYNTAX,
-	BOT_UNASSIGN_UNASSIGNED,
-	BOT_UNASSIGN_PERSISTANT_CHAN,
-	BOT_INFO_SYNTAX,
-	BOT_INFO_NOT_FOUND,
-	BOT_INFO_BOT_HEADER,
-	BOT_INFO_BOT_MASK,
-	BOT_INFO_BOT_REALNAME,
-	BOT_INFO_BOT_CREATED,
-	BOT_INFO_BOT_USAGE,
-	BOT_INFO_BOT_OPTIONS,
-	BOT_INFO_CHAN_BOT,
-	BOT_INFO_CHAN_BOT_NONE,
-	BOT_INFO_CHAN_KICK_BADWORDS,
-	BOT_INFO_CHAN_KICK_BADWORDS_BAN,
-	BOT_INFO_CHAN_KICK_BOLDS,
-	BOT_INFO_CHAN_KICK_BOLDS_BAN,
-	BOT_INFO_CHAN_KICK_CAPS_ON,
-	BOT_INFO_CHAN_KICK_CAPS_BAN,
-	BOT_INFO_CHAN_KICK_CAPS_OFF,
-	BOT_INFO_CHAN_KICK_COLORS,
-	BOT_INFO_CHAN_KICK_COLORS_BAN,
-	BOT_INFO_CHAN_KICK_FLOOD_ON,
-	BOT_INFO_CHAN_KICK_FLOOD_BAN,
-	BOT_INFO_CHAN_KICK_FLOOD_OFF,
-	BOT_INFO_CHAN_KICK_REPEAT_ON,
-	BOT_INFO_CHAN_KICK_REPEAT_BAN,
-	BOT_INFO_CHAN_KICK_REPEAT_OFF,
-	BOT_INFO_CHAN_KICK_REVERSES,
-	BOT_INFO_CHAN_KICK_REVERSES_BAN,
-	BOT_INFO_CHAN_KICK_UNDERLINES,
-	BOT_INFO_CHAN_KICK_UNDERLINES_BAN,
-	BOT_INFO_CHAN_KICK_ITALICS,
-	BOT_INFO_CHAN_KICK_ITALICS_BAN,
-	BOT_INFO_CHAN_KICK_AMSGS,
-	BOT_INFO_CHAN_KICK_AMSGS_BAN,
-	BOT_INFO_CHAN_MSG,
-	BOT_INFO_ACTIVE,
-	BOT_INFO_INACTIVE,
-	BOT_INFO_CHAN_OPTIONS,
-	BOT_INFO_OPT_DONTKICKOPS,
-	BOT_INFO_OPT_DONTKICKVOICES,
-	BOT_INFO_OPT_FANTASY,
-	BOT_INFO_OPT_GREET,
-	BOT_INFO_OPT_NOBOT,
-	BOT_INFO_OPT_SYMBIOSIS,
-	BOT_INFO_OPT_NONE,
-	BOT_SET_SYNTAX,
-	BOT_SET_DISABLED,
-	BOT_SET_UNKNOWN,
-	BOT_SET_DONTKICKOPS_SYNTAX,
-	BOT_SET_DONTKICKOPS_ON,
-	BOT_SET_DONTKICKOPS_OFF,
-	BOT_SET_DONTKICKVOICES_SYNTAX,
-	BOT_SET_DONTKICKVOICES_ON,
-	BOT_SET_DONTKICKVOICES_OFF,
-	BOT_SET_FANTASY_SYNTAX,
-	BOT_SET_FANTASY_ON,
-	BOT_SET_FANTASY_OFF,
-	BOT_SET_GREET_SYNTAX,
-	BOT_SET_GREET_ON,
-	BOT_SET_GREET_OFF,
-	BOT_SET_NOBOT_SYNTAX,
-	BOT_SET_NOBOT_ON,
-	BOT_SET_NOBOT_OFF,
-	BOT_SET_PRIVATE_SYNTAX,
-	BOT_SET_PRIVATE_ON,
-	BOT_SET_PRIVATE_OFF,
-	BOT_SET_SYMBIOSIS_SYNTAX,
-	BOT_SET_SYMBIOSIS_ON,
-	BOT_SET_SYMBIOSIS_OFF,
-	BOT_SET_MSG_SYNTAX,
-	BOT_SET_MSG_OFF,
-	BOT_SET_MSG_PRIVMSG,
-	BOT_SET_MSG_NOTICE,
-	BOT_SET_MSG_NOTICEOPS,
-	BOT_KICK_SYNTAX,
-	BOT_KICK_DISABLED,
-	BOT_KICK_UNKNOWN,
-	BOT_KICK_BAD_TTB,
-	BOT_KICK_BADWORDS_ON,
-	BOT_KICK_BADWORDS_ON_BAN,
-	BOT_KICK_BADWORDS_OFF,
-	BOT_KICK_BOLDS_ON,
-	BOT_KICK_BOLDS_ON_BAN,
-	BOT_KICK_BOLDS_OFF,
-	BOT_KICK_CAPS_ON,
-	BOT_KICK_CAPS_ON_BAN,
-	BOT_KICK_CAPS_OFF,
-	BOT_KICK_COLORS_ON,
-	BOT_KICK_COLORS_ON_BAN,
-	BOT_KICK_COLORS_OFF,
-	BOT_KICK_FLOOD_ON,
-	BOT_KICK_FLOOD_ON_BAN,
-	BOT_KICK_FLOOD_OFF,
-	BOT_KICK_REPEAT_ON,
-	BOT_KICK_REPEAT_ON_BAN,
-	BOT_KICK_REPEAT_OFF,
-	BOT_KICK_REVERSES_ON,
-	BOT_KICK_REVERSES_ON_BAN,
-	BOT_KICK_REVERSES_OFF,
-	BOT_KICK_UNDERLINES_ON,
-	BOT_KICK_UNDERLINES_ON_BAN,
-	BOT_KICK_UNDERLINES_OFF,
-	BOT_KICK_ITALICS_ON,
-	BOT_KICK_ITALICS_ON_BAN,
-	BOT_KICK_ITALICS_OFF,
-	BOT_KICK_AMSGS_ON,
-	BOT_KICK_AMSGS_ON_BAN,
-	BOT_KICK_AMSGS_OFF,
-	BOT_BADWORDS_SYNTAX,
-	BOT_BADWORDS_DISABLED,
-	BOT_BADWORDS_REACHED_LIMIT,
-	BOT_BADWORDS_ALREADY_EXISTS,
-	BOT_BADWORDS_ADDED,
-	BOT_BADWORDS_NOT_FOUND,
-	BOT_BADWORDS_NO_MATCH,
-	BOT_BADWORDS_DELETED,
-	BOT_BADWORDS_DELETED_ONE,
-	BOT_BADWORDS_DELETED_SEVERAL,
-	BOT_BADWORDS_LIST_EMPTY,
-	BOT_BADWORDS_LIST_HEADER,
-	BOT_BADWORDS_LIST_FORMAT,
-	BOT_BADWORDS_CLEAR,
-	BOT_SAY_SYNTAX,
-	BOT_ACT_SYNTAX,
-	BOT_EXCEPT,
-	BOT_BAD_NICK,
-	BOT_BAD_HOST,
-	BOT_BAD_IDENT,
-	BOT_LONG_IDENT,
-	BOT_LONG_HOST,
-	OPER_BOUNCY_MODES,
-	OPER_BOUNCY_MODES_U_LINE,
-	OPER_GLOBAL_SYNTAX,
-	OPER_STATS_UNKNOWN_OPTION,
-	OPER_STATS_CURRENT_USERS,
-	OPER_STATS_MAX_USERS,
-	OPER_STATS_UPTIME_DHMS,
-	OPER_STATS_UPTIME_1DHMS,
-	OPER_STATS_UPTIME_HMS,
-	OPER_STATS_UPTIME_H1MS,
-	OPER_STATS_UPTIME_1HMS,
-	OPER_STATS_UPTIME_1H1MS,
-	OPER_STATS_UPTIME_MS,
-	OPER_STATS_UPTIME_M1S,
-	OPER_STATS_UPTIME_1MS,
-	OPER_STATS_UPTIME_1M1S,
-	OPER_STATS_BYTES_READ,
-	OPER_STATS_BYTES_WRITTEN,
-	OPER_STATS_USER_MEM,
-	OPER_STATS_CHANNEL_MEM,
-	OPER_STATS_GROUPS_MEM,
-	OPER_STATS_ALIASES_MEM,
-	OPER_STATS_CHANSERV_MEM,
-	OPER_STATS_BOTSERV_MEM,
-	OPER_STATS_HOSTSERV_MEM,
-	OPER_STATS_OPERSERV_MEM,
-	OPER_STATS_SESSIONS_MEM,
-	OPER_STATS_AKILL_COUNT,
-	OPER_STATS_AKILL_EXPIRE_DAYS,
-	OPER_STATS_AKILL_EXPIRE_DAY,
-	OPER_STATS_AKILL_EXPIRE_HOURS,
-	OPER_STATS_AKILL_EXPIRE_HOUR,
-	OPER_STATS_AKILL_EXPIRE_MINS,
-	OPER_STATS_AKILL_EXPIRE_MIN,
-	OPER_STATS_AKILL_EXPIRE_NONE,
-	OPER_STATS_SNLINE_COUNT,
-	OPER_STATS_SNLINE_EXPIRE_DAYS,
-	OPER_STATS_SNLINE_EXPIRE_DAY,
-	OPER_STATS_SNLINE_EXPIRE_HOURS,
-	OPER_STATS_SNLINE_EXPIRE_HOUR,
-	OPER_STATS_SNLINE_EXPIRE_MINS,
-	OPER_STATS_SNLINE_EXPIRE_MIN,
-	OPER_STATS_SNLINE_EXPIRE_NONE,
-	OPER_STATS_SQLINE_COUNT,
-	OPER_STATS_SQLINE_EXPIRE_DAYS,
-	OPER_STATS_SQLINE_EXPIRE_DAY,
-	OPER_STATS_SQLINE_EXPIRE_HOURS,
-	OPER_STATS_SQLINE_EXPIRE_HOUR,
-	OPER_STATS_SQLINE_EXPIRE_MINS,
-	OPER_STATS_SQLINE_EXPIRE_MIN,
-	OPER_STATS_SQLINE_EXPIRE_NONE,
-	OPER_STATS_SZLINE_COUNT,
-	OPER_STATS_SZLINE_EXPIRE_DAYS,
-	OPER_STATS_SZLINE_EXPIRE_DAY,
-	OPER_STATS_SZLINE_EXPIRE_HOURS,
-	OPER_STATS_SZLINE_EXPIRE_HOUR,
-	OPER_STATS_SZLINE_EXPIRE_MINS,
-	OPER_STATS_SZLINE_EXPIRE_MIN,
-	OPER_STATS_SZLINE_EXPIRE_NONE,
-	OPER_STATS_RESET,
-	OPER_STATS_UPLINK_SERVER,
-	OPER_STATS_UPLINK_CAPAB,
-	OPER_STATS_UPLINK_SERVER_COUNT,
-	OPER_MODE_SYNTAX,
-	OPER_UMODE_SYNTAX,
-	OPER_UMODE_SUCCESS,
-	OPER_UMODE_CHANGED,
-	OPER_OLINE_SYNTAX,
-	OPER_OLINE_SUCCESS,
-	OPER_OLINE_IRCOP,
-	OPER_KICK_SYNTAX,
-	OPER_SVSNICK_SYNTAX,
-	OPER_SVSNICK_NEWNICK,
-	OPER_AKILL_SYNTAX,
-	OPER_AKILL_EXISTS,
-	OPER_ALREADY_COVERED,
-	OPER_AKILL_NO_NICK,
-	OPER_AKILL_ADDED,
-	OPER_EXPIRY_CHANGED,
-	OPER_AKILL_NOT_FOUND,
-	OPER_AKILL_NO_MATCH,
-	OPER_AKILL_DELETED,
-	OPER_AKILL_DELETED_ONE,
-	OPER_AKILL_DELETED_SEVERAL,
-	OPER_LIST_EMPTY,
-	OPER_AKILL_LIST_HEADER,
-	OPER_LIST_FORMAT,
-	OPER_AKILL_VIEW_HEADER,
-	OPER_VIEW_FORMAT,
-	OPER_AKILL_CLEAR,
-	OPER_CHANKILL_SYNTAX,
-	OPER_SNLINE_SYNTAX,
-	OPER_SNLINE_EXISTS,
-	OPER_SNLINE_ADDED,
-	OPER_SNLINE_NOT_FOUND,
-	OPER_SNLINE_NO_MATCH,
-	OPER_SNLINE_DELETED,
-	OPER_SNLINE_DELETED_ONE,
-	OPER_SNLINE_DELETED_SEVERAL,
-	OPER_SNLINE_LIST_EMPTY,
-	OPER_SNLINE_LIST_HEADER,
-	OPER_SNLINE_VIEW_HEADER,
-	OPER_SNLINE_CLEAR,
-	OPER_SQLINE_SYNTAX,
-	OPER_SQLINE_CHANNELS_UNSUPPORTED,
-	OPER_SQLINE_EXISTS,
-	OPER_SQLINE_ADDED,
-	OPER_SQLINE_NOT_FOUND,
-	OPER_SQLINE_NO_MATCH,
-	OPER_SQLINE_DELETED,
-	OPER_SQLINE_DELETED_ONE,
-	OPER_SQLINE_DELETED_SEVERAL,
-	OPER_SQLINE_LIST_EMPTY,
-	OPER_SQLINE_LIST_HEADER,
-	OPER_SQLINE_VIEW_HEADER,
-	OPER_SQLINE_CLEAR,
-	OPER_SZLINE_SYNTAX,
-	OPER_SZLINE_EXISTS,
-	OPER_SZLINE_ONLY_IPS,
-	OPER_SZLINE_ADDED,
-	OPER_SZLINE_NOT_FOUND,
-	OPER_SZLINE_NO_MATCH,
-	OPER_SZLINE_DELETED,
-	OPER_SZLINE_DELETED_ONE,
-	OPER_SZLINE_DELETED_SEVERAL,
-	OPER_SZLINE_LIST_EMPTY,
-	OPER_SZLINE_LIST_HEADER,
-	OPER_SZLINE_VIEW_HEADER,
-	OPER_SZLINE_CLEAR,
-	OPER_SET_SYNTAX,
-	OPER_SET_READONLY_ON,
-	OPER_SET_READONLY_OFF,
-	OPER_SET_READONLY_ERROR,
-	OPER_SET_DEBUG_ON,
-	OPER_SET_DEBUG_OFF,
-	OPER_SET_DEBUG_LEVEL,
-	OPER_SET_DEBUG_ERROR,
-	OPER_SET_NOEXPIRE_ON,
-	OPER_SET_NOEXPIRE_OFF,
-	OPER_SET_NOEXPIRE_ERROR,
-	OPER_SET_UNKNOWN_OPTION,
-	OPER_SET_LIST_OPTION_ON,
-	OPER_SET_LIST_OPTION_OFF,
-	OPER_NOOP_SYNTAX,
-	OPER_NOOP_SET,
-	OPER_NOOP_REVOKE,
-	OPER_JUPE_SYNTAX,
-	OPER_JUPE_HOST_ERROR,
-	OPER_JUPE_INVALID_SERVER,
-	OPER_UPDATING,
-	OPER_RELOAD,
-	OPER_IGNORE_SYNTAX,
-	OPER_IGNORE_VALID_TIME,
-	OPER_IGNORE_TIME_DONE,
-	OPER_IGNORE_PERM_DONE,
-	OPER_IGNORE_DEL_DONE,
-	OPER_IGNORE_LIST,
-	OPER_IGNORE_LIST_NOMATCH,
-	OPER_IGNORE_LIST_EMPTY,
-	OPER_IGNORE_LIST_CLEARED,
-	OPER_CHANLIST_HEADER,
-	OPER_CHANLIST_HEADER_USER,
-	OPER_CHANLIST_RECORD,
-	OPER_CHANLIST_END,
-	OPER_USERLIST_HEADER,
-	OPER_USERLIST_HEADER_CHAN,
-	OPER_USERLIST_RECORD,
-	OPER_USERLIST_END,
-	OPER_SUPER_ADMIN_ON,
-	OPER_SUPER_ADMIN_OFF,
-	OPER_SUPER_ADMIN_SYNTAX,
-	OPER_SUPER_ADMIN_WALL_ON,
-	OPER_SUPER_ADMIN_WALL_OFF,
-	OPER_STAFF_LIST_HEADER,
-	OPER_STAFF_FORMAT,
-	OPER_STAFF_AFORMAT,
-	OPER_DEFCON_SYNTAX,
-	OPER_DEFCON_DENIED,
-	OPER_DEFCON_CHANGED,
-	OPER_DEFCON_WALL,
-	DEFCON_GLOBAL,
-	OPER_MODULE_LOADED,
-	OPER_MODULE_UNLOADED,
-	OPER_MODULE_RELOADED,
-	OPER_MODULE_LOAD_FAIL,
-	OPER_MODULE_REMOVE_FAIL,
-	OPER_MODULE_NO_UNLOAD,
-	OPER_MODULE_ALREADY_LOADED,
-	OPER_MODULE_ISNT_LOADED,
-	OPER_MODULE_LOAD_SYNTAX,
-	OPER_MODULE_UNLOAD_SYNTAX,
-	OPER_MODULE_RELOAD_SYNTAX,
-	OPER_MODULE_LIST_HEADER,
-	OPER_MODULE_LIST,
-	OPER_MODULE_LIST_FOOTER,
-	OPER_MODULE_INFO_LIST,
-	OPER_MODULE_CMD_LIST,
-	OPER_MODULE_NO_LIST,
-	OPER_MODULE_NO_INFO,
-	OPER_MODULE_INFO_SYNTAX,
-	OPER_EXCEPTION_SYNTAX,
-	OPER_EXCEPTION_DISABLED,
-	OPER_EXCEPTION_ADDED,
-	OPER_EXCEPTION_MOVED,
-	OPER_EXCEPTION_NOT_FOUND,
-	OPER_EXCEPTION_NO_MATCH,
-	OPER_EXCEPTION_DELETED,
-	OPER_EXCEPTION_DELETED_ONE,
-	OPER_EXCEPTION_DELETED_SEVERAL,
-	OPER_EXCEPTION_LIST_HEADER,
-	OPER_EXCEPTION_LIST_FORMAT,
-	OPER_EXCEPTION_LIST_COLHEAD,
-	OPER_EXCEPTION_VIEW_FORMAT,
-	OPER_EXCEPTION_INVALID_LIMIT,
-	OPER_EXCEPTION_INVALID_HOSTMASK,
-	OPER_EXCEPTION_EXISTS,
-	OPER_EXCEPTION_CHANGED,
-	OPER_SESSION_LIST_SYNTAX,
-	OPER_SESSION_INVALID_THRESHOLD,
-	OPER_SESSION_NOT_FOUND,
-	OPER_SESSION_LIST_HEADER,
-	OPER_SESSION_LIST_COLHEAD,
-	OPER_SESSION_LIST_FORMAT,
-	OPER_SESSION_VIEW_FORMAT,
-	OPER_HELP_EXCEPTION,
-	OPER_HELP_SESSION,
-	OPER_HELP_STAFF,
-	OPER_HELP_DEFCON,
-	OPER_HELP_DEFCON_NO_NEW_CHANNELS,
-	OPER_HELP_DEFCON_NO_NEW_NICKS,
-	OPER_HELP_DEFCON_NO_MLOCK_CHANGE,
-	OPER_HELP_DEFCON_FORCE_CHAN_MODES,
-	OPER_HELP_DEFCON_REDUCE_SESSION,
-	OPER_HELP_DEFCON_NO_NEW_CLIENTS,
-	OPER_HELP_DEFCON_OPER_ONLY,
-	OPER_HELP_DEFCON_SILENT_OPER_ONLY,
-	OPER_HELP_DEFCON_AKILL_NEW_CLIENTS,
-	OPER_HELP_DEFCON_NO_NEW_MEMOS,
-	OPER_HELP_CHANKILL,
-	NEWS_LOGON_TEXT,
-	NEWS_OPER_TEXT,
-	NEWS_RANDOM_TEXT,
-	NEWS_LOGON_SYNTAX,
-	NEWS_LOGON_LIST_HEADER,
-	NEWS_LIST_ENTRY,
-	NEWS_LOGON_LIST_NONE,
-	NEWS_LOGON_ADD_SYNTAX,
-	NEWS_ADD_FULL,
-	NEWS_LOGON_ADDED,
-	NEWS_LOGON_DEL_SYNTAX,
-	NEWS_LOGON_DEL_NOT_FOUND,
-	NEWS_LOGON_DELETED,
-	NEWS_LOGON_DEL_NONE,
-	NEWS_LOGON_DELETED_ALL,
-	NEWS_OPER_SYNTAX,
-	NEWS_OPER_LIST_HEADER,
-	NEWS_OPER_LIST_NONE,
-	NEWS_OPER_ADD_SYNTAX,
-	NEWS_OPER_ADDED,
-	NEWS_OPER_DEL_SYNTAX,
-	NEWS_OPER_DEL_NOT_FOUND,
-	NEWS_OPER_DELETED,
-	NEWS_OPER_DEL_NONE,
-	NEWS_OPER_DELETED_ALL,
-	NEWS_RANDOM_SYNTAX,
-	NEWS_RANDOM_LIST_HEADER,
-	NEWS_RANDOM_LIST_NONE,
-	NEWS_RANDOM_ADD_SYNTAX,
-	NEWS_RANDOM_ADDED,
-	NEWS_RANDOM_DEL_SYNTAX,
-	NEWS_RANDOM_DEL_NOT_FOUND,
-	NEWS_RANDOM_DELETED,
-	NEWS_RANDOM_DEL_NONE,
-	NEWS_RANDOM_DELETED_ALL,
-	NEWS_HELP_LOGON,
-	NEWS_HELP_OPER,
-	NEWS_HELP_RANDOM,
-	NICK_HELP_CMD_CONFIRM,
-	NICK_HELP_CMD_RESEND,
-	NICK_HELP_CMD_REGISTER,
-	NICK_HELP_CMD_GROUP,
-	NICK_HELP_CMD_UNGROUP,
-	NICK_HELP_CMD_IDENTIFY,
-	NICK_HELP_CMD_ACCESS,
-	NICK_HELP_CMD_SET,
-	NICK_HELP_CMD_SASET,
-	NICK_HELP_CMD_DROP,
-	NICK_HELP_CMD_RECOVER,
-	NICK_HELP_CMD_RELEASE,
-	NICK_HELP_CMD_SENDPASS,
-	NICK_HELP_CMD_RESETPASS,
-	NICK_HELP_CMD_GHOST,
-	NICK_HELP_CMD_ALIST,
-	NICK_HELP_CMD_GLIST,
-	NICK_HELP_CMD_INFO,
-	NICK_HELP_CMD_LIST,
-	NICK_HELP_CMD_LOGOUT,
-	NICK_HELP_CMD_STATUS,
-	NICK_HELP_CMD_UPDATE,
-	NICK_HELP_CMD_GETPASS,
-	NICK_HELP_CMD_GETEMAIL,
-	NICK_HELP_CMD_FORBID,
-	NICK_HELP_CMD_SUSPEND,
-	NICK_HELP_CMD_UNSUSPEND,
-	NICK_HELP_CMD_AJOIN,
-	NICK_HELP,
-	NICK_HELP_FOOTER,
-	NICK_HELP_EXPIRES,
-	NICK_HELP_REGISTER,
-	NICK_HELP_GROUP,
-	NICK_HELP_UNGROUP,
-	NICK_HELP_IDENTIFY,
-	NICK_HELP_UPDATE,
-	NICK_HELP_LOGOUT,
-	NICK_HELP_DROP,
-	NICK_HELP_ACCESS,
-	NICK_HELP_SET_HEAD,
-	NICK_HELP_CMD_SET_DISPLAY,
-	NICK_HELP_CMD_SET_PASSWORD,
-	NICK_HELP_CMD_SET_LANGUAGE,
-	NICK_HELP_CMD_SET_EMAIL,
-	NICK_HELP_CMD_SET_GREET,
-	NICK_HELP_CMD_SET_KILL,
-	NICK_HELP_CMD_SET_SECURE,
-	NICK_HELP_CMD_SET_PRIVATE,
-	NICK_HELP_CMD_SET_HIDE,
-	NICK_HELP_CMD_SET_MSG,
-	NICK_HELP_CMD_SET_AUTOOP,
-	NICK_HELP_SET_TAIL,
-	NICK_HELP_SET_DISPLAY,
-	NICK_HELP_SET_PASSWORD,
-	NICK_HELP_SET_LANGUAGE,
-	NICK_HELP_SET_EMAIL,
-	NICK_HELP_SET_GREET,
-	NICK_HELP_SET_KILL,
-	NICK_HELP_SET_SECURE,
-	NICK_HELP_SET_PRIVATE,
-	NICK_HELP_SET_HIDE,
-	NICK_HELP_SET_MSG,
-	NICK_HELP_SET_AUTOOP,
-	NICK_HELP_SASET_HEAD,
-	NICK_HELP_CMD_SASET_DISPLAY,
-	NICK_HELP_CMD_SASET_PASSWORD,
-	NICK_HELP_CMD_SASET_EMAIL,
-	NICK_HELP_CMD_SASET_GREET,
-	NICK_HELP_CMD_SASET_PRIVATE,
-	NICK_HELP_CMD_SASET_NOEXPIRE,
-	NICK_HELP_CMD_SASET_AUTOOP,
-	NICK_HELP_CMD_SASET_LANGUAGE,
-	NICK_HELP_SASET_TAIL,
-	NICK_HELP_SASET_DISPLAY,
-	NICK_HELP_SASET_PASSWORD,
-	NICK_HELP_SASET_EMAIL,
-	NICK_HELP_SASET_GREET,
-	NICK_HELP_SASET_KILL,
-	NICK_HELP_SASET_SECURE,
-	NICK_HELP_SASET_PRIVATE,
-	NICK_HELP_SASET_HIDE,
-	NICK_HELP_SASET_MSG,
-	NICK_HELP_SASET_NOEXPIRE,
-	NICK_HELP_SASET_AUTOOP,
-	NICK_HELP_SASET_LANGUAGE,
-	NICK_HELP_RECOVER,
-	NICK_HELP_RELEASE,
-	NICK_HELP_GHOST,
-	NICK_HELP_INFO,
-	NICK_HELP_LIST,
-	NICK_HELP_ALIST,
-	NICK_HELP_GLIST,
-	NICK_HELP_STATUS,
-	NICK_HELP_SENDPASS,
-	NICK_HELP_RESETPASS,
-	NICK_HELP_CONFIRM,
-	NICK_HELP_CONFIRM_OPER,
-	NICK_HELP_RESEND,
-	NICK_HELP_AJOIN,
-	NICK_SERVADMIN_HELP,
-	NICK_SERVADMIN_HELP_LOGOUT,
-	NICK_SERVADMIN_HELP_DROP,
-	NICK_SERVADMIN_HELP_LIST,
-	NICK_SERVADMIN_HELP_ALIST,
-	NICK_SERVADMIN_HELP_GLIST,
-	NICK_SERVADMIN_HELP_GETPASS,
-	NICK_SERVADMIN_HELP_GETEMAIL,
-	NICK_SERVADMIN_HELP_FORBID,
-	NICK_SERVADMIN_HELP_SUSPEND,
-	NICK_SERVADMIN_HELP_UNSUSPEND,
-	CHAN_HELP_CMD_REGISTER,
-	CHAN_HELP_CMD_FORBID,
-	CHAN_HELP_CMD_SUSPEND,
-	CHAN_HELP_CMD_UNSUSPEND,
-	CHAN_HELP_CMD_STATUS,
-	CHAN_HELP_CMD_SET,
-	CHAN_HELP_CMD_SASET,
-	CHAN_HELP_CMD_QOP,
-	CHAN_HELP_CMD_AOP,
-	CHAN_HELP_CMD_SOP,
-	CHAN_HELP_CMD_ACCESS,
-	CHAN_HELP_CMD_LEVELS,
-	CHAN_HELP_CMD_AKICK,
-	CHAN_HELP_CMD_DROP,
-	CHAN_HELP_CMD_BAN,
-	CHAN_HELP_CMD_CLEARUSERS,
-	CHAN_HELP_CMD_DEVOICE,
-	CHAN_HELP_CMD_GETKEY,
-	CHAN_HELP_CMD_INFO,
-	CHAN_HELP_CMD_INVITE,
-	CHAN_HELP_CMD_KICK,
-	CHAN_HELP_CMD_LIST,
-	CHAN_HELP_CMD_OP,
-	CHAN_HELP_CMD_TOPIC,
-	CHAN_HELP_CMD_UNBAN,
-	CHAN_HELP_CMD_VOICE,
-	CHAN_HELP_CMD_VOP,
-	CHAN_HELP_CMD_DEHALFOP,
-	CHAN_HELP_CMD_DEOWNER,
-	CHAN_HELP_CMD_DEPROTECT,
-	CHAN_HELP_CMD_HALFOP,
-	CHAN_HELP_CMD_HOP,
-	CHAN_HELP_CMD_OWNER,
-	CHAN_HELP_CMD_PROTECT,
-	CHAN_HELP_CMD_DEOP,
-	CHAN_HELP_CMD_CLONE,
-	CHAN_HELP_CMD_MODE,
-	CHAN_HELP_CMD_ENTRYMSG,
-	CHAN_HELP,
-	CHAN_HELP_EXPIRES,
-	CHAN_HELP_REGISTER,
-	CHAN_HELP_DROP,
-	CHAN_HELP_SASET_HEAD,
-	CHAN_HELP_SET_HEAD,
-	CHAN_HELP_CMD_SET_FOUNDER,
-	CHAN_HELP_CMD_SET_SUCCESSOR,
-	CHAN_HELP_CMD_SET_DESC,
-	CHAN_HELP_CMD_SET_BANTYPE,
-	CHAN_HELP_CMD_SET_KEEPTOPIC,
-	CHAN_HELP_CMD_SET_OPNOTICE,
-	CHAN_HELP_CMD_SET_PEACE,
-	CHAN_HELP_CMD_SET_PRIVATE,
-	CHAN_HELP_CMD_SET_RESTRICTED,
-	CHAN_HELP_CMD_SET_SECURE,
-	CHAN_HELP_CMD_SET_SECUREOPS,
-	CHAN_HELP_CMD_SET_SECUREFOUNDER,
-	CHAN_HELP_CMD_SET_SIGNKICK,
-	CHAN_HELP_CMD_SET_TOPICLOCK,
-	CHAN_HELP_CMD_SET_XOP,
-	CHAN_HELP_CMD_SET_PERSIST,
-	CHAN_HELP_CMD_SET_NOEXPIRE,
-	CHAN_HELP_SET_TAIL,
-	CHAN_HELP_SASET_TAIL,
-	CHAN_HELP_SET_FOUNDER,
-	CHAN_HELP_SET_SUCCESSOR,
-	CHAN_HELP_SET_DESC,
-	CHAN_HELP_SET_BANTYPE,
-	CHAN_HELP_SET_KEEPTOPIC,
-	CHAN_HELP_SET_TOPICLOCK,
-	CHAN_HELP_SET_PEACE,
-	CHAN_HELP_SET_PRIVATE,
-	CHAN_HELP_SET_RESTRICTED,
-	CHAN_HELP_SET_SECURE,
-	CHAN_HELP_SET_SECUREOPS,
-	CHAN_HELP_SET_SECUREFOUNDER,
-	CHAN_HELP_SET_SIGNKICK,
-	CHAN_HELP_SET_XOP,
-	CHAN_HELP_SET_PERSIST,
-	CHAN_HELP_SET_OPNOTICE,
-	CHAN_HELP_QOP,
-	CHAN_HELP_AOP,
-	CHAN_HELP_HOP,
-	CHAN_HELP_SOP,
-	CHAN_HELP_VOP,
-	CHAN_HELP_ACCESS,
-	CHAN_HELP_ACCESS_LEVELS,
-	CHAN_HELP_AKICK,
-	CHAN_HELP_LEVELS,
-	CHAN_HELP_LEVELS_DESC,
-	CHAN_HELP_LEVELS_DESC_FORMAT,
-	CHAN_HELP_INFO,
-	CHAN_HELP_LIST,
-	CHAN_HELP_OP,
-	CHAN_HELP_DEOP,
-	CHAN_HELP_VOICE,
-	CHAN_HELP_DEVOICE,
-	CHAN_HELP_HALFOP,
-	CHAN_HELP_DEHALFOP,
-	CHAN_HELP_PROTECT,
-	CHAN_HELP_DEPROTECT,
-	CHAN_HELP_OWNER,
-	CHAN_HELP_DEOWNER,
-	CHAN_HELP_INVITE,
-	CHAN_HELP_UNBAN,
-	CHAN_HELP_KICK,
-	CHAN_HELP_BAN,
-	CHAN_HELP_TOPIC,
-	CHAN_HELP_CLEARUSERS,
-	CHAN_HELP_GETKEY,
-	CHAN_HELP_CLONE,
-	CHAN_HELP_MODE,
-	CHAN_HELP_ENTRYMSG,
-	CHAN_SERVADMIN_HELP,
-	CHAN_SERVADMIN_HELP_DROP,
-	CHAN_SERVADMIN_HELP_SET_NOEXPIRE,
-	CHAN_SERVADMIN_HELP_FORBID,
-	CHAN_SERVADMIN_HELP_SUSPEND,
-	CHAN_SERVADMIN_HELP_UNSUSPEND,
-	CHAN_SERVADMIN_HELP_STATUS,
-	MEMO_HELP_CMD_SEND,
-	MEMO_HELP_CMD_CANCEL,
-	MEMO_HELP_CMD_LIST,
-	MEMO_HELP_CMD_READ,
-	MEMO_HELP_CMD_DEL,
-	MEMO_HELP_CMD_SET,
-	MEMO_HELP_CMD_INFO,
-	MEMO_HELP_CMD_RSEND,
-	MEMO_HELP_CMD_CHECK,
-	MEMO_HELP_CMD_SENDALL,
-	MEMO_HELP_CMD_STAFF,
-	MEMO_HELP_CMD_IGNORE,
-	MEMO_HELP_HEADER,
-	MEMO_HELP_FOOTER,
-	MEMO_HELP_SEND,
-	MEMO_HELP_CANCEL,
-	MEMO_HELP_LIST,
-	MEMO_HELP_READ,
-	MEMO_HELP_DEL,
-	MEMO_HELP_SET,
-	MEMO_HELP_SET_NOTIFY,
-	MEMO_HELP_SET_LIMIT,
-	MEMO_HELP_INFO,
-	MEMO_SERVADMIN_HELP_SET_LIMIT,
-	MEMO_SERVADMIN_HELP_INFO,
-	MEMO_HELP_STAFF,
-	MEMO_HELP_SENDALL,
-	MEMO_HELP_RSEND,
-	MEMO_HELP_CHECK,
-	MEMO_HELP_IGNORE,
-	OPER_HELP_CMD_GLOBAL,
-	OPER_HELP_CMD_STATS,
-	OPER_HELP_CMD_STAFF,
-	OPER_HELP_CMD_MODE,
-	OPER_HELP_CMD_KICK,
-	OPER_HELP_CMD_AKILL,
-	OPER_HELP_CMD_SNLINE,
-	OPER_HELP_CMD_SQLINE,
-	OPER_HELP_CMD_SZLINE,
-	OPER_HELP_CMD_CHANLIST,
-	OPER_HELP_CMD_USERLIST,
-	OPER_HELP_CMD_LOGONNEWS,
-	OPER_HELP_CMD_RANDOMNEWS,
-	OPER_HELP_CMD_OPERNEWS,
-	OPER_HELP_CMD_SESSION,
-	OPER_HELP_CMD_EXCEPTION,
-	OPER_HELP_CMD_NOOP,
-	OPER_HELP_CMD_JUPE,
-	OPER_HELP_CMD_IGNORE,
-	OPER_HELP_CMD_SET,
-	OPER_HELP_CMD_RELOAD,
-	OPER_HELP_CMD_UPDATE,
-	OPER_HELP_CMD_RESTART,
-	OPER_HELP_CMD_QUIT,
-	OPER_HELP_CMD_SHUTDOWN,
-	OPER_HELP_CMD_DEFCON,
-	OPER_HELP_CMD_CHANKILL,
-	OPER_HELP_CMD_OLINE,
-	OPER_HELP_CMD_UMODE,
-	OPER_HELP_CMD_SVSNICK,
-	OPER_HELP_CMD_MODLOAD,
-	OPER_HELP_CMD_MODUNLOAD,
-	OPER_HELP_CMD_MODRELOAD,
-	OPER_HELP_CMD_MODINFO,
-	OPER_HELP_CMD_MODLIST,
-	OPER_HELP,
-	OPER_HELP_LOGGED,
-	OPER_HELP_GLOBAL,
-	OPER_HELP_STATS,
-	OPER_HELP_IGNORE,
-	OPER_HELP_MODE,
-	OPER_HELP_UMODE,
-	OPER_HELP_OLINE,
-	OPER_HELP_KICK,
-	OPER_HELP_SVSNICK,
-	OPER_HELP_AKILL,
-	OPER_HELP_SNLINE,
-	OPER_HELP_SQLINE,
-	OPER_HELP_SZLINE,
-	OPER_HELP_SET,
-	OPER_HELP_SET_READONLY,
-	OPER_HELP_SET_DEBUG,
-	OPER_HELP_SET_NOEXPIRE,
-	OPER_HELP_SET_SUPERADMIN,
-	OPER_HELP_SET_LIST,
-	OPER_HELP_NOOP,
-	OPER_HELP_JUPE,
-	OPER_HELP_UPDATE,
-	OPER_HELP_RELOAD,
-	OPER_HELP_QUIT,
-	OPER_HELP_SHUTDOWN,
-	OPER_HELP_RESTART,
-	OPER_HELP_CHANLIST,
-	OPER_HELP_USERLIST,
-	OPER_HELP_MODLOAD,
-	OPER_HELP_MODUNLOAD,
-	OPER_HELP_MODRELOAD,
-	OPER_HELP_MODINFO,
-	OPER_HELP_MODLIST,
-	BOT_HELP_CMD_BOTLIST,
-	BOT_HELP_CMD_ASSIGN,
-	BOT_HELP_CMD_SET,
-	BOT_HELP_CMD_KICK,
-	BOT_HELP_CMD_BADWORDS,
-	BOT_HELP_CMD_ACT,
-	BOT_HELP_CMD_INFO,
-	BOT_HELP_CMD_SAY,
-	BOT_HELP_CMD_UNASSIGN,
-	BOT_HELP_CMD_BOT,
-	BOT_HELP,
-	BOT_HELP_FOOTER,
-	BOT_HELP_BOTLIST,
-	BOT_HELP_ASSIGN,
-	BOT_HELP_UNASSIGN,
-	BOT_HELP_INFO,
-	BOT_HELP_SET,
-	BOT_HELP_SET_DONTKICKOPS,
-	BOT_HELP_SET_DONTKICKVOICES,
-	BOT_HELP_SET_FANTASY,
-	BOT_HELP_SET_GREET,
-	BOT_HELP_SET_SYMBIOSIS,
-	BOT_HELP_SET_MSG,
-	BOT_HELP_KICK,
-	BOT_HELP_KICK_BOLDS,
-	BOT_HELP_KICK_COLORS,
-	BOT_HELP_KICK_REVERSES,
-	BOT_HELP_KICK_UNDERLINES,
-	BOT_HELP_KICK_CAPS,
-	BOT_HELP_KICK_FLOOD,
-	BOT_HELP_KICK_REPEAT,
-	BOT_HELP_KICK_BADWORDS,
-	BOT_HELP_KICK_ITALICS,
-	BOT_HELP_KICK_AMSGS,
-	BOT_HELP_BADWORDS,
-	BOT_HELP_SAY,
-	BOT_HELP_ACT,
-	BOT_SERVADMIN_HELP_BOT,
-	BOT_SERVADMIN_HELP_SET,
-	BOT_SERVADMIN_HELP_SET_NOBOT,
-	BOT_SERVADMIN_HELP_SET_PRIVATE,
-	HOST_ENTRY,
-	HOST_IDENT_ENTRY,
-	HOST_SET,
-	HOST_IDENT_SET,
-	HOST_SETALL,
-	HOST_DELALL,
-	HOST_DELALL_SYNTAX,
-	HOST_IDENT_SETALL,
-	HOST_SET_ERROR,
-	HOST_SET_IDENT_ERROR,
-	HOST_SET_TOOLONG,
-	HOST_SET_IDENTTOOLONG,
-	HOST_NOREG,
-	HOST_SET_SYNTAX,
-	HOST_SETALL_SYNTAX,
-	HOST_NOT_ASSIGNED,
-	HOST_ACTIVATED,
-	HOST_IDENT_ACTIVATED,
-	HOST_DEL,
-	HOST_DEL_SYNTAX,
-	HOST_OFF,
-	HOST_NO_VIDENT,
-	HOST_GROUP,
-	HOST_IDENT_GROUP,
-	HOST_LIST_FOOTER,
-	HOST_LIST_RANGE_FOOTER,
-	HOST_LIST_KEY_FOOTER,
-	HOST_HELP_CMD_ON,
-	HOST_HELP_CMD_OFF,
-	HOST_HELP_CMD_GROUP,
-	HOST_HELP_CMD_SET,
-	HOST_HELP_CMD_SETALL,
-	HOST_HELP_CMD_DEL,
-	HOST_HELP_CMD_DELALL,
-	HOST_HELP_CMD_LIST,
-	HOST_HELP_ON,
-	HOST_HELP_SET,
-	HOST_HELP_DELALL,
-	HOST_HELP_SETALL,
-	HOST_HELP_OFF,
-	HOST_HELP_DEL,
-	HOST_HELP_LIST,
-	HOST_HELP_GROUP,
-	OPER_SUPER_ADMIN_NOT_ENABLED,
-	OPER_HELP_SYNC,
-	OPER_HELP_CMD_SQLSYNC,
-	OPER_SYNC_UPDATED,
-	LANG_STRING_COUNT
-};
+	const char *const MORE_INFO =				_("\002%R%s HELP %s\002 for more information.");
+	const char *const BAD_USERHOST_MASK =			_("Mask must be in the form \037user\037@\037host\037.");
+	const char *const BAD_EXPIRY_TIME = 			_("Invalid expiry time.");
+	const char *const USERHOST_MASK_TOO_WIDE =		_("%s coverage is too wide; Please use a more specific mask.");
+	const char *const READ_ONLY_MODE =			_("\002Notice:\002 Services is in read-only mode; changes will not be saved!");
+	const char *const PASSWORD_INCORRECT =			_("Password incorrect.");
+	const char *const ACCESS_DENIED =			_("Access denied.");
+	const char *const MORE_OBSCURE_PASSWORD =		_("Please try again with a more obscure password. Passwords should be at least five characters long, should not be something easily guessed (e.g. your real name or your nick), and cannot contain the space or tab characters.");
+	const char *const PASSWORD_TOO_LONG =			_("Your password is too long. Please try again with a shorter password.");
+	const char *const NICK_NOT_REGISTERED =			_("Your nick isn't registered.");
+	const char *const NICK_X_NOT_REGISTERED =		_("Nick \002%s\002 isn't registered.");
+	const char *const NICK_X_NOT_IN_USE =			_("Nick \002%s\002 isn't currently in use.");
+	const char *const NICK_X_NOT_ON_CHAN =			_("\002%s\002 is not currently on channel %s.");
+	const char *const NICK_X_FORBIDDEN =			_("Nick \002%s\002 may not be registered or used.");
+	const char *const NICK_X_FORBIDDEN_OPER =		_("Nick \002%s\002 has been forbidden by %s:\n"
+								"%s");
+	const char *const NICK_X_SUSPENDED =			_("Nick %s is currently suspended.");
+	const char *const CHAN_X_NOT_REGISTERED =		_("Channel \002%s\002 isn't registered.");
+	const char *const CHAN_X_NOT_IN_USE =			_("Channel \002%s\002 doesn't exist.");
+	const char *const CHAN_X_FORBIDDEN =			_("Channel \002%s\002 may not be registered or used.");
+	const char *const CHAN_X_FORBIDDEN_OPER = 		_("Channel \002%s\002 has been forbidden by %s:\n" \
+								"%s");
+	const char *const NICK_IDENTIFY_REQUIRED =		_("Password authentication required for that command.\n" \
+								"Retry after typing \002%R%s IDENTIFY \037password\037\002.");
+	const char *const MAIL_X_INVALID =			_("\002%s\002 is not a valid e-mail address.");
+	const char *const NO_REASON =				_("No reason");
+	const char *const UNKNOWN =				_("<unknown>");
+	const char *const NO_EXPIRE =				_("does not expire");
+	const char *const END_OF_ANY_LIST =			_("End of \002%s\002 list.");
+	const char *const LIST_INCORRECT_RANGE =		_("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.");
+	const char *const UNKNOWN_OPTION =			_("Unknown option \002%s\002.\n"
+									"Type %R%S HELP %s for more information.");
+	/* move these */
+	const char *const NICK_IS_REGISTERED =			_("This nick is owned by someone else.  Please choose another.\n"
+									"(If this is your nick, type \002%R%s IDENTIFY \037password\037\002.)");
+	const char *const NICK_IS_SECURE =			_("This nickname is registered and protected.  If it is your\n"
+									"nick, type \002%R%s IDENTIFY \037password\037\002.  Otherwise,\n"
+									"please choose a different nick.");
+	const char *const FORCENICKCHANGE_NOW =			_("This nickname has been registered; you may not use it.");
+	const char *const NICK_CANNOT_BE_REGISTERED =		_("Nickname \002%s\002 may not be registered.");
+	const char *const NICK_ALREADY_REGISTERED =		_("Nickname \002%s\002 is already registered!");
+	const char *const NICK_SET_SYNTAX =			_("SET \037option\037 \037parameters\037");
+	const char *const NICK_SET_DISABLED =			_("Sorry, nickname option setting is temporarily disabled.");
+	const char *const NICK_SET_UNKNOWN_OPTION =		_("Unknown SET option \002%s\002.");
+	const char *const NICK_SET_DISPLAY_CHANGED =		_("The new display is now \002%s\002.");
+	const char *const NICK_SASET_SYNTAX =			_("SASET \037nickname\037 \037option\037 \037parameters\037");
+	const char *const NICK_SASET_DISPLAY_INVALID =		_("The new display for \002%s\002 MUST be a nickname of the nickname group!");
+	const char *const NICK_SASET_PASSWORD_FAILED =		_("Sorry, couldn't change password for \002%s\002.");
+	const char *const NICK_SASET_PASSWORD_CHANGED =		_("Password for \002%s\002 changed.");
+	const char *const NICK_SASET_PASSWORD_CHANGED_TO =	_("Password for \002%s\002 changed to \002%s\002.");
+	const char *const NICK_INFO_OPTIONS =			_("          Options: %s");
+	const char *const NICK_LIST_SYNTAX =			_("LIST \037pattern\037");
+	const char *const LIST_HEADER =				_("List of entries matching \002%s\002:");
+	const char *const NICK_RECOVERED =			_("User claiming your nick has been killed.\n"
+									"\002%R%s RELEASE %s\002 to get it back before %s timeout.");
+	const char *const NICK_REQUESTED =			_("This nick has already been requested, please check your e-mail address for the pass code");
+	const char *const NICK_IS_PREREG =			_("This nick is awaiting an e-mail verification code before completing registration.");
+	const char *const NICK_CONFIRM_INVALID =		_("Invalid passcode has been entered, please check the e-mail again, and retry");
+	const char *const CHAN_NOT_ALLOWED_TO_JOIN =		_("You are not permitted to be on this channel.");
+	const char *const CHAN_X_INVALID =			_("Channel %s is not a valid channel.");
+	const char *const CHAN_REACHED_CHANNEL_LIMIT =		_("Sorry, you have already reached your limit of \002%d\002 channels.");
+	const char *const CHAN_EXCEEDED_CHANNEL_LIMIT =		_("Sorry, you have already exceeded your limit of \002%d\002 channels.");
+	const char *const CHAN_SYMBOL_REQUIRED =		_("Please use the symbol of \002#\002 when attempting to register");
+	const char *const CHAN_SASET_SYNTAX =			_("SASET \002channel\002 \037option\037 \037parameters\037");
+	const char *const CHAN_SET_SYNTAX =			_("SET \037channel\037 \037option\037 \037parameters\037");
+	const char *const CHAN_SET_DISABLED =			_("Sorry, channel option setting is temporarily disabled.");
+	const char *const CHAN_SETTING_CHANGED =		_("%s for %s set to %s.");
+	const char *const CHAN_SETTING_UNSET =			_("%s for %s unset.");
+	const char *const CHAN_SET_MLOCK_DEPRECATED =		_("MLOCK is deprecated. Use \002%R%s HELP MODE\002 instead.");
+	const char *const CHAN_ACCESS_LEVEL_RANGE =		_("Access level must be between %d and %d inclusive.");
+	const char *const CHAN_ACCESS_LIST_HEADER =		_("Access list for %s:\n"
+									"  Num   Lev  Mask");
+	const char *const CHAN_ACCESS_VIEW_XOP_FORMAT =		_("  %3d   %s   %s\n"
+									"    by %s, last seen %s");
+	const char *const CHAN_ACCESS_VIEW_AXS_FORMAT =		_("  %3d  %4d  %s\n"
+									"    by %s, last seen %s");
+	const char *const CHAN_AKICK_VIEW_FORMAT =		_("%3d %s (by %s on %s)\n"
+									"    %s");
+	const char *const CHAN_INFO_HEADER =			_("Information for channel \002%s\002:");
+	const char *const CHAN_EXCEPTED =			_("\002%s\002 matches an except on %s and cannot be banned until the except have been removed.");
+	const char *const CHAN_LIST_ENTRY =		_("%3d    %s\n"
+									"  Added by %s on %s");
+	const char *const MEMO_NEW_X_MEMO_ARRIVED =		_("There is a new memo on channel %s.\n"
+									"Type \002%R%s READ %s %d\002 to read it.");
+	const char *const MEMO_NEW_MEMO_ARRIVED =		_("You have a new memo from %s.\n"
+									"Type \002%R%s READ %d\002 to read it.");
+	const char *const MEMO_HAVE_NO_MEMOS =			_("You have no memos.");
+	const char *const MEMO_X_HAS_NO_MEMOS =			_("%s has no memos.");
+	const char *const MEMO_SEND_SYNTAX =			_("SEND {\037nick\037 | \037channel\037} \037memo-text\037");
+	const char *const MEMO_SEND_DISABLED =			_("Sorry, memo sending is temporarily disabled.");
+	const char *const MEMO_HAVE_NO_NEW_MEMOS =		_("You have no new memos.");
+	const char *const MEMO_X_HAS_NO_NEW_MEMOS =		_("%s has no new memos.");
+	const char *const BOT_DOES_NOT_EXIST =			_("Bot \002%s\002 does not exist.");
+	const char *const BOT_NOT_ASSIGNED =			_("You must assign a bot to the channel before using this command.\n"
+									"Type %R%S HELP ASSIGN for more information.");
+	const char *const BOT_NOT_ON_CHANNEL =			_("Bot is not on channel \002%s\002.");
+	const char *const BOT_ASSIGN_READONLY =			_("Sorry, bot assignment is temporarily disabled.");
+	const char *const ENABLED =				_("Enabled");
+	const char *const DISABLED =				_("Disabled");
+	const char *const OPER_LIST_FORMAT =			_("  %3d   %-32s  %s");
+	const char *const OPER_VIEW_FORMAT =			_("%3d  %s (by %s on %s; %s)\n"
+									"      %s");
+	const char *const HOST_SET_ERROR =			_("A vhost must be in the format of a valid hostmask.");
+	const char *const HOST_SET_IDENT_ERROR =		_("A vhost ident must be in the format of a valid ident");
+	const char *const HOST_SET_TOOLONG =			_("Error! The vhost is too long, please use a host shorter than %d characters.");
+	const char *const HOST_SET_IDENTTOOLONG =		_("Error! The Ident is too long, please use an ident shorter than %d characters.");
+	const char *const HOST_NOT_ASSIGNED =			_("Please contact an Operator to get a vhost assigned to this nick.");
+	const char *const HOST_NO_VIDENT =			_("Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug");
+}
+
diff --git a/include/module.h b/include/module.h
index a879bf04a..4e4c96607 100644
--- a/include/module.h
+++ b/include/module.h
@@ -4,6 +4,5 @@
 #include "services.h"
 #include "commands.h"
 #include "modules.h"
-#define _(x) x
 
 #endif // MODULE_H
diff --git a/include/patricia.h b/include/patricia.h
index 72be0f94a..5893a209e 100644
--- a/include/patricia.h
+++ b/include/patricia.h
@@ -118,10 +118,7 @@ class patricia_tree
 		}
 
 		if (place != prev)
-		{
 			prev->up = newelem;
-			newelem->up = place;
-		}
 
 		if (place)
 		{
diff --git a/include/services.h b/include/services.h
index fbc6420fb..b5394287e 100644
--- a/include/services.h
+++ b/include/services.h
@@ -140,6 +140,13 @@ extern "C" void __pfnBkCheck() {}
 # undef int32
 #endif
 
+#if GETTEXT_FOUND
+# include LIBINTL
+# define _(x) anope_gettext(x)
+#else
+# define _(x) x
+#endif
+
 /** This definition is used as shorthand for the various classes
  * and functions needed to make a module loadable by the OS.
  * It defines the class factory and external AnopeInit and AnopeFini functions.
@@ -776,7 +783,6 @@ enum
  * user is kicked.
  */
 
-#include "language.h"
 #include "users.h"
 #include "account.h"
 #include "bots.h"
@@ -792,7 +798,7 @@ struct LevelInfo
 {
 	int what;
 	Anope::string name;
-	LanguageString desc;
+	const char *desc;
 };
 
 #include "channels.h"
@@ -852,7 +858,7 @@ struct NewsMessages
 {
 	NewsType type;
 	Anope::string name;
-	LanguageString msgs[10];
+	const char *msgs[10];
 };
 
 struct NewsItem
@@ -938,6 +944,7 @@ struct Uplink;
 class ServerConfig;
 
 #include "extern.h"
+#include "language.h"
 #include "operserv.h"
 #include "mail.h"
 #include "servers.h"
diff --git a/include/users.h b/include/users.h
index d54fd13be..091cecc5e 100644
--- a/include/users.h
+++ b/include/users.h
@@ -158,13 +158,6 @@ class CoreExport User : public Extensible
 	void SendMessage(BotInfo *source, const char *fmt, ...);
 	virtual void SendMessage(BotInfo *source, const Anope::string &msg);
 
-	/** Send a language string message to a user
-	 * @param source Sender
-	 * @param message The message num
-	 * @param ... parameters
-	 */
-	void SendMessage(BotInfo *source, LanguageString message, ...);
-
 	/** Collide a nick
 	 * See the comment in users.cpp
 	 * @param na The nick
diff --git a/lang/missing.sh b/lang/missing.sh
deleted file mode 100755
index 16ba7f9b9..000000000
--- a/lang/missing.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-HLANG=`cat ../include/language.h | grep "^\s" | sed 's/[\t,]//g'`
-CPPLANG=`cat ../src/language.cpp | grep "\s\/\* [A-Z0-9_]* \*\/" | sed 's/\/\* \(.*\) \*\//\1/' | sed 's/\t//'`
-echo "${HLANG} ${CPPLANG}" | sed 's/ /\n/' | sort | uniq -u
-
diff --git a/lang/unused.sh b/lang/unused.sh
deleted file mode 100755
index ae154fc7a..000000000
--- a/lang/unused.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-for string in `egrep "^.+[A-Z]+," ../include/language.h | sed "s/\t\(.*\),/\1/"` ; do
-	CMD=`grep -RI $string {../src,../modules,../include} | grep -v "language\.cpp:.*\/\* $string" | grep -v "language\.h:"`
-	if [ ! -n "$CMD" ] ; then
-		echo "$string is unused"
-		sed -i "s/\/\* $string \*\//\/* $string - UNUSED *\//" ../src/language.cpp
-		sed -i "/$string,/d" ../include/language.h
-	fi
-done
diff --git a/lang/update.sh b/lang/update.sh
deleted file mode 100755
index d1319ff6f..000000000
--- a/lang/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-pushd ../src > /dev/null
-xgettext -C -s -d Anope -o ../lang/anope.pot --from-code=utf-8 --keyword=_ language.cpp
-popd > /dev/null
-
-for f in *.po
-do
-	msgmerge -v -s -U $f `echo $f | cut -d'.' -f1`.pot
-done
diff --git a/lang/CMakeLists.txt b/language/CMakeLists.txt
index 80cbafdf1..840412f1e 100644
--- a/lang/CMakeLists.txt
+++ b/language/CMakeLists.txt
@@ -24,7 +24,6 @@ if(GETTEXT_FOUND)
       MAIN_DEPENDENCY ${LANG_PO}
     )
     # Add to cpack ignored files if not on Windows.
-    file(RELATIVE_PATH LANG_RELATIVE ${Anope_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${LANG_LANG})
     if(NOT WIN32)
       add_to_cpack_ignored_files("${LANG_MO}")
     endif(NOT WIN32)
diff --git a/lang/anope.ca_ES.po b/language/anope.ca_ES.po
index 3c880de12..33406df06 100644
--- a/lang/anope.ca_ES.po
+++ b/language/anope.ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:12-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Catalan\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s per més informació."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -35,7 +35,7 @@ msgstr ""
 "per més informació sobre una comanda especifica\n"
 "escriu /msg %S HELP comanda."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -54,14 +54,15 @@ msgstr ""
 "informació sobre un comanda especifica, escriu  \n"
 "/msg %S HELP comanda."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S et permet registrar i controlar varis\n"
@@ -74,12 +75,12 @@ msgstr ""
 "escriu /msg %S HELP comanda.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -92,122 +93,106 @@ msgstr ""
 "\n"
 "Les comandes de %S incloen:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s Changed the DEFCON level to %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s afegit a la llista AOP de %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s afegit a la llista HOP de %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s afegit a la llista SOP de %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s afegit a la llista VOP de %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s afegit a la llista d'accés de %s amb nivel %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s afegit a la llista de kicks automàtics en el canal %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s afegida a  la llista de paraules malsonants de  %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s afegit a la llista de AKILLs."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s afegit a la llista de SNLINEs."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s afegit a la llista de SQLINEs."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s afegit a la llista de SZLINEs."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s afegit a la teva lllista d'accés."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s afegit a la teva lllista d'accés."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s ja existeix a la llista de paraules malsonants de %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s ja esta present a la llista de kick automàtic en el canal %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s ja esta present a la llista de AKILLs."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s ja existeix a la llista de SNLINEs."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s ja existeix a la llista de SQLINEs."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s ja existeix a la llista de SZLINEs."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s no pot ser pres com vegades a banegar"
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s changed your usermodes."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -216,133 +201,114 @@ msgstr ""
 "Llista del canal %s:\n"
 "Nom                 Modes de Usr. Tòpic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s esborrat de la llista AOP de %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s esborrat de la llista HOP de %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s esborrat de la llista SOP de %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s esborrat de la llista VOP de %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s esborrat de la llista d'accés de %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s esborrat de la llista de kicks automàtics del canal %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s esborrada de la llista de paraules malsonants de %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 "%s instàncies esborrades de la llista d'excepcions al límit de sessions."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s esborrat de la llista de AKILLs."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s esborrat de la llista de SNLINEs."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s esborrat de la llista de SQLINEs."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s esborrat de la llista de SZLINEs."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s esborrat de la teva lllista d'accés."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s inhabilitat(s) en el canal %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s te masses canals registrats."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s ja esta cobert per %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s afegit a la teva lllista d'accés."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s no es un tipus de ban valid."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s no és un bot valid o un canal registrat."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s no es un e-mail valid."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s ja no esta sempre actiu en el canal %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "El nick %s no esta en el canal %s actualment."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s esta ara sempre actiu en el canal %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s not found on ignore list."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -351,107 +317,72 @@ msgstr ""
 "%s matches an except on %s and cannot be banned until the except have been "
 "removed."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s moved to %s AOP list."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s moved to %s HOP list."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s moved to %s SOP list."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s moved to %s VOP list."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s no trobat a la llista AOP de %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s no trobat a la llista HOP de %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s no trobat a la llista SOP de %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s no trobat a la llista VOP de %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s no trobat a la llista d'accés de %s."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s no trobat a la llista de kicks automàtics en el canal %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s no trobada a la llista de paraules malsonants de %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s no trobat a la llista de sessió."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s no trobat a a la llista d'excepcions al límit de sessions."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s no trobat a la llista de AKILLs."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s no trobat a a la llista de SNLINEs."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s no trobat a la llista de SQLINEs"
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s no trobat a la llista de SZLINEs."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s no trobat a la teva lllista d'accés."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s esborrat de la teva lllista d'accés."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -460,32 +391,32 @@ msgstr ""
 "llista d'usuaris de %s:\n"
 "Nick                 Mascara"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s will no longer be ignored."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s will now be ignored for %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s will now permanently be ignored."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Noticia: Totes les comandes enviades a %S son monitorejades!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Noticia: Els serveis estan en mode read-only; Els canvis no seran guardats!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -493,11 +424,11 @@ msgstr ""
 "Recordatori: Les mascares AKILL no poden contenir nicks; asegura't de no "
 "incloure el nick en la teva mascara."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Recordatori: Sols pots afegir mascares IP a la llista de SZLINEs."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -540,41 +471,38 @@ msgstr ""
 "fent servir la comanda LEVELS; escriu /msg %S HELP LEVELS\n"
 "per a més informació."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Advertència: Has sobrepassat el màximo numero de memos (%d). Et resultara "
-"impossible rebre més memos fins que esborris alguns dels existents."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Advertència: Has assolit el màxim numero de memos (%d). No podras rebre mes "
-"memos fins que esborris alguns dels existents."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] The memo you sent has been viewed."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] The memo you sent to %s has been viewed."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER clau email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER clau email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP grup clau"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -584,7 +512,7 @@ msgstr ""
 "o un altre acció maliciosa. L'abus de %S resultara, com a\n"
 "mínim, en la perdua del nickname esmentat."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -605,7 +533,7 @@ msgstr ""
 "Veure l'accés, AKICK, i paràmetres de les llistes de nivells per a\n"
 "qualsevol canal."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -617,370 +545,386 @@ msgstr ""
 "veure la llista d'accés per qualsevol nickname\n"
 "(/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "               Opcions : %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "            \tvhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Nick del bot : %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "           Nick del bot : Encara no assignat."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "              Opciós: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "  Kicker per majuscules : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "  Kicker per majuscules : %s (%d kick(s) per a ban; mínim %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "            Caps kicker : %s (mínim %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "          Fundador: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Tipus de ban: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "    Kicker per negretes : %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker per negretes : %s (%d kick(s) per a ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kicker per flood : %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Kicker per flood : %s (%d kick(s) per a ban; %d linees en %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kicker per flood : %s (%d linees en %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Mascara : %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "     Kicker per colors : %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "     Kicker per colors : %s (%d kick(s) per a ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "       Tipus de ban: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "  Últim cop utilitzat: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "      Mode de lock: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "  Kicker per repetició : %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "  Kicker per repetició : %s (%d kick(s) per a ban; %d vegades)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "  Kicker per repetició : %s (%d vegades)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "           Successor: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspended: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "  Kicker per majuscules : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "    Kicker per negretes : %s (%d kick(s) per a ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "         Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "         Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "      Últim tòpic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "        Registrat: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (inhabilitat)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (nomès el fundador)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifica la llista d'adreçes autoritzades"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Modifica la llista d'usuaris privilegiats"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "ACT                Makes the bot do the equivalent of a \"/me\" command"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Manté la llista d'AutoKick"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Manté la llista d'AutoKick"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Manipula la llista AKILL"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      List channels you have access on"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Modifica la llista d'usuaris AOP"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Assigna un bot a un canal"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Manté una llista de paraules malsonants"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bans a selected nick on a channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr ""
 "    BANTYPE       Estableix com els serveis posen bans\n"
 "                  en el canal"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Manté la llista de bots de la xarxa"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Llista bots disponibles"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Cancela l'últim memo enviat"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL all users on a specific channel"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Llista tots els records de canal"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Checks if last memo to a nick was read"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  neteja els Modes d'un canal"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirm a nickserv auth code"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "    Creat : %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipulate the DefCon system"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Delete the vhost of another user"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Esborra un o més memos"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Delete the vhost for all nicks in a group"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deops a selected nick on a channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Estableix la descripció del canal"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoices a selected nick on a channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Estableix el display del teu grup amb serveis"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Cancel.la l'enregistrament d'un canal"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Cancela el registre d'un nickname"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "       Descripció: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Associa un E-mail amb el teu nickname"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Estableix un missatge a enviar als\n"
-"                  usuaris quant entrin al canal"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Modifica la llista de límit de sessió"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Evita que un canal es faci servir"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Impossibilita que un nickname sigui utilitzat"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Estableix el fundador d'un canal"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -988,70 +932,75 @@ msgstr ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Returns the key of the given channel"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Recupera la clau per un nickname\n"
 "               (sols si encriptació esta deshabilitada)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lists all nicknames in your group"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Envia un missatge a totss els usuaris"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Associa un salutació amb el teu nickname"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Syncs the vhost for all nicks in a group"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Ingresa en un grup"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr " Missatge de benvinguda: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Halfops a selected nick on a channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Oculta algunes parts de la teva informació"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Per identificar-te amb la teva clau"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Modify the Services ignore list"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1059,49 +1008,49 @@ msgstr ""
 "INFO               Allows you to see BotServ information about a channel or "
 "a bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Displays information about a given nickname"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Lists information about the named registered channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Displays information about your memos"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        \"Jupiter\" (Mart,Saturn....) un servidor"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 "    KEEPTOPIC     Rete el topic quant el canal no\n"
 "                  esta en uso"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Configura kickers"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Kickeja un usuari d'un canal"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicks a selected nick from a channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Activa o desactiva la protecció"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1109,95 +1058,88 @@ msgstr ""
 "    LANGUAGE   Estableix el llenguatge amb el que els serveis\n"
 "                   t'enviaran missatges"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Redefine el significat de nivells d'accés"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Displays one or more vhost entries."
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       List all registered nicknames that match a given pattern"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lists all registered channels matching the given pattern"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   llista els teus memos"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   Defineix missatges per a ser mostrats a usuaris\n"
 "                al conectarse"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Fixa els Modes de canal on o off"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Canvia els Modes d'un canal"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  neteja els Modes d'un canal"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Info about a loaded module"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     List loaded modules"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Un-Load a module"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr ""
 "    MSG        canvia el metode de comunicació amb els\n"
 "                    serveis"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1205,94 +1147,85 @@ msgstr ""
 "    NOOP        Temporalment elimina totes les linees O:\n"
 "                d'un servidor remotamente"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Deactivates your assigned vhost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Give Operflags to a certain user"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Activates your assigned vhost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Gives Op status to a selected nick on a channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 "    OPERNEWS    Defineix missatges per a ser mostrats a usuaris\n"
 "                al transformar-se en operadors"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Envia una noticia quant les comandes\n"
 "                  OP/DEOP son utilitzats"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gives you owner status on channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "    Opcions : %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Estableix la clau del teu nickname"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Regula l'ús de comandes critiques"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Oculta el canal de la comanda LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Preveu el teu nickname d'apareixer en un\n"
-"                   /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protects a selected nick on a channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr ""
 "    QUIT        Termina el programa de serveis sense guardar\n"
 "                els canvis"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1300,247 +1233,250 @@ msgstr ""
 "    RANDOMNEWS  Defineix missatges per a ser mostrats a usuaris\n"
 "                al conectarse"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Llegeix un o més memos"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr ""
 "    RECOVER    Kickeja un usuari que estigui utilitzant el teu nickname"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Registra un nickname"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Registra un nickname"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr "    RELEASE    Repren possesió del teu nick després de RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Recarrega la configuració dels serveis"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Resend a nickserv auth code"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords."
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr ""
 "    RESTART     Guarda la base de dades dels serveis i\n"
 "                reinicia els serveis"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Restringeix l'accés al canal"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Sends a memo and requests a read receipt"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Kicker per inversos : %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker per inversos : %s (%d kick(s) per a ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "SAY                Makes the bot say the given text on the given channel"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Activa les opcions de seguretat de %S"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr ""
 "    SECUREFOUNDER Estricto control de l'estatus de fundador\n"
 "                  del canal"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Estricte control de l'estatus de chanop"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Envia un memo a un nick o canal"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Send a memo to all registered users"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Vas oblidar la teva clau? Intenta això"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Mostra la llista de sessions de host"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Configura opcions de bots"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Set the vhost of another user"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Estableix varies opcions globals dels serveis"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Establir opcions i informació d'un canal"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Estableix proteccions, inclouent kills"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Estableix opcions relacionades a memos"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Set the vhost for all nicks in a group"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr ""
 "    SHUTDOWN    Termina el programa de serveis guardant els\n"
 "                canvios"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Firma kicks fets amb la comanda KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Manipula la llista SNLINE"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Modifica la llista d'usuaris SOP"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Manipula la llista SQLINE"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Display Services staff and online status"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF  Send a memo to all opers/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       mostra estatus dels serveis i la xarxa"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Returns the current access level of a user\n"
 "               on a channel"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Returns the owner status of the given nickname"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Estableix el successor d'un canal"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
 "               channel data and settings"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend a given nick"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Forcefully change a user's nickname"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Manipula la llista SZLINE"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr ""
 "    TOPICLOCK     El topic sols pot ser canviat amb\n"
 "                  TOPIC"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Change a user's modes"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Unassigns a bot from a channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Releases a suspended channel"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend a given nick"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1548,84 +1484,84 @@ msgstr ""
 "    UPDATE      Força a la base de dades dels serveis a\n"
 "                ser actualitzada a disc inmediatament"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Llista tots els records d'usuaris"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    Utilitzat a : %d canal(s)"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Voices a selected nick on a channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Canvia el sistema de privilegis d'usuari"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Kicker per paraules malsonants : %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Kicker per paraules malsonants : %s (%d kick(s) per a ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "      \t\tAdreça E-mail: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "   Esta en linea desde: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "      Ultima vegada vist: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr " Tòpic establert per: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1634,17 +1570,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1653,98 +1589,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "Missatge d'entrada: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "  Nom real : %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "     Temps registrat: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  Kicker per subrallats : %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  Kicker per subratllats : %s (%d kick(s) per a ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Num  De                Data/Hora"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1753,7 +1693,7 @@ msgstr ""
 "%3d  %s (per %s en %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1762,25 +1702,16 @@ msgstr ""
 "%3d %s (per %s en %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (enganxat) (per %s en %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (per %s a %s; %s)\n"
 "   Límit: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1789,254 +1720,260 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "%S commands:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s no es notificat per memos nous."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modules loaded."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bots disponibles."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d dies"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (per %s en %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d hores"
+msgid "%d Modules loaded."
+msgstr "%d Modules loaded."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minuts"
+msgid "%d bots available."
+msgstr "%d bots disponibles."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicknames en el grup."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d segons"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "La llista AOP de %s esta buida."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "La llista HOP de %s esta buida."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "La llista SOP de %s esta buida."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "La llista VOP de %s esta buida."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "La llista d'accés de %s esta buida."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "La llista de kicks automàtics del canal %s esta buida."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "La llista de paraules malsonants de %s esta buida."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s no pot ser el sucessor en el canal %s ja que n'es el fundador."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s no pot rebre memos."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "%S commands:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr ""
 "%s La cobertura es mes amplia; Per favor utilitzi una mascara mes especifica."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s actualment te %d memos, dels quals %d encara no han estat llegits."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s actualment te %d memos, dels quals 1 encara no ha estat llegit."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s actualment te %d memos."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s actualment te %d memos, dels quals cap ha estat llegit."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s actualment te 1 memo i encara no ha estat llegit."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s te 1 memo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s no te memos."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s actualment te molts memos i no pot rebre'n mes."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s no te límit per a memos."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s no te memos."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s no te memos nous."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s es %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s esta momentaneament offline."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s Esta actualment online."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s is disabled"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s is enable"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is no longer a Super-Admin"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s no es notificat per memos nous."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s es notificat per memos nous quant es connecta i quant li són enviats."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s es notificat de nous memos quant es connecta."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s es notificat quant nous memos li són enviats."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s is now a Super-Admin"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Llista AOP per a %s:\n"
+"  Num  Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s no trobat a la llista de kicks automàtics en el canal %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s esborrat de la llista de kicks automàtics del canal %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s no t'enviara cap notificació dels teus memos."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s ara te notificara dels teus memos quant se t'enviin."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2045,95 +1982,79 @@ msgstr ""
 "%s ara et notificara dels teus memos quant et conectis i quant et siguin "
 "enviats."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s ara et notificara dels teus memos quant et conectis o treguis el teu /"
 "AWAY."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) afegit a la llista de bots."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "El límit de memos per a %s es %d, i no pot ser canviat."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "El límit de memos per a %s es %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL any new clients connecting"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Force Chan Modes (%s) to be set on all channels"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore any non-opers with message"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill any NEW clients connecting"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* No MLOCK changes"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* No new channel registrations"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* No new memos sent"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* No new nick registrations"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Silently ignore non-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Use the reduced session limit of %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 dia"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 hora"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minut"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 segon"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<desconegut>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "A massmemo has been sent to all registered users."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2142,133 +2063,135 @@ msgstr ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "A passcode has been sent to %s, please type /msg %s confirm <passcode> to "
 "complete registration"
 
-#: language.cpp:5126
+#: include/language.h:114
 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"
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Error! A vhost can only contain A-Z, a-z, 0-9, '.' and '-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|VIEW|CLEAR} [nick [nivell] | llista]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT canal text"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK canal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-o-mascara] [rao]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE en %s completa; %d usuaris afectats."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "La llista de AKILLS esta buida."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista} "
 "[raó]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Llista AOP per a %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "accés denegat."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Nivell d'accés per a %s en %s cambiada a %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Nivell d'accés per a %s en %s no cambiada de %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "El nivell d'accés ha de ser entre %d i %d inclosos."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "El nivell de accés no pot ser zero."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Opcions del nivell d'accés pel canal %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Nivells d'accés per a %s canviats als valors originals."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lllista d'accés per %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Llista d'accés per a %s:\n"
 "  Num   Niv  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lllista d'accés:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2277,22 +2200,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s afegit a la llista de kicks automàtics en el canal %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Noves notícies d'entrada afegida (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Nueva noticia de oper anadida (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Nova noticia a l'atzar afegida (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2300,239 +2228,232 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Totes les linees O de %s han estat esborrades."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Totes les linees O de %s han estat esborrades."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Tots els bans del canal %s han estat esborrats."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Tots els excepts del canal %s han estat esborrats."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "All invites on channel %s have been removed."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Totes les notícies d'entrada esborrades."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "All memos for channel %s have been deleted."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Tots els Modes netegats del canal %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Tots els modes en el canal %s han estat reestablerts."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Tots els teus memos han estat esborrats."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Totes les notícies de oper esborrades."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Totes les notícies al azar esborrades."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Tots els usuaris han estat kickegats del canal %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "All vhost's in the group %s have been set to %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Autorizat a halfop/dehalfop a tu mateix"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Autorizat a op/deop a tu mateix"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Autorizat a protect/deprotect a tu mateix"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Autorizat a voice/devoice a tu mateix"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Abilitat a assignar/deassignar un bot"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Autoritzat a banegar-te"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Autoritzat a expulsar-te a tu mateix"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Abilitat a llistar/llegir memos del canal"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Abilitat a modificar la lllista de accés"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Abilitat a utilitzar la comanda AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Abilitat a utilitzar la comanda BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Autoritzat a utilitzar la comanda BAN"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Abilitat a utilitzar la comanda CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Abilitat a utilitzar La comanda GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Abilitat a utilitzar la comanda HALFOP/DEHALFOP"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr ""
 "Autoritzar a utilitzar La comanda INFO amb\n"
 "l'opció ALL"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Abilitat a utilitzar la comanda INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Abilitat a utilitzar la comanda KICK"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Abilitat a utilitzar la comanda OP/DEOP"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Abilitat a utilitzar la comanda PROTECT/DEPROTECT"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Abilitat a utilitzar la comanda SAY i ACT"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Abilitat a utilitzar la comanda SET (no FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Autoritzat a utilitzar la comanda TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Abilitat a utilitzar la comanda UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Abilitat a utilitzar La comanda VOICE/DEVOICE"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Abilitat a utilizar comandes de fantasia"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Abilitat a veure la lllista de accés"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Llista de kicks automàtics pel canal %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Status automàtic d'operador de canal"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Mode automàtic +a"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Mode automàtic +h"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Mode automàtico +v"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [paraula | llista] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2542,7 +2463,7 @@ msgstr ""
 "BOT CHANGE nick-antic nick-nou [usuari [host [nom-real]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2551,111 +2472,109 @@ msgstr ""
 "llista de paraules malsonants per a %s:\n"
 "  Num   Paraula                        Tipo"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "La llista de paraules malsonants esta ara buida."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Tipus de ban pel canal %s es ara #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Modes binaris i bans netegats del canal %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "El bot %s ja existeix."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "El bot %s no existeix."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "El bot %s ha estat assignat al canal %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "El bot %s ha estat canviat a %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "El bot %s ha estat esborrat."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s is already assigned to channel %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot kickejara ops en el canal %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot kickejara voices en el canal %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot no kickejara ops en el canal %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot no kickejara voices en el canal %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Bot Hosts may only contain valid host characters."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents may only contain %d characters."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Bot Idents may only contain valid characters."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks may only contain valid nick characters."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "El bot no esta al canal %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Llista de bots:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"El bot entrara a un canal quan hi hagin\n"
-"%d usuari(s) en ell."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2666,7 +2585,7 @@ msgstr ""
 "%d kicks al mateix usuari. Utilitza la comanda BADWORDS\n"
 "per a afegir o treure paraules."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2674,20 +2593,20 @@ msgstr ""
 "El bot ara kickejara paraules malsonants. Utilitza la comanda BADWORDS\n"
 "per a afegir o treure paraules."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "El bot ara kickjeara negretes, i banejara després de \n"
 "%d kicks al mateix usuari."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "El bot ara kickjeara negretes."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2698,7 +2617,7 @@ msgstr ""
 "%d caràcters i %d%% del missatge senser), i banegara\n"
 "després de %d kicks al mateix usuari."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2707,47 +2626,47 @@ msgstr ""
 "El bot ara kickejara majuscules (han de ser al menys\n"
 "%d caràcters i %d%% del missatge senser)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "El bot ara kickejara colors, i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "El bot ara kickejara colors."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "El bot ara kickejara flood (%d linees in %d segons), i \n"
 "banejara després de %d kicks al mateix usuari."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "El bot ara kickejara flood (%d linees en %d segons)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2758,7 +2677,7 @@ msgstr ""
 "el mateix), i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2767,137 +2686,153 @@ msgstr ""
 "El bot ara kickejara repeticions (usuaris que repeteixin %d vegades\n"
 "el mateix)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "El bot ara kickejara reversos, i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "El bot ara kickejara reversos."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "El bot ara kickejara subratllats, i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "El bot ara kickejara subratllats."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "El bot ara kickejara colors."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after\n"
+"%d kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "El bot ja no kickejara paraules malsonants. "
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "El bot ja no kickejara negretes."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "El bot ja no kickejara majuscules."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "El bot ja no kickejara colors."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "El bot ja no kickejara flood."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "El bot ja no kickejara repeticions."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "El bot ja no kickejara reversos."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "El bot ja no kickejara subratllats."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "El bot ja no kickejara majuscules."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ      : %6d registres, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots reservats a operadors de IRC:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes llegits   : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes escrits : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR canal Modes-a-netegar"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Can't logout %s because he's a services operator."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR canal Modes-a-netegar"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Imposible enviar email ara; per favor intenta en uns instants."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ     : %6d registres, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Changed usermodes of %s."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "El Canal %s No existeix."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "El canal %s ha estat eliminat."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2906,144 +2841,103 @@ msgstr ""
 "El Canal %s ha estat prohibit per %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "El canal %s ja esta enregistrat!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Canal %s ara prohibit."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Channel %s is now released."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Channel %s is now suspended."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "El Canal %s no esta registrat."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "El Canal %s no pot ser registrat o usat."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "El canal %s no pot ser enregistrat."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "El canal %s esta registrat sota el teu nickname: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canal        : %6d registres, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "El canal %s caducara."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "El canal %s no caducara."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "La llista AOP de canals %s ha estat netegada."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "La llista HOP de canals %s ha estat netegada."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "La llista SOP de canals %s ha estat netegada."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "La llista VOP de canals %s ha estat netegada."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La llista d'accés pel canal %s ha estat netegada."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La llista de kicks automàtics en canal %s ha estat netegada."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Channel %s is now released."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr ""
-"La llista de AOP de canals nomès pot contenir nicks\n"
-"registrats."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Llistes HOP de canals sols pot tenir nicks registrats."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Llistes SOP de canals sols pot tenir nicks registrats."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINEs de canal no estan soportades pel teu IRCd, així que no les pots "
 "utilitzar."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Llistes VOP de canals sols pot tenir nicks registrats."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Las llistes de accés a canals sols pot contenir nicks registrats."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3051,11 +2945,7 @@ msgstr ""
 "Llista de canal:\n"
 "Nom                 Modes de Usr. Tòpic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Status d'operador de canal inhabilitat"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3064,7 +2954,7 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3072,31 +2962,16 @@ msgstr ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description "
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Impossible prohibir el canal %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "La prohibició de %s no es possible!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Couldn't release channel %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Couldn't suspended channel %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Llista actual de AKILLs:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3104,15 +2979,15 @@ msgstr ""
 "Llista actual de AKILLs:\n"
 "  Num   Mascara                           Raó"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Current Module list:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Llista actual de SNLINEs:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3120,11 +2995,11 @@ msgstr ""
 "Llista actual de SNLINEs:\n"
 "  Num   Mascara                           Raó"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Llista actual de SQLINEs:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3132,11 +3007,11 @@ msgstr ""
 "Llista actual de SQLINEs:\n"
 "  Num   Mascara                           Raó"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Llista actual de SZLINEs:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3144,727 +3019,614 @@ msgstr ""
 "Llista actual de SZLINEs:\n"
 "  Num   Mascara                           Raó"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "llista d'excepcions al límit de sessions actual:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Numero actual de AKILLs: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Numero actual de SNLINEs: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Numero actual de SQLINEs: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Numero actual de SZLINEs: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Actuals usuaris: %d (%d ops)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {numero | llista | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP canal"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Temps d'expiració per defecte de AKILL: %d dies"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Temps d'expiració per defecte de AKILL: %d hores"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Temps d'expiració per defecte de AKILL: %d minuts"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Temps d'expiració per defecte de AKILL: 1 dia"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Temps d'expiració per defecte de AKILL: 1 hora"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Temps d'expiració per defecte de AKILL: 1 minut"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Temps d'expiració per defecte de AKILL: Sense expiració"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Temps d'expiració per defecte de SNLINE: %d dies"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Temps d'expiració per defecte de SNLINE: %d hores"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Temps d'expiració per defecte de SNLINE: %d minuts"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Temps d'expiració per defecte de SNLINE: 1 dia"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Temps d'expiració per defecte de SNLINE: 1 hora"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Temps d'expiració per defecte de SNLINE: 1 minut"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Temps d'expiració per defecte de SNLINE: Sense expiració"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Temps d'expiració per defecte de SQLINE: %d dies"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Temps d'expiració per defecte de SQLINE: %d hores"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Temps d'expiració per defecte de SQLINE: %d minuts"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Temps d'expiració per defecte de SQLINE: 1 dia"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Temps d'expiració per defecte de SQLINE: 1 hora"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Temps d'expiració per defecte de SQLINE: 1 minut"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Temps d'expiració per defecte de SQLINE: Sense expiració"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Temps d'expiració per defecte de SZLINE: %d dies"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Temps d'expiració per defecte de SZLINE: %d hores"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Temps d'expiració per defecte de SZLINE: %d minuts"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Temps d'expiració per defecte de SZLINE: 1 dia"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Temps d'expiració per defecte de SZLINE: 1 hora"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Temps d'expiració per defecte de SZLINE: 1 minut"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Temps d'expiració per defecte de SZLINE: Sense expiració"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "%d instàncies esborrades de la llista AOP de %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "%d instàncies esborrades de la llista HOP de %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "%d instàncies esborrades de la llista SOP de %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "%d instàncies esborrades de la llista VOP de %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "%d instàncies esborrades de la llista d'accés de %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr ""
 "%d instàncies esborrades de la llista de kicks automàtics del canal %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "%d paraules esborrades de la llista de paraules malsonants de %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr ""
 "%d instàncies esborrades de la llista d'excepcions al límit de sessions."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "%d instàncies esborrades de la llista de AKILLs."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "%d instàncies esborrades de la llista de SNLINEs."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "%d instàncies esborrades de la llista de SQLINEs."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "%d instàncies esborrades de la llista de SZLINEs."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "1 instància esborrada de la llista AOP de %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "1 instància esborrada de la llista HOP de %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "1 instància esborrada de la llista SOP de %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "1 instància esborrada de la llista VOP de %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 instància esborrada de la llista d'accés de %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 instància esborrada de la llista de kicks automàtics del canal %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "1 paraula esborrada de la llista de paraules malsonants de %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "1 instància esborrada de la llista d'excepcions al límit de sessions."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "1 instància esborrada de la llista de AKILLs."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "1 instància esborrada de la llista de SNLINEs."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "1 instància esborrada de la llista de SQLINEs."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "1 instància esborrada de la llista de SZLINEs."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "1 instància esborrada de la llista AOP de %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La descripció de %s canviada a%s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "Desactivada"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Displayed all records (Count: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Displayed records from %d to %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Displayed records matching key %s (Count: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "No utilitzis negreta en aquest canal!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "No utilitzis colors en aquest canal!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "No utilitzis reversos en aquest canal!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "No utilitzis la paraula %s en aquest canal!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "No utilitzis subratllats en aquest canal!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Adreça E-mail no establerta."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "E-mail per %s es invalid."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametres]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Match %s to %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "Activada"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "End of %s list."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "fi de llista d'accés."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Fi de la llista de canals."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fi de la lllista - %d/%d resultat(s) mostrat(s)."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fi de la lllista - %d/%d resultat(s) mostrat(s)."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Fi de la llista d'usuaris."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Catala"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Missatge d'entrada per a %s canviat."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Missatge d'entrada per a %s no establert."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Excepció per a %s (#%d) moguda a la posició %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Temps d'expiració per a %s canviat."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID canal raó"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [raó]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nickname rao"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nickname [rao]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Mode fantasia ara activada en el canal %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Mode fantasia ara desactivat en el canal %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Mode fantasia ara activada en el canal %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s will no longer be ignored."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "El Fundador de %s cambiat a %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host No WildCards!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "La comanda GETPASS no esta disponible per l'us d'encriptació."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [clau]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL missatge"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP grup clau"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "El ghost amb el teu nick ha estat expulsat."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Salutació"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Missatge de benvinguda mostrat"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Mode salutació ara desactivat en el canal %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Mode salutació ara activat en el canal %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Llista HOP per a %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d registres, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts amb un mínim de %d sessions:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY clau"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Si no canvies el teu nick en 20 segons, el canviare jo."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Si no canvies el teu nick en un minut, el canviare jo."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Codi ignore sera utilitzat."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Codi ignore no sera utilitzat."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ignore list has been cleared."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "La llista ignore esta buida."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Llista de bots:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3880,29 +3642,25 @@ msgstr ""
 "Escriu /msg %S HELP SET opció per mes\n"
 "informació sobre una opció especifica."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informació pel bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informació pel canal %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Error Intern - Impossible processar petició."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Temps d'expiració invàlid."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3910,13 +3668,13 @@ msgstr ""
 "Mascara invalida. Nomès mascares reals son valides ja que excepcions no son "
 "comparades a nicks o usernames."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Invalid passcode has been entered, please check the e-mail again, and retry."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3925,295 +3683,309 @@ msgstr ""
 "Límit de sessió invàlid. Ha de ser un sencer vàlido més gran o igual a zero "
 "i mes petit que %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Valor de umbral invàlid. Ha de ser un sencer vàlid més gran a 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE nom-del-servidor [raó]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal opció {ON|OFF} [establiments]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK canal usuari raó"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [item [nivell]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST patro"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST patro [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [llista | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [text|numero]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Llenguatge canviat a Català."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ultim memo enviat a %s va ser cancel.lat."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Ùltim missatge quit: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ultima adreça vista: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Nivell per a %s en el canal %s cambiat a %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "El nivell ha d'estar entre %d i %d inclosos."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Aquesta comanda es inservible en aquest mode."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lllista de resultats concordant %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lllista de nicknames en el grup de %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Lllista de nicknames en el teu grup:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Canals locals no poden ser enregistrats."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Notícia d'entrada #%d esborrada."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Notícia d'entrada #%d no trobada!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Notícies d'entrada:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE canal Modes"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO FileName"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD FileName"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "La mascara %s ja esta present a la teva lllista d'accés."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "La mascara ha de ser de la forma usuari@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Màxim  numero d'usuaris: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Memo %d de %s (%s). per a esborrar-lo escriu: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Memo %d de %s (%s). per a esborrar-lo escriu: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d ha estat esborrat."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Límit de memos per a %s deshabilitat."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Límite de memos per a %s establert a %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Límit de memos per a %s establert a 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Límit de memos molt alt; limitant-lo a %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviat a %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ numero"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ %s numero"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ numero"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ %s numero"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Mode de missatge"
 
-#: language.cpp:866
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Mode %c ignorat per que no pots ¿¿¿lockerjar-lo???."
-
-#: language.cpp:1314
-#, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Mode +o ha estat reestablert del canal %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Mode de lock en el canal %s canviat a %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "      Mode de lock: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s loaded"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s loaded"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s unloaded"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Author: %s loaded: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} servidor"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliases NS   : %6d registres, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grups NS    : %6d registres, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Mai expulsat pels kicks del bot"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "New memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Nous memos per a %s. per a llegir-los escriu: /msg %s READ numero"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Nous memos per a %s. Per a llegir-los escriu: /msg %s READ %s numero"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "La llista de notícies esta plena!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4222,146 +3994,132 @@ msgstr ""
 "El nick %s ha estat prohibit per %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is an illegal nickname and cannot be used."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is currently in use."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "El nick %s esta prohibit."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "El nick %s no esta sent utilitzat."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "El nick %s no esta en us."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "El nick %s no esta registrat."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "El nick %s no pot ser registrat o utilitzat."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s not found on ignore list."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s doesn't have a memo from you."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Nick %s ha estat desconnectat."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is currently suspended."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NOT registered, please try again later."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nickname %s confirmed"
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Nickname %s ha estat expulsat."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "El nickname %s ja esta registrat!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "El nickname %s no pot ser registrat."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "El nickname %s ja esta registrat sota el teu compte: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Nickname Registration (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Clau pel Nickname (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4372,167 +4130,122 @@ msgstr ""
 "automatica, en altres paraules, seran esborrats després\n"
 "de %d dies."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "No # found in front of channel name."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Mode no bot ara desactivat en el canal %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Mode no bot ara activat en el canal %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No Emails listed for %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Sense bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "No existeix ajuda per %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No information about module %s is available"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "No hi ha notícies d'entrada per a esborrar!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "No existeixen instàncies coincidents a la llista AOP de %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "No existeixen instàncies coincidents a la llista HOP de %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "No existeixen instàncies coincidents a la llista SOP de %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "No existeixen instàncies coincidents a la llista VOP de %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "No hi ha instàncies que concordin a la llista d'accés de %s ."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr ""
 "No existeixen instàncies que concordin a la llista de kicks automàtics en el "
 "canal %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr ""
 "No existeixen paraules que concordin a la llista de paraules malsonants de %"
 "s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "No existeixen instàncies similars a la llista d'excepcions al límit de "
 "sessions."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "No existeixen instàncies similars a la llista de AKILLs."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "No existeixen instàncies similars a la llista de SNLINEs."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "No existeixen instàncies similars a la llista de SQLINEs."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "No existeixen instàncies similars a la llista de SZLINEs."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Cap memo pot ser cancelat."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "No modules currently loaded"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "No hi ha notícies de oper per esborrar!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "No hi ha notícies a l'atzar per esborrar!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Sense raó"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Sense firma de kick quant SIGNKICK LEVEL es utilitzat"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "No existeix la instància (#%d) a la llista AOP de %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "No existeix la instància (#%d) a la llista HOP de %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "No existeix la instància (#%d) a la llista SOP de %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "No existeix la instància (#%d) a la llista VOP de %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Cap"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "No es possible entra a un canal si esta RESTRINGIT"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4544,95 +4257,93 @@ msgstr ""
 "del canal entri en aquest periode de temps) sera\n"
 "automaticament eliminat."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Num  Límit Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "Notícia de OP"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "La informació antiga es igual a la nova."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Op-notice option for %s is now OFF."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Op-notice option for %s is now ON."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Noticia de oper #%d esborrada."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Noticia de oper #%d no trobada!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "notícies de oper:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ     : %6d registres, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "An O:Line with the flags %s has been added for %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Protecció de Ops"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opció %s no pot ser establerta en aquesta xarxa."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Passcode for %s is %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Clau aceptada - Has estat reconegut."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4640,60 +4351,56 @@ msgstr ""
 "Autentificació per clau requerida per aquesta comanda.\n"
 "Intenta un altre cop després de escriure /msg %s IDENTIFY clau."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "La clau per %s es %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Clau incorrecta."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "La clau de %s ha estat enviada."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Pau"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Peace option for %s is now OFF."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Peace option for %s is now ON."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 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."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4701,172 +4408,133 @@ msgstr ""
 "com a mínim 5 caràcters, no han de ser fàcils d'encertar (ex. Nom real o "
 "Nick), i no poden contenir el caràcter d'espai o tabulació."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Please use a valid server name when juping"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Please use the symbol of # when attempting to register"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Per favor espera %d segons i intenta un altre cop."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Per favor espera %d segons abans d'utilitzar la comanda GROUP novament."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Per favor espera %d segons abans d'utilitzar la comanda REGISTER novament."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Please wait %d seconds before using the RSEND command again."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Per favor espera %d segons abans d'utilizar la comanda SEND un altre cop."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Privat"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Mode privado del bot %s esta ara desactivat."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Mode privado del bot %s esta ara activat."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Private option for %s is now OFF."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Private option for %s is now ON."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Protecció"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Protection is now ON, with no delay."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Providing command: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [text|numero]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {llista | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [clau]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER canal descripció"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER clau email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER clau [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [clau]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | channel} memo-text"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Notícia a l'atzar #%d esborrada."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Noticia a l'atzar #%d no trobada!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Notícies al Azar:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4874,296 +4542,307 @@ msgstr ""
 "Registration step 1 may have expired, please use \"/msg %s register "
 "<password> <email>\" first."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "accés restringit"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Restricted access option for %s is now OFF."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Restricted access option for %s is now ON."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY canal text"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | canal} text"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "La comanda SENDPASS no esta disponible per l'us d'encriptació."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST límit"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal Opció establiments"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET canal opció per ametres"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET canal OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET opcio per ametres"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET Opció estabilment"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numero"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] límit"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [usuari | canal] {límit | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "La llista de SNLINEs esta buida."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5171,340 +4850,325 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista}[:"
 "raó]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Llista SOP per a %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "La llista de SQLINEs esta buida."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista} "
 "[raó]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Channel %s not registered"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND channel reason"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND channel [reason]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND channel reason"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick newnick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "La llista de SZLINEs esta buida."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista} "
 "[raó]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Segur"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Fundador Segur"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Ops Segurs"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Secure founder option for %s is now OFF."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Secure founder option for %s is now ON."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Secure ops option for %s is now OFF."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Secure ops option for %s is now ON."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Secure option for %s is now OFF."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Secure option for %s is now ON."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Segur"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "This service is temporarly disabled, please try again later"
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services are now at DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Serveis ara en Mode expire."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Serveis ara en Mode no expire."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Serveis ara en Mode nomès lectura."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Serveis ara en Mode de lectura-escriptura."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Serveis ara en Mode debug (nivell %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Serveis ara en Mode debug."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Serveis ara en Mode no-debug."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Els serveis han estat configurats per no enviar email"
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Llista ignore de serveis:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Els serveis no han pogut canviar Modes. Estan ben configurats els teus "
-"servidors?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Els serveis no han pogut canviar Modes. Estan les linees U: dels teus "
 "servidors configurades correctament?"
 
-#: language.cpp:1939
+#: modules/core/os_stats.cpp:137
 #, c-format
-msgid "Services up %d day, %02d:%02d"
+msgid "Services up %d days, %02d:%02d"
 msgstr "Serveis amunt %d dies, %02d:%02d"
 
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Serveis amunt %d dies, %02d:%02d"
+msgid "Services up %d hours, %d minutes"
+msgstr "Serveis amunt %d hores, %d minuts"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Serveis amunt %d hora, %d minut"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Serveis amunt %d minuts, %d segons"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Serveis amunt %d hora, %d minuts"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Serveis amunt %d hores, %d minut"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Serveis amunt %d hores, %d minuts"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Serveis amunt %d minut, %d segon"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Serveis amunt %d minut, %d segons"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Serveis amunt %d minuts, %d segon"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Serveis amunt %d minuts, %d segons"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "L'arxiu de configuració de serveis ha estat carregat novament."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "El teu nick ha estat alliberat pels serveis."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Límit de sessió per a %s establert a %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Límits de sessions no disponibles."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessions     : %6d registres, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Opció %s no coneguda. Escriu /msg %s HELP LEVELS DESC per a una llista de "
 "opcións valides."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "L'establiment per a DEBUG ha de ser ON, OFF, o un numero positiu."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "L'establiment per a IGNORE ha de ser ON o OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Establiment per a NOEXPIRE ha de ser ON o OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "L'establiment per a READONLY ha de ser ON o OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr "Setting for SuperAdmin must be ON or OFF."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Signed kick option for %s is now OFF."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Signed kick option for %s is now ON."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5513,233 +5177,198 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Signed kick option for %s is now ON."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Kicks Signats"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND has been disabled on this network."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Ho sento, el assignament de bots esta temporalment inhabilitat."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Ho sento, la creació de bot ha fallat"
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Ho sento, la modificació de bots esta temporalment inabilitada."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'opcions per a bot esta temporalment inhabilitat"
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la modificació de la llista AOP de canals esta\n"
 "temporalment deshabilitada."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr ""
-"Ho sento, la modificació de llistes HOP de canals esta\n"
-"temporalment deshabilitada."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr ""
-"Ho sento, la modificació de la llista SOP de canals esta\n"
-"temporalment deshabilitada."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr ""
-"Ho sento, la modificació de la llista VOP de canals esta\n"
-"temporalment deshabilitada."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la modificació d'accés a canals esta temporalment inabilitada."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la modificació de kicks automàtics a canals esta temporalment "
 "inabilitada."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la llista de  paraules malsonants per a canals esta temporalment "
 "inabilitada."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 "Ho sento, el desenregistrament de canals esta temporalment desabilitat."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'Opciós de canal esta temporalment deshAbilitat."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Ho sento, el registre de canals esta temporalment inhabilitat."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Ho sento, La agrupació de nicks ha fallat."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Ho sento, la identificació ha fallat."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Ho sento, la configuració de kicker esta temporalment inabilitada."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'opcions per a memos esta temporalment inhabilitat."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Ho sento, l'enviament de memos esta temporalment inhabilitat."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Ho sento, desenregistrament de nickname esta temporalment inhabilitat."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Ho sento, La agrupació de nicks esta temporalment inabilitada."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr ""
 "Ho sento, el seteig de Opciós per nicknames esta temporalment inhabilitat."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Ho sento, el registre de nicknames esta temporalment deshabilitat."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Ho sento, error en el registre."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
 msgstr ""
-"Ho sento, sols pots tenir %d instàncies de AOP/SOP/VOP\n"
-"en un canal."
+"Ho sento, sols pots tenir %d instàncies d'accés en un determinat canal."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr ""
 "Ho sento, sols pots tenir %d instàncies a la teva lllista d'accés per "
 "nickname."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Ho sento, sols pots tenir %d instàncies d'accés en un determinat canal."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
 "Ho sento, sols pots tenir %d mascaras per a kicks automàtics a un canal."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Ho sento, sols pots tenir %d paraules malsonants en un canal."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Ho sento, has sobrepassat el teu límit de %d canals."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Ho sento, has arribat al teu límit de %d canals."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Estadistiques restablertes."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status updated (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Para de floodejar!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "No repeteixis com l'allioli!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Sucessor de %s desabilitat."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Sucessor de %s cambiat a %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Simbiosis"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Mode Simbiosis ara desactivat en el canal %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Mode Simbiosis ara activat en el canal %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintàxis: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5767,7 +5396,7 @@ msgstr ""
 "2: ban de la forma *!*@host\n"
 "3: ban de la forma *!*usuari@*.domini"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5780,27 +5409,12 @@ msgstr ""
 "Estableix la descripció pel canal, la que es mostrada\n"
 "amb les comandes LIST i INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Sintaxis: %s canal ENTRYMSG [missatge]\n"
-"\n"
-"Especifica el missatge que sera enviat via /notice als\n"
-"usuaris quant ingressin al canal. Si cap parametre\n"
-"es especificat, cap missatge sera enviat al entrar al canal."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Sintaxis: %s canal FOUNDER nick\n"
@@ -5808,7 +5422,7 @@ msgstr ""
 "Canvia el fundador d'un canal. El nou nickname ha de\n"
 "ser un d'enregistrat."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5828,80 +5442,7 @@ msgstr ""
 "sorti del canal, i sigui restaurat la pròxima vegada que\n"
 "el canal sigui creat."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Sintàxi: %s canal MLOCK Modes\n"
-"\n"
-"Estableix el paràmetre de fixació de Modes pel canal.\n"
-"%S et permet definir certs Modes de canal per a estar\n"
-"sempre encesos o apagats o lliures d' estar un dels\n"
-"anteriors.\n"
-"\n"
-"El paràmetre Modes és construit de la mateixa forma\n"
-"que La comanda /MODE; això significa, Modes seguits\n"
-"per un + estan fixats encesos, i Modes seguits per\n"
-"un - estan fixats apagats. tenir en compte que, a\n"
-"difèrencia de La comanda MODE, cada us de SET MLOCK\n"
-"esborrarà tots els Modes fixats prèviament abans de\n"
-"establir els nous!\n"
-"\n"
-"AdVeuretència: Si estableixes una clau amb fixació de Mode, com\n"
-"en el segon exemple de més endevant, hauràs també d'establir la\n"
-"Opció RESTRICTED pel canal (veure HELP SET RESTRICTED),\n"
-"o qui sigui que entri al canal quan aquest és buit podrà veure la\n"
-"clau!\n"
-"\n"
-"Exemples:\n"
-"\n"
-"    SET #canal MLOCK +nt-iklps\n"
-"        Força els Modes n i t encesos, i els Modes i, k,\n"
-"        l, p i s apagats. El Mode m és deixat lliure per a\n"
-"        estar encès o apagat.\n"
-"\n"
-"    SET #canal MLOCK +knst-ilmp mi-key\n"
-"        Força els Modes k, n, s, i t encesos, i els Modes\n"
-"        i, l, m, i p apagats. També força la clau del canal\n"
-"        a ser \"mi-clau\".\n"
-"\n"
-"    SET #canal MLOCK +\n"
-"        Esborra la fixació de Modes; tots els Modes del canal\n"
-"        són lliures d'estar encesos o apagats."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5918,7 +5459,7 @@ msgstr ""
 "a l'usuari del canal quan les comandes OP o DEOP siguin\n"
 "utilitzades per a un usuari en el canal."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5936,7 +5477,7 @@ msgstr ""
 "d'un usuari amb nivelll igual o superior a ell via\n"
 "comandes de %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5981,7 +5522,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5995,13 +5536,13 @@ msgstr ""
 "Quan privacitat està establerta, un /msg %S LIST no\n"
 "inclourà el canal en cap llista."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Sintàxi: %s canal RESTRICTED {ON | OFF}\n"
@@ -6010,7 +5551,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -6030,7 +5571,7 @@ msgstr ""
 "atorgat accés al canal controlat per la llista de\n"
 "accés."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6049,52 +5590,12 @@ msgstr ""
 "el seu fundador i el seu sucesor, i no aquells que estiguin identificats\n"
 "amb %S."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Sintàxi: %s canal SECUREOPS {ON | OFF}\n"
-"\n"
-"Habilita o deshabilita l'opció seguretat de ops per a un\n"
-"canal.  Quan seguretat de ops està establerta, usuaris\n"
-"que no estaven a la llista d'usuaris no els serà permès \n"
-"obtenir l' estatus d'operador de canal."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Sintàxi: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Habilita o deshabilita els kicks firmats per a un\n"
-"canal. Quan SIGNKICK està establert, kicks\n"
-"fets amb la comanda %S KICK tindran el\n"
-"nick que ha fet servir la comanda en la raó.\n"
-"\n"
-"Si uses LEVEL, aquells que tenen nivelll superior o\n"
-"igual al nivelll SIGNKICK en el canal no tindran els seus kicks \n"
-"firmats. Veure /msg %S HELP LEVELS per a més informació."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6112,24 +5613,7 @@ msgstr ""
 "si no hi haguès un successor. El nou nickname ha de ser un\n"
 "d'enregistrat."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintàxi: %s canal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Habilita o deshabilita L'opció de fixació de topic\n"
-"per a un canal. Quan la fixació de topic està\n"
-"establerta, %S no permetrà que el topico del canal\n"
-"sigui canviat excepte amb la comanda TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6174,10 +5658,11 @@ msgstr ""
 "Canviar de llistes xOP al sistema de llistes d'accés no causa cap\n"
 "problema."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6190,18 +5675,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6260,7 +5749,7 @@ msgstr ""
 "La comanda ACCESS CLEAR neteja totes les instàncies\n"
 "de la llista d'accés."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6309,7 +5798,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mostra la llista d'accés actual."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6321,12 +5810,18 @@ msgstr ""
 "Fa que el bot fagi l'equivalent a la comanda \"/me\"\n"
 "en el canal especificat utilitzant el text especificat."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6347,15 +5842,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6426,7 +5912,8 @@ msgstr ""
 "La comanda AKICK CLEAR neteja totes les instàncies\n"
 "de la llista de akicks."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6434,21 +5921,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6518,7 +6005,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6557,7 +6044,7 @@ msgstr ""
 "Channels that have the NOEXPIRE option set will be prefixed by \n"
 "an exclamation mark."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6575,10 +6062,11 @@ msgstr ""
 "level access or greater on.\n"
 "This use limited to Services Operators."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6659,7 +6147,7 @@ msgstr ""
 "de accés i /msg %S HELP SET XOP per a saber com canviar\n"
 "entre la llista de accés i el sistema de llistes xOP."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6673,7 +6161,8 @@ msgstr ""
 "Desprès d'això pots configurar el bot segons\n"
 "les teves necessitats."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6705,7 +6194,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6747,7 +6236,7 @@ msgstr ""
 "La comanda BADWORDS CLEAR neteja totes les instàncies\n"
 "de la llista de paraules malsonants."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6763,7 +6252,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell d'\n"
 "accés 5 i major en el canal."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6805,7 +6294,7 @@ msgstr ""
 "sera eliminat. A més, si un usuari està actualment\n"
 "usant el nick, serà killejat."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6815,7 +6304,7 @@ msgstr ""
 "\n"
 "Llista tots els bots disponibles en aquesta xarxa."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6828,7 +6317,7 @@ msgstr ""
 "sempre i quan no hagi sigut llegit al moment en el que\n"
 "vas fer servir la comanda."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6840,7 +6329,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6863,7 +6352,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6875,72 +6364,32 @@ msgstr ""
 "Checks whether the _last_ memo you sent to nick has been read\n"
 "or not. Note that this does only work with nicks, not with chans."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Sintàxi: CLEAR canal que\n"
-"\n"
-"Li diu a %S que netegi certs paràmetres en el canal.\n"
-"que pot ser un dels següents:\n"
+"Sintàxi: DEOWNER #canal\n"
 "\n"
-"     MODES    Reestableix totss los Modes en el canal (o sigui,\n"
-"                  neteja els Modes i,k,l,m,n,p,s,t).\n"
-"     BANS     neteja tots els bans en el canal.\n"
-"     EXCEPTS  neteja tots els excepts en el canal.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Esborra estatus d'operador de canal (Mode +o)\n"
-"                  de tots els operadors de canal. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Esborra l'estatus \"voice\" (Mode +v) de qui\n"
-"                  tingui aquest Mode establert.\n"
-"     USERS    Explusa (kickea) tots els usuaris del canal.\n"
+"Esborra l'estatus de propietari del canal.\n"
 "\n"
-"Per defecte, el nivell d'accés en el canal ha de ser de\n"
-"fundador."
+"Limitat a aquells amb nivelll de fundador en el canal."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Sintàxi: CLEARMODES canal [ALL]\n"
-"\n"
-"Neteja tots els modes binarios (i,k,l,m,n,p,s,t) i\n"
-"bans del canal. Si s'especifica ALL, tambe neteja\n"
-"tots els ops i voices (modes +o i +v) del canal.\n"
-"\n"
-"Limitat a operadors de serveis."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6966,7 +6415,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6978,12 +6427,14 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6998,7 +6449,7 @@ msgstr ""
 "accés 5 i major en el canal, o a HOPs o aquells amb\n"
 "nivelll 4 i major per a treure's halfop a si mateixos."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -7009,11 +6460,12 @@ msgstr ""
 "database.\n"
 "Limited to Services operators."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7045,10 +6497,11 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Esborra els memos enumerats 2 a 5 i 7 a 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntax: DELALL <nick>.\n"
@@ -7056,12 +6509,14 @@ msgstr ""
 "that of the given nick.\n"
 "Limited to Host Removers."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7074,29 +6529,35 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
 "accés 5 i major en el canal."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintàxi: DEOWNER #canal\n"
+"Sintàxi: DEOP #canal [nick]\n"
 "\n"
-"Esborra l'estatus de propietari del canal.\n"
+"Desopeja al nick seleccionado en un canal. Si el nick no és\n"
+"donat, et desopejarà a tu.\n"
 "\n"
-"Limitat a aquells amb nivelll de fundador en el canal."
+"Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
+"accés 5 i major en el canal."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Sintàxi: DEPROTECT #canal [nick]\n"
 "\n"
@@ -7107,12 +6568,14 @@ msgstr ""
 "amb nivelll 10 i major en el canal per a desprotegir-se a\n"
 "si mateixos."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7127,7 +6590,7 @@ msgstr ""
 "accés 5 i major en el canal, o a VOPs o aquells amb\n"
 "nivelll 3 i major per a donar-se voice a si mateixos."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7139,7 +6602,7 @@ msgstr ""
 "Desenregistra el canal especificat. Nomès pot ser utilitzat pel\n"
 "fundador del canal."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7152,9 +6615,10 @@ msgstr ""
 "administradors de serveis poden eliminar un\n"
 "canal per el qual no s'haguin identificado."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7162,6 +6626,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7178,7 +6646,7 @@ msgstr ""
 "Abans d'utilitzar aquesta comanda has d'identificar-te amb la teva\n"
 "clau (/msg %S HELP IDENTIFY per més informació)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7201,8 +6669,8 @@ msgstr ""
 "privilegis especials. Eliminar qualsevol nick esta\n"
 "limitat a administradors de serveis."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7213,7 +6681,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7235,7 +6703,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7286,7 +6754,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7304,7 +6772,7 @@ msgstr ""
 "\n"
 "limitat a administradors de serveis."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7322,7 +6790,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7336,7 +6804,7 @@ msgstr ""
 "this command is used, a message including the person who issued\n"
 "the command and the email it was used on will be logged."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7346,16 +6814,15 @@ msgstr ""
 "\n"
 "Retorna la clau del canal donat."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Sintaxis: GETPASS nickname\n"
 "\n"
@@ -7368,14 +6835,14 @@ msgstr ""
 "\n"
 "Aquesta comanda no esta disponible si encriptació esta habilitada."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7400,7 +6867,7 @@ msgstr ""
 "grup d'aquest nick, o has de proveir la clau correcta\n"
 "per aquest nickname."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7410,7 +6877,7 @@ msgstr ""
 "\n"
 "Llista tots els nicks en el teu grup."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7430,7 +6897,7 @@ msgstr ""
 "en el grup del nick esmentat.\n"
 "El seu ús esta limitat a administradors de serveis."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7443,7 +6910,7 @@ msgstr ""
 "Permet als Administrators a enviar missatges als usuaris de\n"
 "la xarxa. El missatge sera enviat desde el nick %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7457,7 +6924,7 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7521,16 +6988,17 @@ msgstr ""
 "Tingues en compte: tots els nicks en un grup comparteixen la\n"
 "mateixa clau."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Sintàxi: HALFOP #canal [nick]\n"
 "\n"
@@ -7541,10 +7009,11 @@ msgstr ""
 "accés 5 i major en el canal, o a HOPs o aquells amb nivelll\n"
 "4 i major per a donar-se halfop a si mateixos."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7620,7 +7089,7 @@ msgstr ""
 "d'accés i /msg %S HELP SET XOP per a saber com canviar\n"
 "entre la llista d'accés i el sistema de llistes xOP."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7638,9 +7107,20 @@ msgstr ""
 "comanda abans d'utilitzar-les. La clau hauria de ser la mateixa\n"
 "que va ser enviada amb la comanda REGISTER."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7670,7 +7150,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7688,7 +7168,7 @@ msgstr ""
 "Si ALL és especificat, el misatge d'entrada i\n"
 "sucsesor també seran mostrats."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7702,7 +7182,7 @@ msgstr ""
 "tal com el propietari del nick, l'ultima adreça utilitzada\n"
 "i temps, i opcions del nick."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7718,7 +7198,7 @@ msgstr ""
 "pots rebre. Amb un paràmetre, mostra la mateixa\n"
 "informació pel canal donat."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7745,7 +7225,7 @@ msgstr ""
 "informació pel nickname donat. Aquest us està\n"
 "limitat a administradors de serveis."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7764,12 +7244,12 @@ msgstr ""
 "rebràs informació sobre el bot, així com temps\n"
 "de creació o nom de canals en els que aquest estigui."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7781,14 +7261,15 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell 5\n"
 "i major en el canal."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7808,7 +7289,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7824,7 +7305,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell d'\n"
 "accés 5 i major en el canal."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7850,7 +7331,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7872,12 +7353,14 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7917,14 +7400,14 @@ msgstr ""
 "Nota: L'accés a aquesta comanda es control.lat pel\n"
 "nivell SET."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7940,7 +7423,25 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7958,7 +7459,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7987,7 +7488,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -8006,7 +7507,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -8029,7 +7530,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8045,7 +7546,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8064,7 +7565,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8083,8 +7584,8 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8094,17 +7595,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8136,7 +7637,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8161,7 +7662,7 @@ msgstr ""
 "number of items to display to a operator at any 1 time.\n"
 "Limited to Services operators."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8176,7 +7677,7 @@ msgstr ""
 "donat (canals amb l'opció PRIVATE establerta no són\n"
 "llistats.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8216,7 +7717,8 @@ msgstr ""
 "        Llista tots els nicks registrats per usuaris amb el\n"
 "        domini aujac.org."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8244,7 +7746,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Sintaxis: LIST patró [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8276,13 +7777,14 @@ msgstr ""
 "        Llista tots els nicks registrats que hagin estat establerts\n"
 "        a no caducitat."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8298,11 +7800,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      llista memos enumerats 2 a 5 i 7 a 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Sintaxis: LOGONNEWS ADD texto"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8331,11 +7833,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Sintaxis: LOGONNEWS DEL {numero | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8351,7 +7853,7 @@ msgstr ""
 "Tingues en compte que no et sera obligatori identificar-te\n"
 "un altre cop."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8375,12 +7877,13 @@ msgstr ""
 "a l'esmentat nick a reidentificar-se. Aquest ús esta limitat a\n"
 "administradors de serveis."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Sintàxi: MODE canal Modes\n"
@@ -8391,7 +7894,34 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8400,7 +7930,7 @@ msgstr ""
 "Syntax: MODINFO FileName\n"
 "This command lists information about the specified loaded module"
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8409,7 +7939,7 @@ msgstr ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Lists all currently loaded modules."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8420,7 +7950,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8431,7 +7961,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8442,10 +7972,12 @@ msgstr ""
 "This command unloads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8471,7 +8003,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8483,7 +8015,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see your real IP address."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8497,7 +8029,7 @@ msgstr ""
 "Flags have to be prefixed with a \"+\" or a \"-\". To\n"
 "remove all flags simply type a \"-\" instead of any flags."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8509,12 +8041,14 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see the vhost instead of your real IP address."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8527,11 +8061,11 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
 "accés 5 i major en el canal."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Sintaxis: OPERNEWS ADD texto"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8560,30 +8094,37 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Sintaxis: OPERNEWS DEL {numero | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintàxi: OWNER #canal\n"
+"Sintàxi: OP #canal [nick]\n"
 "\n"
-"Et dóna l'estatus de propietari del canal.\n"
+"Opeja al nick seleccionat en un canal. Si un nick no és\n"
+"donat, t'opejarà a tu.\n"
 "\n"
-"Limitad a aquells amb nivelll de fundador en el canal."
+"Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
+"accés 5 i major en el canal."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8597,10 +8138,11 @@ msgstr ""
 "amb nivell 10 i major en el canal per a protejerse a si\n"
 "mismos."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8673,7 +8215,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8693,11 +8235,11 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Sintaxis: RANDOMNEWS ADD text"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8719,18 +8261,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Sintaxis: RANDOMNEWS DEL {numero | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8747,7 +8290,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      mostra els memos enumerats 2 a 5 i 7 a 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8795,7 +8338,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8806,7 +8350,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8837,24 +8381,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8903,15 +8448,15 @@ msgstr ""
 "informació sobre aquesta característica, escriu /msg %S\n"
 "HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8932,7 +8477,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8950,7 +8495,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8962,7 +8507,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8973,7 +8518,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8989,13 +8534,14 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -9011,23 +8557,25 @@ msgstr ""
 "memo will be sent to the sender informing him/her that the memo\n"
 "has been read."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -9035,7 +8583,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9047,7 +8595,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9057,7 +8605,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9073,7 +8621,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9096,22 +8644,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9129,7 +8677,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9146,7 +8694,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9160,7 +8708,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9172,17 +8720,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9201,16 +8750,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9224,7 +8773,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9234,13 +8783,14 @@ msgstr ""
 "\n"
 "Fa que el bot escrigui el text especificat en el canal especificat."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sintàxi: SEND {nick | canal} text-del-memo\n"
@@ -9250,15 +8800,17 @@ msgstr ""
 "rebrà noticia de que ell/ella té un nou memo. El nick\n"
 "o canal receptors han d'estar registrats."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Syntax: SENDALL memo-text\n"
 "Sends all registered users a memo containing memo-text."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9277,7 +8829,7 @@ msgstr ""
 "Pot ser limitat a operadors d'IRC en certes\n"
 "xarxes."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9313,7 +8865,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9328,7 +8880,66 @@ msgstr ""
 "well as vhosts.\n"
 "Limited to Services operators."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Sintàxi: %s canal SECUREOPS {ON | OFF}\n"
+"\n"
+"Habilita o deshabilita l'opció seguretat de ops per a un\n"
+"canal.  Quan seguretat de ops està establerta, usuaris\n"
+"que no estaven a la llista d'usuaris no els serà permès \n"
+"obtenir l' estatus d'operador de canal."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Sintàxi: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Habilita o deshabilita els kicks firmats per a un\n"
+"canal. Quan SIGNKICK està establert, kicks\n"
+"fets amb la comanda %S KICK tindran el\n"
+"nick que ha fet servir la comanda en la raó.\n"
+"\n"
+"Si uses LEVEL, aquells que tenen nivelll superior o\n"
+"igual al nivelll SIGNKICK en el canal no tindran els seus kicks \n"
+"firmats. Veure /msg %S HELP LEVELS per a més informació."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintàxi: %s canal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Habilita o deshabilita L'opció de fixació de topic\n"
+"per a un canal. Quan la fixació de topic està\n"
+"establerta, %S no permetrà que el topico del canal\n"
+"sigui canviat excepte amb la comanda TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9339,6 +8950,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9361,7 +8973,7 @@ msgstr ""
 "Nota: L'accés a aquesta comanda esta controlat pel\n"
 "nivell SET."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9375,7 +8987,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9391,7 +9003,7 @@ msgstr ""
 "\n"
 "Opcions disponibles:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9406,7 +9018,7 @@ msgstr ""
 "kickejats pel bot, encara que no concideixen amb\n"
 "el nivell NOKICK."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9421,7 +9033,7 @@ msgstr ""
 "kickejatos pel bot, encara que no coincideixin amb\n"
 "el nivell NOKICK."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9454,7 +9066,7 @@ msgstr ""
 "utilitzar !op, l'usuari ha de tenir suficient\n"
 "accés pel nivell OPDEOP)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9471,7 +9083,22 @@ msgstr ""
 "sempre i quan tinguin el suficient accés\n"
 "al canal."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9487,7 +9114,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9501,7 +9128,7 @@ msgstr ""
 "\n"
 "limitat a administradors de serveis."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9519,26 +9146,17 @@ msgstr ""
 "canals, tal como modes, KICKS i fins tot els\n"
 "missatges d'entrada."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Sintaxis: SET Opció parametres\n"
-"\n"
-"Estableix varies opcions per a nicknames. Opció pot ser\n"
-"una de:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9555,7 +9173,18 @@ msgstr ""
 "escriu /msg %S HELP SET Opció per a més informació\n"
 "sobre una opció específica."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Sintaxis: SET Opció parametres\n"
+"\n"
+"Estableix varies opcions per a nicknames. Opció pot ser\n"
+"una de:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9565,7 +9194,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Sintàxi: SET opció parametres\n"
@@ -9582,7 +9210,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9594,30 +9222,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Sintàxi: SET DEBUG {ON | OFF | nom}\n"
-"\n"
-"Estableix el mode debug a activat o desactivat. En mode debug,\n"
-"tota la informació enviada desde i cap als serveis,\n"
-"a més de un numero de missatges són escrits a l'arxiu\n"
-"de log.  Si s'especifica nom, el mode debug es\n"
-"activat, amb el nivell de debug especificat a nom.\n"
-"\n"
-"Aquesta opció es equivalent a l'opció -debug en\n"
-"la linea de comandes."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9630,7 +9235,7 @@ msgstr ""
 "nicks en serveis. El nou display HA DE SER un nick\n"
 "del teu grup."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9644,7 +9249,7 @@ msgstr ""
 "sera mostrat quant algu demani informació\n"
 "sobre el teu nick amb la comanda INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9660,7 +9265,7 @@ msgstr ""
 "opció GREET habilitada, sempre i quant tinguis \n"
 "l'accés necessari."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9683,18 +9288,8 @@ msgstr ""
 "El segon parametre especifica si la informació ha de ser\n"
 "ocultada (OFF) o mostrada (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9708,7 +9303,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sintaxis: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9726,7 +9321,7 @@ msgstr ""
 "necessari. A mes, els administradors de la xarxa poden haber\n"
 "deshabilitat aquesta opció."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9743,7 +9338,7 @@ msgstr ""
 "numero ha de ser escollit de la llista de llenguatges\n"
 "soportats:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9760,7 +9355,7 @@ msgstr ""
 "enviar-te memos. A més, no pots establir el límit més\n"
 "alt que %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9802,7 +9397,7 @@ msgstr ""
 "límit, no poden establir el límit més enllà de %d, i no\n"
 "poden establir un límit hard."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9811,7 +9406,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %S settings"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9825,10 +9420,11 @@ msgstr ""
 "comunicaran amb tu. Amb MSG establert, els serveis\n"
 "utilitzaran msgs, de l'altra forma utilitzaran notícies. "
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9843,7 +9439,7 @@ msgstr ""
 "Aquaquesta opció es equivalent a l'opció -noexpire\n"
 "en la linea de comandes."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9880,7 +9476,7 @@ msgstr ""
 "\n"
 "ON és escencialment LOGON i NEW combinats."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9892,7 +9488,7 @@ msgstr ""
 "Canvia la clau utilitzada per identificar-te com el\n"
 "propietari del nick."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9911,7 +9507,7 @@ msgstr ""
 "(D'altra banda, qualsevol persona que sapigue el teu nick podra comprobar\n"
 "la teva informació utilitzant la comanda INFO.)"
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9942,16 +9538,16 @@ msgstr ""
 "Aquesta opció es equivalent a l'opció -readonly en\n"
 "la linea de comandes."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9964,7 +9560,7 @@ msgstr ""
 "d'accés, %S no te auto-kickejara no important l'establiment de l'opció\n"
 "KILL."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9978,14 +9574,15 @@ msgstr ""
 "This opion is _NOT_ persistant, and should only be used when\n"
 "needed, and set back to OFF when no longer needed."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9997,7 +9594,7 @@ msgstr ""
 "added to the group after this command was used.\n"
 "Limited to Services operators."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -10010,10 +9607,11 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10049,7 +9647,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10108,10 +9706,11 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10189,7 +9788,8 @@ msgstr ""
 "d'accés i /msg %S HELP SET XOP per a saber com canviar\n"
 "entre la llista d'accés i el sistema de llistes xOP."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10205,31 +9805,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10289,21 +9889,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10313,15 +9899,17 @@ msgstr ""
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Syntax: STAFF memo-text\n"
 "Sends all services staff a memo containing memo-text."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10365,7 +9953,7 @@ msgstr ""
 "L'opció RESET estableix el nombre màxim d'usuaris\n"
 "al nombre d'usuaris actualment presents en la xarxa."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10391,12 +9979,13 @@ msgstr ""
 "\n"
 "limitat a administradors de serveis."
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10435,7 +10024,7 @@ msgstr ""
 "reste seran ignorats. If no nickname is given, your status\n"
 "will be returned."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10453,7 +10042,7 @@ msgstr ""
 "\n"
 "Reason may be required on certain networks."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10463,7 +10052,8 @@ msgstr ""
 "\n"
 "Forcefully changes a user's nickname from nick to newnick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10476,31 +10066,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10558,7 +10148,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10582,7 +10172,7 @@ msgstr ""
 "Per defecte, limitat a aquells amb nivell de fundador\n"
 "en el canal."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10596,7 +10186,7 @@ msgstr ""
 "Parameters are the same as for the standard /MODE\n"
 "command."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10613,7 +10203,7 @@ msgstr ""
 "del bot pel canal es enmagatzemada, així et sera possible\n"
 "reassignar un bot sense haver de configurar-lo de nou."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10632,7 +10222,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell 5\n"
 "i major en el canal."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10649,7 +10239,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10661,7 +10251,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspension."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10675,7 +10265,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10700,12 +10290,14 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10720,10 +10312,11 @@ msgstr ""
 "accés 5 i major en el canal, o a VOPs o aquells\n"
 "amb nivelll 3 i major per a donar-se voice a si mateixos."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10800,7 +10393,7 @@ msgstr ""
 "d'accés i /msg %S HELP SET XOP per a saber como canviar\n"
 "entre la llista d'accés i el sistema de llistes xOP."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10816,7 +10409,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10824,7 +10417,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10832,7 +10425,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10844,54 +10437,55 @@ msgstr ""
 "sets needed chanmodes (ModeonID) and updates your vhost and\n"
 "your userflags (lastseentime, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [tòpic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "The IMMED option is not available on this network."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "La llista de AKILLs ha estat netegada."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "The Defcon Level is now at Level: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "La llista de SNLINEs ha estat netegada."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "La llista de SQLINEs ha estat netegada."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "La llista de SZLINEs ha estat netegada."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Els següents nombres de característiques/funcions són\n"
@@ -10899,89 +10493,89 @@ msgstr ""
 "i NOJOIN són nivellls màxims, mentre tots els altres\n"
 "són nivellls mínims."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "El host %s actualment te %d sessions amb un límit de %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "The last memo you sent to %s (sent on %s) has been read."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "The last memo you sent to %s (sent on %s) has not yet been read."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "El límit de memos per a %s no pot ser canviat."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "El nou display es ara %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "The nick %s is now being changed to %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "There are %d memos on channel %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10989,7 +10583,7 @@ msgstr ""
 "No hi ha bots disponibles en aquest moment.\n"
 "Demana-li a un administrador de serveis que en fagi un!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10999,12 +10593,12 @@ msgstr ""
 "Escriu /msg %s HELP GLIST i /msg %s HELP DROP\n"
 "per més informació."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "There is %d memo on channel %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -11012,28 +10606,28 @@ msgstr ""
 "There is a new memo on channel %s.\n"
 "Type /msg %s READ %s %d to read it."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Ja no hi ha un bot assignat a %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "No hi ha notícies de entrada."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "No hay notícies de oper."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "No hi ha notícies al azar."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -11051,32 +10645,28 @@ msgstr ""
 "                     per algú mes que un operador\n"
 "                     d'IRC"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "This channel has been forbidden."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Aquest canal ha estat registrat amb %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "This channel has been suspended."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Aquest canal esta prohibit."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Aquest canal no caducara."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -11084,7 +10674,7 @@ msgstr ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -11092,7 +10682,7 @@ msgstr ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11100,20 +10690,20 @@ msgstr ""
 "Aquest nick pertany a un altra persona. Per favor escull un altre nick.\n"
 "(Si aquest es el teu nick, escriu /msg %s IDENTIFY clau.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Aquest nick ha estat registrat; No pots utilitzar-lo."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11123,15 +10713,15 @@ msgstr ""
 "nick, escriu /msg %s IDENTIFY clau. Si no,\n"
 "per favor escull un nick diferent."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Aquest nickname no pot ser utilitzat. Per favor escull un altre."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Aquest nickname no caducara."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11139,44 +10729,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Lock de tòpic"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Retenció de tòpic"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Topic lock option for %s is now OFF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Topic lock option for %s is now ON."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Topic retention option for %s is now OFF."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Topic retention option for %s is now ON."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Desactiva les majuscules!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "escriu /msg %S HELP comando per a més ajuda en\n"
@@ -11187,7 +10768,7 @@ msgstr ""
 "    canal. Això pot ser canviat amb la comanda\n"
 "    LEVELS de %s."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11197,7 +10778,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11205,7 +10786,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11213,7 +10794,7 @@ msgstr ""
 "Escriu /msg %S HELP opció per més informació\n"
 "sobre una opció en particular."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11223,127 +10804,108 @@ msgstr ""
 "Respectems la teva privacitat; Aquest e-mail no sera entregat\n"
 "a cap persona."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Escriu /msg %s LIST NEW per a llistar els teus memos."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Escriu /msg %s READ %d per a llegir-lo."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Escriu /msg %s READ LAST per llegir el teu últim memo."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modes"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND channel"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Unable to load module %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Unable to remove module %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Opcio SET desconeguda %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opció STATS %s desconeguda."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Comanda no coneguda %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Comanda no coneguda %s. \"/msg %s HELP\" per ajuda."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Caràcter de Mode %c desconegut i ignorat."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opció %s desconeguda."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Opció %s desconeguda.\n"
-"Escriu /msg %S HELP KICK per a més informació"
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Opció %s desconeguda.\n"
 "Escriu /msg %S HELP SET per a més informació."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Actualitzant les bases de dades."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "User %s not found in the nickserv db."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Usuari      : %6d registres, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11351,11 +10913,11 @@ msgstr ""
 "L'usuari demanant el teu nick ha estat expulsat.\n"
 "/msg %s RELEASE %s per recuperar-lo abans %s time-out."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "User matches channel except."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11363,66 +10925,76 @@ msgstr ""
 "Llista d'usuaris:\n"
 "Nick                 Mascara"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Protecció de Voices"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Llista VOP per a %s:\n"
-"  Num  Nick"
+"Advertència: Has sobrepassat el màximo numero de memos (%d). Et resultara "
+"impossible rebre més memos fins que esborris alguns dels existents."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Protecció de Voices"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Advertència: Has assolit el màxim numero de memos (%d). No podras rebre mes "
+"memos fins que esborris alguns dels existents."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Cuida el teu llenguatge!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Ja ets membre del grup de %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "You are already identified."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "You are no longer a SuperAdmin"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "No estas autoritzat a estar en aquest canal."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "No estas autoritzat a canviar el teu límit de memos."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "You are now a SuperAdmin"
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11430,36 +11002,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Ara ets membre en el grup de %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "No pots fer GHOST a tu mateix!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Can't logout %s because he's a services operator."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "No pots recuperar-te a tu mateix!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11469,7 +11046,7 @@ msgstr ""
 "Utilitza les comandes AOP, SOP i VOP.\n"
 "Escriu /msg %s HELP comanda per a més informació."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11479,7 +11056,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11487,66 +11064,66 @@ msgstr ""
 "No pots utilitzar aquesta comanda. Utilitza la comanda ACCESS.\n"
 "Escriu /msg %s HELP ACCESS per més informació."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "No pots establir el límite de memos per %s mes de %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "No pots establir el teu límit de memos a mes de %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Tens %d memos, dels quals %d encara no han estat llegits."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Tens %d memos, dels quals 1 encara no ha estat llegit."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Tens %d memos."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Tens %d memos, cap d'ells llegit."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Tens 1 memo i encara no ha estat llegit."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Tens 1 memo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "No tens memos."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Tens %d memos nous."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Tens 1 memo nou."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11554,33 +11131,37 @@ msgstr ""
 "Tens un nou memo de %s.\n"
 "Escriu /msg %s READ %d per a llegir-lo."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Has estat desbanegat de %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "No tens límit en el numero de memos que pots mantenir."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "No tens memos."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "No tens memos nous."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "You have to enter a valid number as time."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11588,28 +11169,16 @@ msgstr ""
 "Has d'assignar un bot al canal abans de poder utilitzar aquesta comanda.\n"
 "Escriu /msg %S HELP ASSIGN per a més informació."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Has de ser un operador de canal per registrar el canal."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr ""
-"Has d'utilitzar Mode de lock +i tambe pel Mode\n"
-"de lock +K."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr ""
-"Has d'utilitzar Mode de lock +l també pel Mode\n"
-"de lock +L."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11619,39 +11188,39 @@ msgstr ""
 "Aquest e-mail et permetra recuperar la teva clau en\n"
 "cas de que la olvidis."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Seràs notificat per nous memos quant et conectis i quant se t'enviin."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Seràs notificat per memos nous quant et conectis."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Seràs notificat quan els memos nous se t'enviin."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "No et sera possible rebre més memos."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "No seràs notificat per memos nous."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11659,34 +11228,54 @@ msgstr ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "La llista de kicks automàtics del canal %s esta buida."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "La llista ignore esta buida."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "El teu límit de memos ha estat deshabilitat."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "El teu límite de memos ha estat establert a %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "El teu límit de memos es %d i no pot ser canviat."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "El teu límit de memos es %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "El teu límit de memos es 0; no rebràs nous memos."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11694,178 +11283,738 @@ msgstr ""
 "El teu límit de memos es 0; no rebràs nous memos. No pots cambiar aquest "
 "límit."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "El teu nick ha estat desconnectat."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "El teu nick ja esta registrat; escriu /msg %s DROP primer."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "El teu nick no esta registrat."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "El teu nickname ha estat expulsat."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "El teu nickname s'esta canviant a %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "La teva clau es %s - Recordala per un us futur."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Your password is too long. Please try again with a shorter password."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Your vhost of %s is now activated."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Your vhost of %s@%s is now activated."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Notícies de Logon - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Notícies de Oper - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Notícies al Atzar - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "Desactivada"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "no expira"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "Activada"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "expira amb el pròxim update de la base de dades"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "expira en %d dia"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "expira en %d dies"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expira en %d hora, %d minut"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expira en %d hora, %d minuts"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expira en %d hores, %d minut"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expira en %d hores, %d minuts"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "expira en %d minuts"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expira en %d minuts"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost for %s removed."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost for %s set to %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost for %s set to %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost for group %s set to %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost for group %s set to %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts for group %s have been removed."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "Sistema de llistes xOP"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "xOP lists system for %s is now OFF."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "xOP lists system for %s is now ON."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | canal} text"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s afegit a la llista AOP de %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s afegit a la llista HOP de %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s afegit a la llista SOP de %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s afegit a la llista VOP de %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s esborrat de la llista HOP de %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s esborrat de la llista SOP de %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s esborrat de la llista VOP de %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s moved to %s HOP list."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s moved to %s SOP list."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s moved to %s VOP list."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s no trobat a la llista HOP de %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s no trobat a la llista SOP de %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s no trobat a la llista VOP de %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Preveu el teu nickname d'apareixer en un\n"
+#~ "                   /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d dies"
+
+#~ msgid "%d hours"
+#~ msgstr "%d hores"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minuts"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d segons"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "La llista HOP de %s esta buida."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "La llista SOP de %s esta buida."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "La llista VOP de %s esta buida."
+
+#~ msgid "1 day"
+#~ msgstr "1 dia"
+
+#~ msgid "1 hour"
+#~ msgstr "1 hora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minut"
+
+#~ msgid "1 second"
+#~ msgstr "1 segon"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Abilitat a utilitzar la comanda CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Abilitat a utilitzar la comanda HALFOP/DEHALFOP"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "La llista HOP de canals %s ha estat netegada."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "La llista SOP de canals %s ha estat netegada."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "La llista VOP de canals %s ha estat netegada."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "%d instàncies esborrades de la llista HOP de %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "%d instàncies esborrades de la llista SOP de %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "%d instàncies esborrades de la llista VOP de %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "1 instància esborrada de la llista HOP de %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "1 instància esborrada de la llista SOP de %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "1 instància esborrada de la llista VOP de %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Adreça E-mail no establerta."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Fi de la llista d'usuaris."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Missatge d'entrada per a %s no establert."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "El bot no esta al canal %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "Missatge d'entrada: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Access list for %s is empty."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Lllista d'accés per %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Missatge d'entrada per a %s canviat."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Mode fantasia ara desactivat en el canal %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Mode salutació ara desactivat en el canal %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Llista HOP per a %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Error Intern - Impossible processar petició."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Notícia d'entrada #%d esborrada."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Nickname Registration (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Clau pel Nickname (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "No # found in front of channel name."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Mode no bot ara desactivat en el canal %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "No existeixen instàncies coincidents a la llista HOP de %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "No existeixen instàncies coincidents a la llista SOP de %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "No existeixen instàncies coincidents a la llista VOP de %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "No existeix la instància (#%d) a la llista AOP de %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "No existeix la instància (#%d) a la llista HOP de %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "No existeix la instància (#%d) a la llista SOP de %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "No existeix la instància (#%d) a la llista VOP de %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Op-notice option for %s is now OFF."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Peace option for %s is now OFF."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Per favor espera %d segons abans d'utilizar la comanda SEND un altre cop."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Mode privado del bot %s esta ara desactivat."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Private option for %s is now OFF."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Protection is now ON, with no delay."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER clau [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Restricted access option for %s is now OFF."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Llista SOP per a %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Channel %s not registered"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND channel [reason]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Secure founder option for %s is now OFF."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Secure ops option for %s is now OFF."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Secure option for %s is now OFF."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Els serveis no han pogut canviar Modes. Estan ben configurats els teus "
+#~ "servidors?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Serveis amunt %d dies, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Serveis amunt %d hora, %d minut"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Serveis amunt %d hora, %d minuts"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Serveis amunt %d hores, %d minut"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Serveis amunt %d minut, %d segon"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Serveis amunt %d minut, %d segons"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Serveis amunt %d minuts, %d segon"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Signed kick option for %s is now OFF."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Ho sento, la modificació de llistes HOP de canals esta\n"
+#~ "temporalment deshabilitada."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Ho sento, la modificació de la llista SOP de canals esta\n"
+#~ "temporalment deshabilitada."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Ho sento, la modificació de la llista VOP de canals esta\n"
+#~ "temporalment deshabilitada."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr ""
+#~ "Ho sento, sols pots tenir %d instàncies de AOP/SOP/VOP\n"
+#~ "en un canal."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Mode Simbiosis ara desactivat en el canal %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Sintaxis: RANDOMNEWS ADD text"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR canal Modes-a-netegar"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Sintaxis: OPERNEWS ADD texto"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Sintàxi: SET DEBUG {ON | OFF | nom}\n"
+#~ "\n"
+#~ "Estableix el mode debug a activat o desactivat. En mode debug,\n"
+#~ "tota la informació enviada desde i cap als serveis,\n"
+#~ "a més de un numero de missatges són escrits a l'arxiu\n"
+#~ "de log.  Si s'especifica nom, el mode debug es\n"
+#~ "activat, amb el nivell de debug especificat a nom.\n"
+#~ "\n"
+#~ "Aquesta opció es equivalent a l'opció -debug en\n"
+#~ "la linea de comandes."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Sintàxis: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Topic lock option for %s is now OFF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Topic retention option for %s is now OFF."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Comanda no coneguda %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Opció %s desconeguda.\n"
+#~ "Escriu /msg %S HELP KICK per a més informació"
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "User %s not found in the nickserv db."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Llista VOP per a %s:\n"
+#~ "  Num  Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "El bot %s ha estat esborrat."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Ultim memo enviat a %s va ser cancel.lat."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Your vhost of %s is now activated."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "El bot %s ha estat esborrat."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/lang/anope.de_DE.po b/language/anope.de_DE.po
index fff543445..355ac0a2f 100644
--- a/lang/anope.de_DE.po
+++ b/language/anope.de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:20-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: German\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s für weitere Informationen."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "/msg %S Befehl. Für weitergehende Informationen zu\n"
 "einem bestimmten Befehl, tippe /msg %S HELP Befehl."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -55,14 +55,15 @@ msgstr ""
 "Für weitere Hilfe zu einem bestimmten Befehl\n"
 "tippe /msg %S HELP Befehl"
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "Mit Hilfe von %S kann man Channel registrieren und\n"
@@ -75,12 +76,12 @@ msgstr ""
 "/msg %S HELP Befehl.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -96,122 +97,106 @@ msgstr ""
 "\n"
 "%S's Befehle beinhalten:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s hat das DEFCON-Level geändert zu %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s wurde der %s AOP-Liste hinzugefügt."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s wurde der %s HOP-Liste hinzugefügt."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s wurde der %s SOP-Liste hinzugefügt."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s wurde der %s VOP-Liste hinzugefügt."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s wurde zur Access-Liste von %s hinzugefügt mit Level %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s wurde der AutoKick-Liste von %s hinzugefügt."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s zur Bad Words-Liste von %s hinzugefügt."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s wurde zur AKILL-Liste hinzugefügt."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s wurde zur SNLINE-Liste hinzugefügt."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s wurde zur SQLINE-Liste hinzugefügt."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s wurde zur SZLINE-Liste hinzugefügt."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s existiert bereits in der Bad Words-Liste von %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s existiert bereits auf der AutoKick-Liste von %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s existiert bereits auf der AKILL-Liste."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s ist bereits in der  EXCEPTION-Liste."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s existiert bereits auf der SNLINE-Liste."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s existiert bereits in der SQLINE Liste."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s existiert bereits auf der SZLINE-Liste."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s ist eine ungültige Ban-Zeit."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s hat deine Usermodi geändert."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -220,134 +205,115 @@ msgstr ""
 "%s Channel-Liste:\n"
 "Name                  User Topic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s gelöscht von der %s AOP-Liste."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s wurde gelöscht von der %s HOP-Liste."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s wurde von der %s SOP-Liste gelöscht."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s wurde gelöscht von der %s VOP-Liste."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s wurde von der Access-Liste von %s entfernt."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s wurde von der Autokick-Liste von %s entfernt."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s wurde aus der Bad Words-Liste von %s entfernt."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 "%s wurde von der Liste der Verbindungseinschränkungen \n"
 "entfernt."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s wurde von der AKILL-Liste entfernt."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s wurde von der SNLINE-Liste entfernt."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s wurde von der SQLINE-Liste entfernt."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s wurde von der SZLINE-Liste entfernt."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s wurde von deiner Access-Liste entfernt."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s wurde deaktiviert im Channel %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s hat zu viele Channels auf seinen Nicknamen registriert."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s wird bereits von %s getroffen."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s ist kein gültiger Ban-Typ."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s ist kein gültiger Bot bzw. registrierter Channel."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s ist keine gültige eMail-Adresse."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s ist jetzt nicht mehr stetig aktiviert im %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s ist derzeit nicht im channel %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s ist jetzt stetig aktiviert im %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "Der Nickname %s wurde nicht in der Ignore-Liste gefunden."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -356,109 +322,74 @@ msgstr ""
 "%s passt zur Ausnahme von %s und kann nicht gebannt werden, solange die "
 "Ausnahme nicht gelöscht wird."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s wurde auf die %s AOP-Liste verschoben."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s wurde auf die %s HOP-Liste verschoben."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s wurde auf %s SOP-Liste verschoben."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s wurde auf die %s VOP-Liste verschoben."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s wurde nicht in der %s AOP-Liste gefunden."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s wurde nicht gefunden in der %s HOP-Liste."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s wurde nicht gefunden in der %s SOP-Liste."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s wurde nicht gefunden in der %s VOP-Liste."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s wurde auf der Access-Liste von %s nicht gefunden."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s wurde nicht auf der AutoKick-Liste von %s gefunden."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s nicht in der Bad Words-Liste von %s gefunden."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "Es wurde keine Verbindung von %s gefunden."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr ""
 "%s nicht gefunden in der Liste der Verbindungs-\n"
 "einschränkungen."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s wurde nicht auf der AKILL-Liste gefunden."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s wurde nicht auf der SNLINE-Liste gefunden."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s wurde nicht auf der SQLINE-Liste gefunden."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s wurde nicht auf der SZLINE-Liste gefunden."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s wurde nicht auf deiner Access-Liste gefunden."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s wurde von deiner Access-Liste entfernt."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -467,35 +398,35 @@ msgstr ""
 "%s User-Liste:\n"
 "Nickname                 Maske"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s wird nicht länger ignoriert."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s wird jetzt für %s ignoriert."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s will wird jetzt permanent ignoriert."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr ""
 "Achtung: Alle Befehle die an %S gesendet werden,\n"
 "werden geloggt!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Achtung: Services sind im Read-Only-Modus, Änderungen werden nicht "
 "übernommen!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -503,11 +434,11 @@ msgstr ""
 "Achtung: AKILL-Masken dürfen keine Nicknamen enthalten, stelle sicher, dass "
 "du keinen in der Hostmaske eingetragen hast."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Achtung: Man kann nur IP-Masken zur SZLINE-Liste hinzufügen."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -554,43 +485,38 @@ msgstr ""
 "werden mit Hilfe des LEVELS Befehls. Tippe /msg \n"
 "%S HELP LEVELS für weitere Informationen."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Warnung: Du hast die maximale Anzahl gespeicherter Memos überschritten (%d). "
-"Du kannst keine weiteren Memos empfangen, bis du einige deiner jetzigen "
-"Memos gelöscht hast."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Warnung: Du hast die maximale Anzahl gespeicherter Memos erreicht (%d). Du "
-"kannst keine weiteren Nachrichten empfangen, bis du einige deiner jetzigen "
-"Memos gelöscht hast."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] Die Memo die du gesendet hast wurde angesehen."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Die Memo die du zum %s gesendet hast wurde angesehen."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER Passwort eMail"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER Passwort eMail"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP Ziel Passwort"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -600,7 +526,7 @@ msgstr ""
 "Missbrauch von %S wird geahndet und resultiert mindestens im \n"
 "Verlust deiner registrierten Nicknamen."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -612,7 +538,7 @@ msgstr ""
 "DROPEN (löschen), Zugriffslisten oder Channel-Einstellungen\n"
 "ansehen ohne sich vorher für den Channel identifizieren zu müssen."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -625,389 +551,405 @@ msgstr ""
 "jeden Nicknamen ansehen und bearbeiten. Siehe :\n"
 "/msg %S ACCESS LIST Nickname"
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "           Optionen : %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "                   vHost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvHost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Botnick : %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "           Botnick : noch nicht zugewiesen."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "                Optionen: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "        Caps kicker : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "        Caps kicker : %s (%d Kick(s) bis zum Ban, Minimum %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "        Caps kicker : %s (Minimum %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "           Gründer: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "           Ban-Typ: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "       Bolds kicker : %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "       Bolds kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Flood kicker : %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Flood kicker : %s (%d Kick(s) bis zum Ban, %d Zeilen in %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Flood kicker : %s (%d Zeilen in %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "     Hostmaske: %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Colors kicker : %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Colors kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Wird am %s auslaufen."
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "           Ban-Typ: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "   Zuletzt benutzt: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Mode lock: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "      Repeat kicker : %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "      Repeat kicker : %s (%d Kick(s) bis zum Ban, %d Mal)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "      Repeat kicker : %s (%d Mal)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "         Vertreter: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Vorübergehend gesperrt: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "        Caps kicker : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "       Bolds kicker : %s (%d Kick(s) bis zum Ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "     Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "     Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "     Letztes Topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "       Registriert: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (deaktiviert)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (nur Gründer)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS      Liste der autorisierten Adressen"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr ""
 "    ACCESS     Die Liste der priviligierten User\n"
 "               bearbeiten"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr "    ACT           Veranlaßt den Bot ein \"/me\" Befehl ausführen"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Die Autokick-Liste bearbeiten"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Die Autokick-Liste bearbeiten"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL        Die AutoKill-Liste bearbeiten"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      Listet Channels in dem du Zugang hast"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Verwaltet die AOP-Liste von einen Channel"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "    ASSIGN        Weist einem Channel einen Bot zu"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr ""
 "    AUTOOP       Sollten Dir die Services automatisch\n"
 "                 Op-Status geben.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr ""
 "    AUTOOP     Sollten die Services dem Nick automatisch seinen\n"
 "               Op-Status geben."
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "    BADWORDS      Verwaltet die Bad-Word-Liste"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bant den angegebenen Nicknamen aus einen Channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr ""
 "    BANTYPE       Ändert den Ban-Typ, den die Services\n"
 "                  in dem Channel anwenden"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "    BOT           Verwaltung von Bots"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "    BOTLIST       Zeigt alle vorhandenen Bots an"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Annulliert deine letzte gesendete Memo"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL      AKILL alle User des angegebenen  Channels"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST      Alle registrierten Channels anzeigen"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr ""
 "    CHECK  Überprüft ob deine letzte gesendete Memo an\n"
 "           einen Nicknamen gelesen wurde"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr ""
 "    CLEAR      Entfernt bestimmte Einstellungen des angegebenen Channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES   Die Modi eines Channels zurücksetzen"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Bestätigt einen \"nickserv auth code\"."
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "     Erstellt: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON        Ändert das  DefCon System"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr ""
 "    DEHALFOP   Enfernt den HalfOP-Status des angegebenen Nicknamens\n"
 "               in einen Channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Löscht den vHost eines Users"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Löschen einer oder mehrerer Memos"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Löscht den vHost einer Gruppe"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr ""
 "    DEOP       Enfernt den OP-Status des angegebenen Nicknamens\n"
 "               in einen Channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Entfernt dein Gründer Status in einen Channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr ""
 "    DEPROTECT  Entfernt den schutz des angegebenen Nicknamens \n"
 "               in einen Channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Ändert die Channel-Beschreibung"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr ""
 "    DEVOICE    Enfernt den Voice-Status des angegebenen Nicknamens\n"
 "               in einen Channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Setzt einen Nicknamen als Ursprung der Nickgruppe"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY      Ändert den \"Ursprung\" deiner Gruppe"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Registrierung eines Channels aufheben"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP        Die Registrierung einen Nicknamen löschen"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "      Beschreibung: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Fügt eine Emailadresse dem Nicknamen hinzu"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr ""
 "    EMAIL        Verbindet eine öffentliche eMail-Adresse\n"
 "                 mit deinem Nicknamen         "
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Stellt eine Begrüssungsmeldung des\n"
-"                  Channels ein"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr ""
 "    EXCEPTION     Bearbeiten der Liste der eingeschränkten Verbindungen"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Verhindert die Nutzung eines Channels"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Einen bestimmten Nicknamen verbieten"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Stellt den Gründer des Channels ein"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -1015,79 +957,84 @@ msgstr ""
 "    GETEMAIL   Gibt die passenden Nicknamen wieder, \n"
 "               welche die angegebene eMail benutzen."
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Gibt den Channel-Schlüßel wieder"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Das Passwort eines Nicknamens aus der\n"
 "               Datenbank auslesen (nur wenn keine\n"
 "               Verschlüsselung aktiv ist)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr ""
 "    GHOST      Trennt eine \"ghost\" IRC-Verbindung mit deinen Nicknamen"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Listet alle Nicknamen in deine Gruppe"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL       Eine Notice an alle User schicken"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Fügt eine Begrüssungsnachricht dem Nicknamen hinzu"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr ""
 "    GREET        Stellt eine Begrüssungsmeldung für deinen\n"
 "                 Nicknamen ein."
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr ""
 "    GROUP       Gleicht den vHost aller Nicknamen \n"
 "                in einer Gruppe an"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP       Verwaltung von Nickname-Gruppierungen"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "          Grussnachricht: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr ""
 "    HALFOP     Gibt den angegebenen User HalfOP-Status in einen Channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr ""
 "    HIDE         Versteckt bestimmte Informationen deines\n"
 "                 Nicknamens"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Verwaltet die HOP-Liste von einen Channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY    Identifizierung des Nicknames"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1095,51 +1042,51 @@ msgstr ""
 "    INFO          Erlaubt dir Informationen über ein BotServ ServicesBot zu "
 "sehen"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Zeigt Informationen über den angegebenen Nicknamen"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Zeigt Informationen über den angegebenen Channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Zeigt Informationen bezüglich deiner Memos an"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE          Einen Server \"jupitern\""
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 "    KEEPTOPIC     Topic behalten, wenn Channel nicht\n"
 "                  benutzt wird"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "    KICK          Konfiguriert den Kicker (s.u.)"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr ""
 "    KICK         Einen User aus einem beliebigen\n"
 "                 Channel kicken"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kickt den angegebenen Nicknamen aus einen Channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL         Stellt Kill-Schutz an oder aus."
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1147,188 +1094,172 @@ msgstr ""
 "    LANGUAGE     Stellt die Sprache ein, in der dir die \n"
 "                 Services antworten sollen."
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Stellt die Sprache ein, in der die Services\n"
-"               dem Nicknamen antworten sollen."
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr ""
 "    LEVELS     Die Einstellungen verschiedener\n"
 "               Zugriffslevel neu definieren"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Zeigt einen oder mehrere vHost Einträge an"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       Listet alle registrieten Nicknamen des angegebene Muster"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr "    LIST       Listet alle registrieten Channels des angegebene Muster"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Erzeugt eine Liste deiner Memos"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr "    LOGONNEWS     Logon-News bearbeiten"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Macht das IDENTIFY Befehl rückgängig"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Channel-Modes fest einstellen"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE         Channel-Modes ändern"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES   Die Modi eines Channels zurücksetzen"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO       Info über ein geladenes Modul"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST       Listet die geladenen Module auf"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD       Lädt ein Modul"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD       Lädt ein Modul"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD     Entfernt ein Modul"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr ""
 "    MSG          Ändert die Methode, wie die Services mit\n"
 "                 dir kommunizieren"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr ""
 "    NOEXPIRE   Verhindert, dass der Nickname nach einer bestimmten\n"
 "               Zeit verfällt"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
 msgstr "    NOOP          Alle O:Lines temporär deaktivieren"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Deaktiviert deinen vHost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE         Einem User \"Operflags\" setzen"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Aktiviert deinen vHost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr ""
 "    OP         Gibt den angegebenen Nicknamen Op-Status in einen Channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr "    OPERNEWS      Oper News bearbeiten"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Sendet eine Notice wenn Op/Deop-Befehl\n"
 "                  benutzt werden"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gibt dir Gründer Staus in einen Channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "     Options : %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Setzt das Passwort eines Nicknamens"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD     Setzt das Passwort deines Nicknamens neu"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Regulate the use of critical commands"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Den Channel vom /LIST-Befehl verstecken"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Verhindert, dass der Nickname im Befehl\n"
 "               /msg %S LIST auftaucht"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE      Verhindert das Erscheinen deines Nicknamens \n"
-"                 auf der Liste von /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Schützt den angegebenen Nicknamen in einen Channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Verwaltet die QOP-Liste von einem Channel"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr ""
 "    QUIT          Services _ohne_ Speichern der Datenbanken\n"
 "                  beenden"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1336,335 +1267,338 @@ msgstr ""
 "    RANDOMNEWS    Definiert Nachrichten, die den Benutzern zufällig\n"
 "                  beim Verbinden angezeigt werden"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Lesen einer oder mehrerer Memos"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER     User killen, der deinen Nicknamen verwendet"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER    Registriert einen Nicknamen"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER    Registriert einen Nicknamen"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 "    RELEASE     Hebt die Nickname-Sperre auf nach der \n"
 "                verwendung des RECOVER Befehls"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Sendet ernuet ein \"nickserv auth code\"."
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS   Helps you reset lost passwords"
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART       Datenbanken speichern und Services neustarten"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Eingeschränkter Zugriff auf den Channel"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr ""
 "    RSEND  Sendet eine Memo an einen Nickname oder Channel\n"
 "           und  sendet dir eine Empfangsbestätigung zurück"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Reverses kicker : %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Reverses kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Setzt SET Einstellungen auf einen anderen Nicknamen"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr "    SAY           Veranlaßt ein Bot ein Text in einen Channel zu sagen"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Aktiviert %S's Sicherheits-funktionen"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr ""
 "    SECURE       Aktiviert/Deaktiviert den Sicherheitsmodus\n"
 "                 für deinen Nicknamen"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER Strengere Kontrolle des Founder-Status"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Strengere Kontrolle des Op-Status im Channel"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Sendet eine Memo an einen Nickname oder Channel"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Sendet eine Nachricht an alle registrierten User."
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS    Passwort vergessen? Versuch das hier."
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION       Hosts mit einer bestimmten Anzahl"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "    SET           Konfiguriert die Bot-Optionen"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Setzt einem User einen vHost"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET           Verschiedene Services Optionen einstellen"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr ""
 "    SET        Bestimmte Channel-Optionen und\n"
 "               Informationen einstellen"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET         Optionen einstellen, auch Kill-Schutz"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr ""
 "    SET    Stellt bestimmte Optionen ein in Hinsicht\n"
 "           auf Memos"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Setzt einer Gruppe einen vHost"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN      Datenbanken speichern und Services beenden"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr ""
 "    SIGNKICK      Kicks durch ChanServ in dem Channel\n"
 "                  werden durch den Kicker signiert"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE       Die SNLINE-Liste bearbeiten"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Verwaltet die SOP-Liste von einen Channel"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE       Die SQLINE-Liste bearbeiten"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr ""
 "    STAFF        Zeigt alle Nicknamen, die Zugriff auf die \n"
 "                 Services haben, Onlinestatus und Level"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF  Sendet allen Opers/Admins eine Nachricht."
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS        Status des Netzes und der Services anzeigen"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Liefert das Zugriffslevel eines Users\n"
 "               in dem Channel"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Zeigt den Status des angegebenen Nicknamens an"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Stellt den Vertreter des Founders ein"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Verbietet jegliche Nutzung des Channels.\n"
 "               Die Channel Einstellungen bleiben jedoch\n"
 "               erhalten"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspendet den angegebenen Nicknamen"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK       Erzwingt einen Nicknamen wechsel"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE       Die SZLINE-Liste bearbeiten"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Ändert den Topic des angegebenen Channels"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     Topic kann nur durch TOPIC geändert werden"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE         User Modi ändern"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "    UNASSIGN      Entfernt ein ServicesBot von einen Channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP     Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Hebt ein SUSPEND wieder auf"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend den angegebenen Nicknamen"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
 msgstr "    UPDATE        Die Services Datenbänke sofort speichern"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Erneuert dein gegenwärtigen Status ( Memos , Flags , vHost )"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST      Alle registrierten Nicknamen anzeigen"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "     benutzt in: %d Channel(s)"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Gibt den angegebenen User Voice-Status in einen Channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Verwaltet die VOP-Liste von einen Channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Schaltet das Listen System ein oder aus"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (wird in %s auslaufen)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Bad words kicker : %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Bad words kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "           eMail-Adresse: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "          ist online von: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "     Letztes Mal gesehen: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr " Topic gesetzt von: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1673,17 +1607,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1692,66 +1626,61 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s%s"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "Eintrittsnachricht: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "     Echter Name: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "        Registriert seit: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  Underlines kicker : %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  Underlines kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Nummer  Sender            Datum/Zeit"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1759,32 +1688,41 @@ msgstr ""
 "\"/msg %s\" wird nicht mehr unterstützt.  Benutze \"/msg %s@%s\" oder \"/%s"
 "\" stattdessen."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nickname:%s, vHost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nickname:%s, vHost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, fuzzy, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1793,7 +1731,7 @@ msgstr ""
 "%3d  %s (von %s am %s, %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1802,25 +1740,16 @@ msgstr ""
 "%3d %s (von %s am %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (stuck) (von %s am %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (von %s am %s, %s)\n"
 "    Limit: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1829,347 +1758,337 @@ msgstr ""
 "%5d (%s von %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Befehle von %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s wird bei neuen Memos nicht benachrichtigt."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Module geladen."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d Bots verfügbar."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d Tage"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (von %s am %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d Stunden"
+msgid "%d Modules loaded."
+msgstr "%d Module geladen."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+msgid "%d bots available."
+msgstr "%d Bots verfügbar."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d Nicknamen in der Gruppe."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d Sekunden"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "Die AOP-Liste von %s ist leer."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "Die HOP-Liste von %s ist leer."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "Die SOP-Liste von %s ist leer."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "Die VOP-Liste von %s ist leer."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "Die Access-Liste von %s ist leer."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Die Autokick-Liste von %s ist leer."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "Die Bad Words-Liste von %s ist leer."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s kann nicht gleichzeitig Gründer und Vertreter im Channel %s sein."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s kann keine Memos empfangen."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Befehle von %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "%s ist zu allgemeingültig, bitte benutze eine genauere Hostmaske."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s hat derzeit %d Memos, von denen %d ungelesen sind."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s hat derzeit %d Memos, von denen eine ungelesen ist."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s hat derzeit %d Memos."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s hat derzeit %d Memos, von denen alle ungelesen sind."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s hat derzeit eine ungelesene Memo."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s hat derzeit eine Memo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s hat derzeit keine Memos."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s hat zu viele Memos gespeichert und kann keine weiteren empfangen."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s hat kein Memo-Limit."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s hat keine Memos."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s hat keine Memos."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s ist %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s sind derzeit nicht verfügbar, bitte versuche es später noch einmal."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s ist derzeit online."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s ist ausgeschaltet"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s ist eingeschaltet"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s verlässt den Super-Admin Mode."
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s wird bei neuen Memos nicht benachrichtigt."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr "%s wird beim Logon und bei Ankunft neuer Memos benachrichtigt."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s wird beim Logon über neuer Memos benachrichtigt."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s wird bei Ankunft neuer Memos benachrichtigt."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s ist jetzt ein Super-Admin."
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"AOP Liste für %s:\n"
+"  Nummer  Nickname"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s wurde nicht auf der AutoKick-Liste von %s gefunden."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s wurde von der Autokick-Liste von %s entfernt."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s wird dich nicht länger beim Eintreffen neuer Memos benachrichtigen."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s wird dich benachrichtigen, sobald neue Memos für dich eintreffen."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
 "you."
 msgstr "%s wird dich beim Einloggen über eingegangene Memos informieren. "
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s wird dich beim Einloggen oder bei der Rückkehr aus /AWAY über "
 "eingegangene Memos informieren."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) wurde zur der Bot-Liste hinzugefügt."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s's Memo-Limit liegt bei %d, und kann nicht geändert werden."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s's Memo-Limit liegt bei %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* Setzt einen AKILL auf jeden NEU verbindenden Clienten"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Zwingt alle Channels die Modes (%s) zu setzen"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignoriert jeden non-opers mit Nachrichten"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killt jeden NEU verbindenden Clienten"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* keine MLOCK änderungen"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Keine neuen Channel-Registrierungen"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Es werden keine neuen Memos gesendet"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Keine neuen Nicknamen-Registrierungen"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Stilles ignorieren von non-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Benutzt das reduzierte Session-Limit von %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 Tag"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 Stunde"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 Minute"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 Sekunde"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<unbekannt>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Ein Massen-Memo wurde an alle regsitrierte User gesendet."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2178,134 +2097,136 @@ msgstr ""
 "Eine Benachrichtigungs-Memo wurde zum %s gesendet um ihn/sie zu\n"
 "informieren das du seine/ihre Memo gelesen hast."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "Ein Password wurde zu %s gesendet, bitte tippe /msg %s confirm <passcode> um "
 "die Registrierung abzuschließen."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "Fehler! Eine vHost-vIdent muss das  Format einer gültiger Ident haben."
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr ""
 "Fehler! Ein vHost darf nur die Zeichen A-Z, a-z, 0-9, '.' und '-' enthalten."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS Channel {ADD|DEL|LIST|CLEAR} [Nickname [Level] | entry-liste]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [Maske]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT Channel Text"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [Maske]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK Channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [Nickname/"
 "Usermaske]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE für %s erledigt. %d User betroffen."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "Die AKILL-Liste ist leer."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} "
 "[Grund]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"AOP Liste für %s:\n"
-"  Nummer  Nickname"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN Channel Nickname"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Zugriff verweigert."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Access-Level für %s in %s wurde geändert auf %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Access-Level für %s in %s ist unverändert auf %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Access-Level muss zwischen %d und einschliesslich %d liegen."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Access-Level muss grösser als 0 sein."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Zugriffslevel für Channel %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Zugriffslevel für %s wurden auf Standardwerte zurückgesetzt."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Die Access-Liste für %s leer."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Access-Liste von %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Access-Liste für %s:\n"
 "  Nummer   Level  Nickname"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Access-Liste:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2314,22 +2235,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s wurde der AutoKick-Liste von %s hinzugefügt."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Neuer Logon News-Eintrag hinzugefügt (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Neuer Oper-News-Eintrag hinzugefügt (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Neuer randomnews Eintrag hinzugefügt (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2337,237 +2263,230 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Alle O:Lines von %s wurden temporär entfernt."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Alle O:lines von %s wurden wiederhergestellt."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Alle Bans in %s wurden entfernt."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Alle Ausnahmen in %s wurden entfernt."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Alle Invites wurden im Channel %s entfernt."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Alle Logon-News wurden entfernt."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Alle Memos für den Channel %s wurden gelöscht."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Alle Modi wurden vom Channel %s zurückgesetzt."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Alle Channel-Modes von %s wurden zurückgesetzt."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Alle deine Memos wurden gelöscht."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Alle Oper-News-Einträge wurden entfernt."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Ale randomnews Einträge wurden gelöscht."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Alle User wurden aus Channel %s gekicked."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s@%s gesetzt."
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Erlaubnis sich selbst zu (de)halfop'en"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Erlaubnis sich selbst zu (de)op'en"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Erlaubnis, selber den Schutz ein/auszuschalten"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Erlaubnis sich selbst zu (de)voicen"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Erlaubnis Bots hinzuzufügen / zu entfernen"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Erlaubnis, sich selbst zu bannen"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Erlaubnis, sich selbst zu kicken"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Erlaubnis Channel-Memos zu lesen"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Änderungen an der Channel-Access-Liste erlaubt"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "AKICK-Befehl erlaubt"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "BADWORDS-Befehl erlaubt"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Erlaubnis, BAN zu nutzen"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "CLEAR-Befehl erlaubt"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "GETKEY-Befehl erlaubt"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "HALFOP/DEHALFOP-Befehl erlaubt"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Erlaubnis, INFO mit der ALL Option zu nutzen"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "INVITE-Befehl erlaubt"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "KICK-Befehl erlaubt"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "OP/DEOP-Befehl erlaubt"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "PROTECT-DEPROTECT-Befehl erlaubt"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "SAY/ACT-Befehl erlaubt"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "SET-Befehl erlaubt (nicht FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Erlaubnis, TOPIC zu nutzen"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "UNBAN-Befehl erlaubt"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "VOICE/DEVOICE-Befehl erlaubt"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Darf die Befehle des Fantasia-Mode benutzen"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Ansicht der Channel-Access-Liste erlaubt"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Autokick-Liste von %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Automatischer Channel-Operator Status"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Automatischer Founder-Status"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Automatischer Half-Op Status"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Automatischer Voice-Status"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS Channel {ADD|DEL|LIST|CLEAR} [Wort | entry-liste] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2577,7 +2496,7 @@ msgstr ""
 "BOT CHANGE Botnick Neuer-Botnick [User [Hostmaske [Realname]]]\n"
 "BOT DEL Nickname"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2586,111 +2505,109 @@ msgstr ""
 "Bad Words-Liste von %s:\n"
 "  Nummer   Wort                           Typ"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Die Bad Words-Liste ist jetzt leer."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Ban-Typ für den Channel %s ist jetzt #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Alle binären Modi und Bans wurden aus dem Channel %s entfernt."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s existiert bereits."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Bot %s gibt es nicht."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s wurde dem Channel %s zugewiesen."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Bot %s wurde geändert auf %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Bot %s wurde gelöscht."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s ist bereits dem Channel %s zugewiesen."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot wird Ops kicken im %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot wird Voices kicken im %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot wird keine Ops kicken im %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot wird keine Voices kicken im %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Bot Hosts dürfen nur gültige Zeichen enthalten."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents dürfen nur %d Zeichen enthalten."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Bot Idents dürfen nur gültige Zeichen enthalten."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicknamen dürfen nur gültige Zeichen enthalten."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Der Bot ist nicht im Channel %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Bot-Liste:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Ein Bot betritt den Channel erst, wenn sich %d User \n"
-"in diesem Channel befinden."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2701,7 +2618,7 @@ msgstr ""
 "nach %d kicks. Benutze den BADWORDS Befehl um Wörter zur Liste\n"
 "hinzuzufügen oder zu entfernen."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2709,20 +2626,20 @@ msgstr ""
 "Bot wird jetzt auf bad words achten und kicken. Benutze den BADWORDS\n"
 "Befehl um Wörter zur Liste hinzuzufügen oder zu entfernen."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Bot kickt jetzt Leute, die fett schreiben und setzt einen Ban nach\n"
 "%d Kicks des Users."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Bot kickt jetzt Leute, die fett schreiben."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2733,7 +2650,7 @@ msgstr ""
 "%d Zeichen und %d%% der gesamten Nachricht sein), und wird nach %d Kicks\n"
 "einen Ban setzen."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2742,47 +2659,47 @@ msgstr ""
 "Bot wird jetzt User mit GROSSSCHRIFT kicken (es müssen allerdings\n"
 "%d Zeichen und %d%% der gesamten Nachricht sein)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot kickt jetzt User, die farbig schreiben, und wird einen Ban nach\n"
 "%d Kicks setzen."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Bot kickt jetzt User, die farbig schreiben."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Bot wird jetzt Flooder kicken (%d Zeilen in %d Sekunden), und wird einen\n"
 "Ban setzen nach %d Kicks."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot wird jetzt Flooder kicken (%d Zeilen in %d Sekunden)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after \n"
 "%d kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2792,149 +2709,163 @@ msgstr ""
 "Bot kickt jetzt User die sich wiederholen ( %d Mal das Gleiche), und setzt\n"
 "einen Ban nach %d Kicks."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
 "the same thing)."
 msgstr "Bot kickt jetzt User die sich wiederholen ( %d Mal das Gleiche)"
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot kickt User, die invertiert schreiben, und setzt einen Ban nach %d\n"
 "Kicks."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Bot kickt Leute, die invertiert schreiben."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot kickt jetzt User, die unterstrichen schreiben, und setzt einen Ban \n"
 "nach %d Kicks."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Bot kickt jetzt User, die unterstrichen schreiben."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Bot kickt jetzt User, die farbig schreiben."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after \n"
+"%d kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "bad word Kick ist jetzt deaktiviert."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "bold Kick ist jetzt deaktiviert."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Der Bot wird GROSSSCHRIFT ignorieren und nicht kicken."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Bot wird jetzt farbige Schrift ignorieren und nicht kicken."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Bot wird jetzt Flooder ignorieren und nicht kicken."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr ""
 "Bot ignoriert jetzt jetzt User die sich wiederholen und wird nicht kicken."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot wird jetzt invertierten Schriftstil ignorieren und nicht kicken."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot wird jetzt unterstrichenen Text ignorieren und nicht kicken."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Der Bot wird GROSSSCHRIFT ignorieren und nicht kicken."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ           : %6d Einträge, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots die für IRC Operatoren reserviert sind:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes gelesen     : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes geschrieben : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {Nickname | Channel}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+Zeit] {Channel} [Grund]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK Nickname"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR Channel was"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES Channel [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr ""
-"Ausloggen von %s nicht möglich, da es sich um einen Services Administrator "
-"handelt."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR Channel was"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Die Services können gerade keine Mail verschicken, bitte versuche es später "
 "noch einmal."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ          : %6d Einträge, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Usermodi von %s geändert."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Dieser Channel %s existiert nicht."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Channel %s wurde aus der Datenbank entfernt."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2943,142 +2874,103 @@ msgstr ""
 "Der Channel %s wurde verboten von %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Der Channel %s ist bereits registriert!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Der Channel %s hat jetzt den Status \"verboten\"."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Der Channel %s ist jetzt nicht mehr auf SUSPENDED gesetzt."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Der Channel %s ist jetzt auf SUSPENDED gesetzt."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Der Channel %s ist nicht registriert."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Der Channel %s ist verboten und darf nicht verwendet werden."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Der Channel %s kann nicht registriert werden."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Der Channel %s ist registriert unter deinem Nicknamen: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Channel           : %6d Einträge, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Der Channel %s wird nach einer bestimmten Zeit auslaufen."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Der Channel %s wird nicht mehr auslaufen."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Die AOP-Liste von %s wurde geleert."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Die %s HOP-Liste wurde geleert."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Die SOP-Liste von %s wurde geleert."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Die VOP-Liste von %s wurde geleert."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Die Access-Liste von %s wurde geleert."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Die Autokick-Liste von %s wurde geleert."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Der Channel %s ist jetzt nicht mehr auf SUSPENDED gesetzt."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s ist kein gültiger Channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Die Channel AOP-Liste darf nur registrierte Nicknamen enthalten."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Die Channel HOP-Liste darf nur registrierte Nicknamen enthalten."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Die Channel SOP-Liste darf nur registrierte Nicknamen enthalten."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Channel SQLINEs werden nicht von deinem IRCd unterstützt, folglich kannst du "
 "sie nicht nutzen."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Die Channel VOP-Liste darf nur registrierte Nicknamen enthalten."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Die Channel-Access-Liste darf nur registrierte Nicknamen enthalten."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3086,11 +2978,7 @@ msgstr ""
 "Channel-Liste:\n"
 "Name                  User Topic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Channel-Operator-Status nicht erlaubt"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3099,7 +2987,7 @@ msgstr ""
 "Die Channels auf die %s Zugriff hat:\n"
 "  Nummer  Channel              Level     Beschreibung"
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3107,31 +2995,16 @@ msgstr ""
 "Die Channels auf die du Zugriff hast:\n"
 "  Nummer  Channel              Level     Beschreibung"
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Konnte den Status \"verboten\" bei %s nicht setzen!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Konnte den Nicknamen %s nicht verbieten!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Der Channel %s konnte nicht auf UNSUSPENED gesetzt werden!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "SUSPEND konnte in Channel %s nicht aktiviert werden!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Aktuelle AKILL-Liste:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3139,15 +3012,15 @@ msgstr ""
 "Aktuelle AKILL-Liste:\n"
 "  Nummer   Maske                             Grund"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Aktuelle Module - Liste:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Aktuelle SNLINE-Liste:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3155,11 +3028,11 @@ msgstr ""
 "Aktuelle SNLINE-Liste:\n"
 "  Nummer   Maske                             Grund"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Aktuelle SQLINE Liste:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3167,11 +3040,11 @@ msgstr ""
 "Aktuelle SQLINE Liste:\n"
 "  Nummer   Maske                              Grund"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Aktuelle SZLINE-Liste:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3179,443 +3052,410 @@ msgstr ""
 "Aktuelle SZLINE-Liste:\n"
 "  Nummer   Maske                             Grund"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Aktuelle Liste für eingeschränkte Verbindungen:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Aktuelle Anzahl von AKILLs: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Aktuelle Anzahl von SNLINEs: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Aktuelle Anzahl von SQLINEs: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Aktuelle Anzahl von SZLINEs: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Derzeit eingeloggte User: %d (%d Oper)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL Nickname."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [Channel] {Nummer | Liste | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL Nickname."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP Channel"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Standard Auslaufzeit von AKILLs: %d Tage"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Standard Auslaufzeit von AKILLs: %d Stunden"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Standard Auslaufzeit von AKILLs: %d Minuten"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Standard Auslaufzeit von AKILLs: 1 Tag"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Standard Auslaufzeit von AKILLs: 1 Stunde"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Standard Auslaufzeit von AKILLs: 1 Minute"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Standard Auslaufzeit von AKILLs: Kein Auslauf, permanent"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Standard Auslaufzeit von SNLINEs: %d Tage"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Standard Auslaufzeit von SNLINEs: %d Stunden"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Standard Auslaufzeit von SNLINEs: %d Minuten"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Standard Auslaufzeit von SNLINEs: 1 Tag"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Standard Auslaufzeit von SNLINEs: 1 Stunde"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Standard Auslaufzeit von SNLINEs: 1 Minute"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Standard Auslaufzeit von SNLINEs: Kein Auslauf, permanent"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Standard Auslaufzeit von SQLINEs: %d Tage"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Standard Auslaufzeit von SQLINEs: %d Stunden"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Standard Auslaufzeit von SQLINEs: %d Minuten"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Standard Auslaufzeit von SQLINEs: 1 Tag"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Standard Auslaufzeit von SQLINEs: 1 Stunde"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Standard Auslaufzeit von SQLINEs: 1 Minuten"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Standard Auslaufzeit von SQLINEs: Kein Auslauf, permanent"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Standard Auslaufzeit von SZLINEs: %d Tage"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Standard Auslaufzeit von SZLINEs: %d Stunden"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Standard Auslaufzeit von SZLINEs: %d Minuten"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Standard Auslaufzeit von SZLINEs: 1 Tag"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Standard Auslaufzeit von SZLINEs: 1 Stunde"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Standard Auslaufzeit von SZLINEs: 1 Minute"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Standard Auslaufzeit von SZLINEs: Kein Auslauf, permanent"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "%d Einträge wurden von der %s AOP-Liste gelöscht."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "%d Einträge wurden von der %s HOP-Liste gelöscht."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "%d Einträge wurden von der %s SOP-Liste gelöscht."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "%d Einträge wurden von der %s VOP-Liste gelöscht."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "%d Einträge wurden aus der Access-Liste von %s entfernt."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d Einträge wurden aus der AutoKick-Liste von %s entfernt."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "%d Einträge wurden aus der Bad Words-Liste von %s entfernt."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr ""
 "Es wurden %d Einträge von der Liste der Verbindungs-\n"
 "einschränkungen entfernt."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "Es wurden %d Einträge von der AKILL-Liste entfernt."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "Es wurden %d Einträge aus der SNLINE-Liste entfernt."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "Es wurden %d Einträge aus der SQLINE-Liste entfernt."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "Es wurden %d Einträge aus der SZLINE-Liste entfernt."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "1 Eintrag wurde von der %s AOP-Liste gelöscht."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "1 Eintrag wurde von der %s HOP-Liste gelöscht."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "1 Eintrag wurde von der %s SOP-Liste gelöscht."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "1 Eintrag wurde von der %s VOP-Liste gelöscht."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 Eintrag wurde aus der Access-Liste von %s entfernt."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 Eintrag der AutoKick-Liste von %s entfernt."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "1 Eintrag wurde aus der Bad Words-Liste von %s entfernt."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr ""
 "Es wurde 1 Eintrag von der Liste der Verbindungs-\n"
 "einschränkungen entfernt."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "Es wurde 1 Eintrag von der AKILL-Liste entfernt."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "Es wurde 1 Eintrag aus der SNLINE-Liste entfernt."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "Es wurde 1 Eintrag aus der SQLINE-Liste entfernt."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "Es wurde 1 Eintrag aus der SZLINE-Liste entfernt."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "1 Eintrag wurde von der %s AOP-Liste gelöscht."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Beschreibung von %s wurde geändert zu %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "nicht aktiv"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Liste alle Einträge. (Count: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Einträge von %d bis %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Auf das Muster %s passenden Einträge. (Count: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Im Channel ist keine fettgedruckte-Schrift erlaubt!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Keine Farben im Channel benutzen!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Nicht invertiert schreiben!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Benutze nicht das Wort %s in diesem Channel!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Keine Unterstreichungen in diesem Channel benutzen!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail Adresse für %s wurde auf %s geändert."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail Adresse  %s wurde entfernt."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "eMail-Adresse wurde entfernt."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "eMail-Adresse für %s ist ungültig."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [Parameter]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Passende Emails %s bis %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "aktiv"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Ende der %s Liste."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Ende der Access-liste."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Ende der Channel-Liste."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Ende der Liste - %d/%d Treffer angezeigt."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Ende der Liste - %d/%d Treffer angezeigt."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Ende der User-Liste."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Deutsch"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Begrüssungsnachricht von %s wurde geändert."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Begrüssungsnachricht von %s wurde entfernt."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
@@ -3623,7 +3463,7 @@ msgstr ""
 "Fehler! Die Ident ist zu lang, bitte nutze eine Ident mit weniger als\n"
 "%d Buchstaben."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
@@ -3631,283 +3471,203 @@ msgstr ""
 "Fehler! Der vHost ist zu lang, bitte nutze einen vHost mit weniger als\n"
 " %d Buchstaben."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "DIe Exception für %s (#%d) wurde auf die  %d Position verschoben."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception für %s ist zu %d aktualisiert worden."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Wird am %s auslaufen"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Auslaufzeit von %s geändert."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID Channel Grund"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID Channel [Grund]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID Nickname Grund"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID Nickname [Grund]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasy-Mode"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Fantasy mode ist jetzt ON im %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Fantasy mode ist jetzt OFF im %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Fantasy mode ist jetzt ON im %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s wird nicht länger ignoriert."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Founder von %s wurde geändert zu %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Keine WildCards!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY Channel"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS Nickname"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS nicht verfügbar, da die Verschlüsselung aktiviert ist."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST Nickname [Passwort]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL Nachricht"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP Ziel Passwort"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Ghost mit deinem Nicknamen wurde entfernt."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Begrüssungsnachricht"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Grussmeldung wird angezeigt"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Begrüssungsnachricht %s wurde auf %s geändert."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Begrüssungsnachricht %s wurde entfernt."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Begrüssungsnachricht ist jetzt OFF im %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Begrüssungsnachricht ist jetzt ON im %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"HOP Liste für %s:\n"
-"  Nummer  Nickname"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ          : %6d Einträge, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts mit mindestens %d Verbindungen:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY Passwort"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [Zeit] [Nickname | Hostmaske]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO Channel"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO Nickname"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {Channel | Nickname}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE Channel"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 "Wenn du ihn nicht innerhalb von 20 Sekunden identifizierst, wird er "
 "automatisch geändert."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 "Wenn du ihn nicht innerhalb einer Minute identifizierst, wird er automatisch "
 "geändert."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Ignore code wird benutzt."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Ignore code wird nicht benutzt."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Die Ignore-Liste wurde geleert."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Ignore-Liste ist leer."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Bot-Liste:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3923,29 +3683,25 @@ msgstr ""
 "Tippe /msg %S HELP SET Option für Erläuterungen\n"
 "zu einer bestimmten oben genannten Option."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Information vom Bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informationen über den Channel %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Interner Fehler - kann die Anfrage nicht verarbeiten."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Ungültige Auslaufzeit."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3953,14 +3709,14 @@ msgstr ""
 "Ungültige Hostmask. Nur echte Hostmasken sind gültig als Einträge (ohne "
 "Nicknamen und Idents)."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Ein ungültiger Passcode wurde eingegeben, prüfe bitte deine Email und gib "
 "den Code erneut ein."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3970,298 +3726,312 @@ msgstr ""
 "grösser oder gleich\n"
 "Null aber kleiner als %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Ungültiger Wert. Es muss eine gültige grade Zahl sein, die grösser als 1 ist."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE Servername [Grund]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK Channel Option {ON|OFF} [Einstellungen]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK Channel User Grund"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS Channel {SET | DIS[ABLE] | LIST | RESET} [item [Level]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST Muster"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST Muster [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [Channel] [Liste | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Sprache wurde geändert zu Deutsch."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Die letzte Memo an %s wurde widerrufen."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Letzte Quit-Nachricht: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Letzte gesehene Hostmaske: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Der Level für %s für den Channel %s wurde geändert auf %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Der Level kann nur zwischen %d und einschliesslich %d liegen."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Der Befehl ist in diesem Modus nutzlos - Deaktiviere zuerst XOP."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Liste der gefundenen Einträge %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Liste der Nicknamen in der Gruppe von %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Liste der Nicknamen in deiner Gruppe:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Lokale Channels können nicht registriert werden."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Logon News-Eintrag #%d wurde gelöscht."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Logon News-Eintrag #%d konnte nicht gefunden werden!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Logon News Einträge:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE Channel Modi"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO Modul-Name"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD Modul-Name"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD Modul-Name"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD Modul-Name"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Diese Hostmaske %s ist bereits auf der Access-Liste."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Die Hostmaske sollte in dieser Form sein: user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "                 Maximum: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Memo %d von %s (%s).  Um sie zu löschen, tippe /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Memo %d von %s (%s).  Um sie zu löschen, tippe /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d wurde gelöscht."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Memo-Limit von %s wurde aufgehoben."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Memo-Limit von %s wurde auf %d gesetzt."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr ""
 "Memo-Limit von %s wurde auf 0 gesetzt, kein Memo-Empfang für ihn mehr "
 "möglich."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Das Memo-Limit ist zu gross, es wird reduziert auf %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo wurde an %s versandt."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ Nummer"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ Nummer"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Message-Mode"
 
-#: language.cpp:866
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Mode %c wurde ignoriert, da du diesen Mode nicht festsetzen kannst."
-
-#: language.cpp:1314
-#, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Alle Op-Flags wurden im Channel %s entfernt."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Mode lock für Channel %s geändert zu %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "        Mode lock: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modul %s geladen"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modul %s geladen"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modul %s entfernt"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Autor: %s geladen: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} Server"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NickServ-Aliase   : %6d Einträge, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NickServ-Gruppen  : %6d Einträge, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Wird nicht durch den Bot-Kicker gekicked"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Neue Memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Neue Memos für %s.  Um sie zu lesen, tippe /msg %s READ Nummer"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Neue Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Die News-Liste ist voll!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4270,147 +4040,133 @@ msgstr ""
 "Der Nickname %s wurde verboten von %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr ""
 "Der Nickname %s ist ein illegaler Nickname und kann nicht benutzt werden."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Der Nickname %s wird derzeit benutzt."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Der Nickname %s ist jetzt verboten."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Der Nickname %s ist ein teil der  Network Services."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Der Nickname %s ist nicht gesperrt."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Der Nickname %s wird derzeit nicht benutzt."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Der Nickname %s ist nicht registriert."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Der Nickname %s ist verboten und darf nicht verwendet werden."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "Der Nickname %s wurde nicht in der Ignore-Liste gefunden."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Dein Nickname %s wurde auf %d Zeichen gekürzt."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nickname %s wird wieder verfallen."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nickname %s wird nicht mehr verfallen."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nickname %s hat keine Memo von dir."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Der Nickname %s wurde erfolgreich ausgeloggt."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Der Nick %s ist vorübergehend gesperrt."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Der Nickname %s ist jetzt freigegeben."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Der Nickname %s ist jetzt suspendiert."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick konnte NICHT registriert werden, versuche es später noch einmal."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nickname %s bestätigt"
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Der Nickname %s wurde aus der Datenbank entfernt."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Dieser Nickname %s ist bereits registriert!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Dieser Nickname %s kann nicht registriert werden."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s ist nicht registriert."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Dein Nickname %s ist unter deinem Host registriert worden: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Der Nickname %s wurde erfolgreich registriert."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Nickname Registrierung (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Nick-Passwort (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4421,164 +4177,119 @@ msgstr ""
 "genutzt wurden, werden durch den automatischen Auslauf\n"
 "nach %d Tagen aus der Datenbank entfernt."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Kein # vor dem Channelnamen gefunden."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "No-Bot-Mode ist jetzt OFF im Channel %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "No-Bot-Mode ist jetzt ON im Channel %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Keine eingetragenen Emails für %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Kein Bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Keine Hilfe verfügbar für %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Es sind keine Informationen für das Modul %s verfügbar"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Keine zu löschenden Einträge in der Logon News-Liste gefunden."
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Keine passenden Einträge in der %s AOP-Liste."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Keine passenden Einträge in der %s HOP-Liste."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Keine passenden Einträge in der %s SOP-Liste."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Keine passenden Einträge in der %s VOP-Liste."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr ""
 "Es existieren keine entsprechenden Einträge in der Access-Liste von %s."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Keine entsprechenden Einträge auf der AutoKick-Liste von %s gefunden."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Keine entsprechenden Einträge zu %s in der Bad Words-Liste gefunden."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "Keine entsprechenden Einträge in der Liste der \n"
 "Verbindungseinschränkungen."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Keine entsprechenden Einträge auf der AKILL-Liste."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Keine entsprechenden Einträge auf der SNLINE-Liste."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Keine entsprechenden Einträge auf der SQLINE-Liste."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Kein entsprechender Eintrag in der SZLINE-Liste gefunden."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Kein Memo konnte widerrufen werden."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Derzeit keine Module geladen"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Keine Oper-News-Einträge zu löschen!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Keine randomnews Einträge zu löschen!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Kein Grund"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Kein signierter Kick wenn SIGNKICK LEVEL genutzt wird"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Kein solcher Eintrag (#%d) in der %s AOP-Liste."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Kein solcher Eintrag (#%d) in der %s HOP-Liste."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Kein solcher Eintrag (#%d) in der %s SOP-Liste."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Kein solcher Eintrag (#%d) in der %s VOP-Liste."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Keine"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Der Channel kann nicht betreten werden, da er RESTRICTED ist."
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4588,95 +4299,93 @@ msgstr ""
 "Beachte das jeder Channel der für %d Tage nicht\n"
 "genutzt wird,automatisch auslaufen wird."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Nummer  Limit  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE Nickname Flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "OP Notice"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Das alten Informationen stimmen mit den neuen überein."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Nickname"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Op-notice Option für %s ist jetzt OFF."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Op-notice Option für %s ist jetzt ON."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Oper-News-Eintrag #%d wurde entfernt."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Oper-News-Eintrag #%d nicht gefunden!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper News Einträge:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ          : %6d Einträge, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Operflags %s wurden für %s hinzugefügt. "
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Op-Schutz"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Option %s kann in diesem Netzwerk nicht benutzt werden."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Passcode für %s ist %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Passwort akzeptiert - du bist jetzt angemeldet."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4684,62 +4393,58 @@ msgstr ""
 "Um diesen Befehl nutzen zu können, musst du dich identifizieren.\n"
 "Versuch es erneut nach /msg %s IDENTIFY Passwort."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Passwort für %s wurde auf %s gesetzt."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Passwort für %s wurde geändert."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Passwort von %s ist %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Falsches Passwort."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Das Passwort von %s wurde per eMail verschickt."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Peace"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Peace Option für %s ist jetzt OFF."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Peace Option für %s ist jetzt ON."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr ""
 "Bitte kontaktiere einen IRC Operator, um diesem Nicknamen einen vHost "
 "zuzuweisen."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4748,172 +4453,133 @@ msgstr ""
 "nichts mit deinem Nicknamen zu tun haben. Weiterhin \n"
 "kann keine Leer oder Tabulatortaste enthalten sein."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Benutze bitte einen gültigen hostnamen, wenn du jupiterst"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr ""
 "Verwende bitte nur das Symbol # wenn du versuchst ein\n"
 "Channel zu registrieren."
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Bitte warte noch %d Sekunden und versuche es dann erneut."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Bitte warte %d Sekunden, bevor der GROUP Befehl wieder funktioniert."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Bitte warte %d Sekunden, bevor der REGISTER Befehl wieder funktioniert."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Bitte warte %d Sekunden bevor der RSEND Befehl wieder funktioniert."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Bitte warte %d Sekunden bis du den SEND Befehl wieder benutzen kannst."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Privat"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Private-Mode des Bots im %s ist jetzt OFF."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Private-Mode des Bots im %s ist jetzt ON."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Private Option für %s ist jetzt OFF."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Private Option für %s ist jetzt ON."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Der Privat-Modus (PRIVATE) ist für %s jetzt deaktiviert (OFF)."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Der Privat-Modus (PRIVATE) ist für %s jetzt aktiviert (ON)."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Kill-Schutz"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Schutz des Nicknamens %s ist jetzt deaktiviert (OFF)."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Schutz des Nicknamens %s mit verkürzter Verzögerung aktiviert (ON)."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Schutz des Nicknamens %s ohne Verzögerung aktiviert (ON)."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Schutz des Nicknamens %s ist jetzt aktiviert (ON)."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Kill-Schutz ist jetzt ON, ohne Wartezeit."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Unterstützte Befehle: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [Channel] {Liste | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER Nickname [Passwort]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER Channel Beschreibung"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER Passwort eMail"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER Passwort [eMail]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE Nickname [Password]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {Nickname | Channel} Memo-text"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Randomnews Eintrag #%d gelöscht."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Randomnews Eintrag #%d nicht gefunden!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Random news Einträge:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4921,296 +4587,307 @@ msgstr ""
 "Registrieungs Stufe 1 ist eventuell abgelaufen, bitte nutze zuerst \"/msg %s "
 "register <password> <email>\"."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Eingeschränkter Access"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Eingeschränkter Access Option für %s ist jetzt OFF."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Eingeschränkter Access Option für %s ist jetzt ON."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameter"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY Channel Text"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {Nickname | Channel} Memo-text"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS Nickname"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS Befehl nicht verfügbar, da die Verschlüsselung aktiviert ist."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST Limit"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET Nickname Hostmaske."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET (Channel | Bot) Option Einstellungen"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET Channel NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET Botname PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET Channel Option Parameter"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET Channel DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET Channel DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET Channel FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET Channel GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET Channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET Channel OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET channel NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET Channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET Channel PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET Channel PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET Channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET Channel SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET Channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET Channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET Channel SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET Channel SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET Channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET Channel XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET Option Parameter"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET Option Einstellungen"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE Nummer"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [Channel] Limit"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [User | Channel] {Limit | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL Nickname Hostmaske."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "Die SNLINE-Liste ist leer."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5218,344 +4895,330 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmask | entry-liste}[:"
 "Grund]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"SOP Liste für %s:\n"
-"  Nummer  Nickname"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "SQLINE Liste ist leer."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} "
 "[Grund]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Channel %s ist nicht registriert"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nickname %s ist nicht online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND Channel Grund"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND Channel [Grund]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND Channel Grund"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND Nickname Grund"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK Nickname Neuer-Nickname "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "Die SZLINE-Liste ist leer."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} "
 "[Grund]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Secure"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Secure Founder"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Secure Ops"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Secure Founder Option für %s ist jetzt OFF."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Secure Founder Option für %s ist jetzt ON."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Secure-Ops Option für %s ist jetzt OFF."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Secure-Ops Option für %s ist jetzt ON."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Secure Option für %s ist jetzt OFF."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Secure Option für %s ist jetzt ON."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt deaktiviert (OFF)."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Secure-Modus"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Server gefunden: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Dieser Service ist derzeit deaktiviert, bitte versuche es später nochmal"
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services sind jetzt beim DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Services sind jetzt im Expire Modus."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Services sind jetzt im No Expire Modus."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Services sind jetzt im read-only Modus."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Services sind jetzt im read-write Modus."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Die Services sind jetzt im Debug-Modus (Level %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Die Services sind jetzt im Debug-Modus."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Die Services sind nicht mehr im Debug-Modus."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "eMail-Handling der Services wurde deaktiviert."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Services Ignore-Liste:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Services können die Modi nicht ändern. Ist der Server richtig konfiguriert?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Services können die Modi nicht ändern. Sind die U:lines des\n"
 "Servers richtig konfiguriert?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Services laufen seit %d Tag, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Services laufen seit %d Tagen, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Services laufen seit %d Stunde, %d Minute"
+msgid "Services up %d hours, %d minutes"
+msgstr "Services laufen seit %d Stunden, %d Minuten"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Services laufen seit %d Stunde, %d Minuten"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Services laufen seit %d Minuten, %d Sekunden"
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Services laufen seit %d Stunden, %d Minute"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Services laufen seit %d Stunden, %d Minuten"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Services laufen seit %d Minute, %d Sekunde"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Services laufen seit %d Minute, %d Sekunden"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Services laufen seit %d Minuten, %d Sekunde"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Services laufen seit %d Minuten, %d Sekunden"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/os_stats.cpp:163
+#, c-format
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
+
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr ""
 "Die Services werden %s jetzt nicht mehr automatisch Op-Status geben in den "
 "Channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr ""
 "Die Services werden %s jetzt automatisch Op-Status geben in den Channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Die Services werden jetzt %s mit messages antworten."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Die Services werden jetzt %s mit notices antworten."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Die Konfigurationsdatei wurde neu eingelesen."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Die Services haben den Nicknamen wieder verfügbar gemacht."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Verbindungslimit für %s geändert auf %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Eingeschränkte Verbindungen sind deaktiviert."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Verbindungen      : %6d Einträge, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Verbindungen  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Einstellung %s ist unbekannt.  Tippe /msg %s HELP LEVELS DESC für eine "
 "ausführliche Einstellungsliste."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr ""
 "Die Einstellung von DEBUG kann nur ON, OFF, oder eine positive Zahl sein."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Die Einstellung von IGNORE kann nur ON oder OFF sein."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Die Einstellung von NOEXPIRE kann nur ON oder OFF sein."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "Der Wert für READONLY muss entweder ON oder OFF sein."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr "Super-Admin muss ON oder OFF sein."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Signierte kicks Option für %s ist jetzt OFF."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Signierte kicks Option für %s ist jetzt ON."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5564,209 +5227,181 @@ msgstr ""
 "Signierte kicks Option für %s ist jetzt ON, hängt aber von den\n"
 "Level des Benutzers der den Befehl verwendet ab."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Signierte kicks Option für %s ist jetzt ON."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Signierte kicks"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "RSEND ist auf diesem Netzwerk ausgeschaltet."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Das Zuweisen von Bots ist derzeit deaktiviert."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Erstellung des Bots ist fehlgeschlagen."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Das Verändern von Bot-Einstellungen ist derzeit deaktiviert."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Die SET-Optionen sind derzeit deaktiviert."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Die Channel AOP-Liste kann derzeit nicht geändert werden."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Die Channel HOP-Liste kann derzeit nicht geändert werden."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Die Channel SOP-Liste kann derzeit nicht geändert werden."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Die Channel VOP-Liste kann derzeit nicht geändert werden."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Das Ändern der Channel-Access-Liste wurde zwischenzeitig deaktiviert."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Das Bearbeiten der AutoKick-Liste wurde zwischenzeitlich deaktiviert."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Das Ändern der Bad Words-Liste ist derzeit deaktiviert."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Das Entfernen von Channel-Registrierungen ist derzeit deaktiviert."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "Channel-Optionen sind derzeit deaktiviert."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Die Registrierung von Channels ist derzeit deaktiviert."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Das Passwort für %s konnte nicht geändert werden."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Gruppieren fehlgeschlagen."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Die Identifizierung ist fehlgeschlagen."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Die Konfiguration des Kickers ist derzeit deaktiviert."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "MEMO SET Befehl wurde kurzzeitig deaktiviert."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Der Memo-Versand wurde kurzzeitig deaktiviert."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Das Entfernen von Nicknamen ist derzeit deaktiviert."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Das Gruppieren von Nicknamen ist derzeit deaktiviert."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "Das Ändern der Optionen wurde deaktiviert."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Das Registrieren von Nicknamen ist derzeit deaktiviert."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Registrierung fehlgeschlagen."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Du kannst maximal %d AOP/SOP/VOP Einträge in einem Channel haben."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Die Access-Liste ist auf %d Einträge beschränkt."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Du kannst nur %d Einträge auf der Access-Liste speichern."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Die Access-Liste ist auf %d Einträge beschränkt."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Du kannst nur max. %d Einträge auf der AutoKick-Liste haben."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Du kannst nur %d Einträge in der Bad Words-Liste eines Channels haben."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Du hast bereits das Limit von %d registrierten Channels erreicht."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Du hast bereits %d Channels auf deinen Nicknamen registriert."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statistiken zurückgesetzt."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status aktualisiert (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Hör auf zu flooden!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Hör auf dich dauernd zu wiederholen!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Der Eintrag des Vertreters für %s wurde entfernt."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Vertreter von %s wurde geändert zu %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin muss in der services.conf eingeschaltet werden."
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Symbiosis"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Symbiosis-Mode ist jetzt OFF im %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Symbiosis-Mode ist jetzt ON im %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Syntax: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5794,7 +5429,7 @@ msgstr ""
 "2: Ban in der Form *!*@host\n"
 "3: Ban in der Form *!*user@*.domain"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5807,28 +5442,12 @@ msgstr ""
 "Ändert die Beschreibung für einen Channel, die bei\n"
 "dem LIST und INFO Befehl angezeigt wird."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Syntax: %s Channel ENTRYMSG [Nachricht]\n"
-"\n"
-"Ändert die Nachricht, die User beim Joinen des\n"
-"Channels per /notice bekommen. Wird kein Parameter\n"
-"angegeben, wird keine Nachricht beim Joinen \n"
-"angezeigt."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Syntax: %s Channel FOUNDER Nickname\n"
@@ -5836,7 +5455,7 @@ msgstr ""
 "Ändert den Gründer (Founder) eines Channels. Der neue\n"
 "Nickname muss registriert sein."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5856,77 +5475,7 @@ msgstr ""
 "wiederhergestellt sobald jemand wieder in den Channel \n"
 "kommt."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Syntax: %s Channel MLOCK Modi\n"
-"\n"
-"Stellt den Mode-Lock-Parameter für den angegebenen\n"
-"Channel ein. %S ermöglicht es dir, einzustellen,\n"
-"dass bestimmte Modi immer aus bzw an sein müssen.\n"
-"\n"
-"Die Modes die gelockt werden können sind von dein IRCD abhängig.\n"
-"Jede einzelne dieser Modes kann ein/aus oder gar nicht gelockt werden. \n"
-"Der Modi Parameter ist genauso aufgebaut wie das jeweilige /MODE Befehl. \n"
-"Dies bedeutet, Modi die durch ein + gekennzeichnet sind, sind aktiviert,\n"
-"durch ein - sind sie deaktiviert.\n"
-"\n"
-"Warnung:  Wenn du den Channel mit Hilfe des SET MLOCK\n"
-"Befehls mit einem Key (Passwort) schützt, solltest du\n"
-"zusätzlich die RESTRICTED Option für den Channel ein-\n"
-"schalten (siehe HELP SET RESTRICTED), oder jeder der in\n"
-"diesen Channel kommt wenn er leer ist kann den Key sehen!\n"
-"\n"
-"Beispiele:\n"
-"\n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Erzwingt die Channel-Modi n und t auf an, die i,\n"
-"        k,l,p und s aus. Mode m wird nicht explizit gelockt\n"
-"        und kann wahlweise an oder ausgeschaltet werden.\n"
-"\n"
-"    SET #channel MLOCK +knst-ilmp mein-key\n"
-"        Erzwingt die Modi k, n, s und t an, die Modi i, l, m,\n"
-"        und p aus.  Weiterhin wird der Channel-Key fest auf\n"
-"        \"mein-key\" eingestellt.\n"
-"\n"
-"    SET #channel MLOCK +\n"
-"        Entfernt alle gelockten Channel-Modi, jeder Modus\n"
-"        kann jetzt wahlweise an oder ausgeschaltet werden."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5944,7 +5493,7 @@ msgstr ""
 "Notice an den Channel wenn OP oder DEOP Befehle\n"
 "benutzt werden."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5960,7 +5509,7 @@ msgstr ""
 "mit gleichem oder höherem Zugriffslevel nicht mehr per \n"
 "%S  kicken, bannen oder dessen Channelstatus löschen."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -6005,7 +5554,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -6019,13 +5568,13 @@ msgstr ""
 "oder aus. Wird er aktiviert, wird der Channel in der\n"
 "Ausgabe von/msg %S LIST nicht mehr auftauchen."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Syntax: %s Channel RESTRICTED {ON | OFF}\n"
@@ -6034,7 +5583,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -6054,7 +5603,7 @@ msgstr ""
 "identifiziert sind in den Channel gelassen, so wie es \n"
 "in der Zugriffsliste des Channels steht."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6075,53 +5624,12 @@ msgstr ""
 "per IDENTIFY gegenüber %S als Gründer (Founder) identifiziert\n"
 "hat."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Syntax: %s Channel SECUREOPS {ON | OFF}\n"
-"\n"
-"Ändert die Secure-Ops Option für einen Channel.\n"
-"Wird diese Option eingeschaltet, können Nicknamen, \n"
-"die nicht auf der Zugriffsliste des Channels stehen, \n"
-"keinen Op-Status erhalten."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Syntax: %s Channel SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Aktiviert oder deaktiviert signierte Kicks für einen\n"
-"Channel. Ist SIGNKICK aktiviert, wird der Grund\n"
-"eines Kicks der durch %S KICK ausgeführt wurde, durch\n"
-"den Nicknamen des Kickers signiert.\n"
-"\n"
-"Wird LEVEL benutzt, werden Kicks durch Nicknamen\n"
-"deren Level grösser oder gleich dem SIGNKICK Level ist,\n"
-"nicht durch den Nicknamen signiert.\n"
-"Siehe /msg %S HELP LEVELS für weitere Informationen."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6140,25 +5648,7 @@ msgstr ""
 "\n"
 "Der Nickname des Vertreters muss registriert sein."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Syntax: %s Channel TOPICLOCK {ON | OFF}\n"
-"\n"
-"Aktiviert oder deaktiviert die topic lock-Option\n"
-"für den angegebenen Channel.\n"
-"Wenn topic lock eingeschaltet ist, wird %S jede\n"
-"Änderung des Topics verhindern/rückgängig machen,\n"
-"ausser es wurde durch TOPIC eingestellt."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6202,10 +5692,11 @@ msgstr ""
 "Der Wechsel vom xOP System zum Access System fuktioniert\n"
 "jedoch fehlerfrei."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6218,18 +5709,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6290,7 +5785,7 @@ msgstr ""
 "Durch ACCESS CLEAR werden alle Einträge der\n"
 "Zugriffsliste entfernt."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6340,7 +5835,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "    Zeigt die aktuelle Zugriffsliste an."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6351,12 +5846,18 @@ msgstr ""
 "\n"
 "Bringt den Bot dazu, /me text auf dem angegebenen Channel auszugeben."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6377,15 +5878,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6457,7 +5949,8 @@ msgstr ""
 "Der AKICK CLEAR Befehl entfernt alle Einträge aus\n"
 "Der AutoKick-Liste."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6465,21 +5958,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6550,7 +6043,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR entfernt alle Einträge aus der AKILL-Liste."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6592,7 +6085,7 @@ msgstr ""
 "\n"
 "Channels mit der NOEXPIRE Option sind mit einem Ausrufezeichen markiert."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6610,10 +6103,11 @@ msgstr ""
 "Parametern werden alle Channel aufgelistet, in denen Nickname \n"
 "Zugriffslevel Level oder höher hat."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6687,7 +6181,7 @@ msgstr ""
 "/msg %S HELP SET XOP für Infos über den Wechsel vom XOP und \n"
 "vom Access System."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6702,7 +6196,8 @@ msgstr ""
 "Channel-spezifischen Einstellungen des Bots angepasst \n"
 "werden."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6734,7 +6229,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6775,7 +6270,7 @@ msgstr ""
 "Der BADWORDS CLEAR Befehl löscht alle Einträge aus der\n"
 "Bad-Word-Liste."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6791,7 +6286,7 @@ msgstr ""
 "Standardmässig auf AOPs oder User mit Access Level 5 oder\n"
 "höher beschränkt."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6830,7 +6325,7 @@ msgstr ""
 "der User mit diesem Nicknamen online ist, wird dieser \n"
 "entfernt (gekillt)."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6840,7 +6335,7 @@ msgstr ""
 "\n"
 "Zeigt alle verfügbaren Bots des Netzwerkes."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6853,7 +6348,7 @@ msgstr ""
 "oder Channel gesendet hast, vorrausgesetzt sie ist noch nicht\n"
 "gelesen worden."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6865,7 +6360,7 @@ msgstr ""
 "Es werden die Einträge und komplette reale ident@host für jeden \n"
 "Nickname benutzt, dann wird der AKILL durchgeführt. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6888,7 +6383,7 @@ msgstr ""
 "Parameter SECRET angegeben, werden nur Channel aufgelistet, \n"
 "die Mode +s oder Mode +p gesetzt haben."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6900,70 +6395,32 @@ msgstr ""
 "Überprüft ob deine letzte gesendete Memo an einen Nicknamen gelesen\n"
 "worden ist oder nicht. Der CHECK Befehl funktioniert nicht mit Channels."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Syntax: CLEAR Channel was\n"
-"\n"
-"Sagt %S, dass es bestimmte Einstellungen \n"
-"in einem Channel zurücksetzen soll. Die Option \n"
-"kann eine der folgenden sein:\n"
+"Syntax: DEOWNER #Channel\n"
 "\n"
-"     MODES    Setzt alle Modi in dem Channel zurück.\n"
-"              (z.B. Modi i,k,l,m,n,p,s und t)\n"
-"     BANS     Entfernt alle Bans in dem Channel\n"
-"     EXCEPTS  Entfernt alle Excepts in dem Channel\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Entfernt jeden Operator-Status (mode +o)\n"
-"              in dem Channel. If supported, removes\n"
-"              channel-admin (mode +a) and channel-owner (mode +q)\n"
-"              as well.\n"
-"     HOPS     Entfernt jeden Halfoperator-Status (mode +h) \n"
-"              in den Channel.(Falls dein IRCD es unterstützt).\n"
-"     VOICES   Entfernt alle Voice-Flags (mode +v) in dem Channel.\n"
-"     USERS    Entfernt (kickt) alle User aus dem Channel.\n"
+"Nimmt dir Owner Status im Channel.\n"
 "\n"
-"Standardmässig muss dein Zugriffslevel in diesem Channel\n"
-"mindestens 10 betragen."
+"Benötigt Founder Zugriffslevel im jeweiligen Channel."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Syntax: CLEARMODES Channel [ALL]\n"
-"\n"
-"Entfernt alle Modi und Bans eines Channels. \n"
-"Wird ALL angegeben, werden ebenfalls alle\n"
-"Op-Flags und Voices (+o und +v Modi) entfernt."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6988,7 +6445,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -7000,12 +6457,14 @@ msgstr ""
 "von einschränkungen der Services einzubinden - nützlich während \n"
 "versuchter Angriffe auf das Netzwerk."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -7021,7 +6480,7 @@ msgstr ""
 "um andere zu dehalfoppen, oder Level 4 um dich selbst zu\n"
 "dehalfoppen."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -7030,11 +6489,12 @@ msgstr ""
 "Syntax: DEL Nickname\n"
 "Löscht den vHost des angegebenen Nicknamens."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7067,22 +6527,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Löscht Memos mit den Nummern 2 bis 5 und 7 bis 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntax: DELALL Nickname.\n"
 "Löscht den vHost aller Nicknamen aus der gleichen Gruppe \n"
 "des angegeben Nicknamens."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7096,29 +6559,36 @@ msgstr ""
 "Standardmässig ist dafür ein Level von 5 oder\n"
 "grösser erforderlich."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Syntax: DEOWNER #Channel\n"
+"Syntax: DEOP #Channel [Nickname]\n"
 "\n"
-"Nimmt dir Owner Status im Channel.\n"
+"Entfernt den Operator-Status eines bestimmten Nickname\n"
+"in dem Channel. Wird kein Nickname angegeben, wird ChanServ\n"
+"dich deoppen.\n"
 "\n"
-"Benötigt Founder Zugriffslevel im jeweiligen Channel."
+"Standardmässig ist dafür ein Level von 5 oder\n"
+"grösser erforderlich."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Syntax: DEPROTECT #Channel [Nickname]\n"
 "\n"
@@ -7130,12 +6600,14 @@ msgstr ""
 "aufrufen oder von denjenigen mit Level 10 und grösser,\n"
 "die den Schutz von sich selbst aufheben wollen."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7150,7 +6622,7 @@ msgstr ""
 "um andere zu devoicen, oder Level 3 um dich selbst\n"
 "vom Voice-Flag zu befreien."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7162,7 +6634,7 @@ msgstr ""
 "Entfernt die Registrierung des angegebenen Channels.\n"
 "Kann nur vom Channel-Founder benutzt werden."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7179,9 +6651,10 @@ msgstr ""
 "(löschen) ohne sich vorher gegenüber dem Channel als \n"
 "Founder zu identifizieren."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7189,6 +6662,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7208,7 +6685,7 @@ msgstr ""
 "dich vorher mit deinem Passwort identifizieren. \n"
 "Tippe : /msg %S HELP IDENTIFY für weitere Informationen"
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7230,8 +6707,8 @@ msgstr ""
 "von der Datenbank entfernt. Du kannst jeden Nickname \n"
 "in deiner Gruppe ohne bestimmte Privilegien entfernen."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7242,7 +6719,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7264,7 +6741,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7320,7 +6797,7 @@ msgstr ""
 "weit treffende Einträge in der Liste der Verbindungs-\n"
 "einschränkungen senken die Performance der Services."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7339,7 +6816,7 @@ msgstr ""
 "Bei einigen Netzen muss evtl ein Grund angegeben\n"
 "werden."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7357,7 +6834,7 @@ msgstr ""
 "In bestimmten Netzen wird ein Grund für das\n"
 "Verbot benötigt."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7371,7 +6848,7 @@ msgstr ""
 "verwenden kannst. Immer, wenn dieser Befehl benutzt wird, wird\n"
 "eine Nachricht mit dem Nickname der Person mitgeloggt."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7381,16 +6858,15 @@ msgstr ""
 "\n"
 "Liefert den Key des angegebenen Channels zurück."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Syntax: GETPASS Nickname\n"
 "\n"
@@ -7403,14 +6879,14 @@ msgstr ""
 "Dieser Befehl ist nicht verfügbar bei aktivierter\n"
 "Verschlüsselung."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7435,7 +6911,7 @@ msgstr ""
 "in der Gruppe des Nicknamens sein.Weiterhin musst \n"
 "du das richtige Passwort für den Nickname haben."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7445,7 +6921,7 @@ msgstr ""
 "\n"
 "Zeigt alle Nicknamen die in deiner Gruppe enthalten sind.\t"
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7464,7 +6940,7 @@ msgstr ""
 "Ansonsten werden alle Nicknamen, die in der Gruppe des\n"
 "angegebenen Nicknamens sind, aufgelistet."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7478,7 +6954,7 @@ msgstr ""
 "dem Netzwerk zu senden. Die Nachricht wird als\n"
 "Absender %s tragen."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7491,7 +6967,7 @@ msgstr ""
 "Dieser Befehl erlaubt es Usern, den vHost ihres aktuellen\n"
 "Nicknamens, zum vHost der gesamten Gruppe zu setzen."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7559,16 +7035,17 @@ msgstr ""
 "Achtung: Alle Mitglieder einer Gruppe haben dasselbe\n"
 "Passwort."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Syntax: HALFOP #Channel [Nickname]\n"
 "\n"
@@ -7580,10 +7057,11 @@ msgstr ""
 "um andere zu halfoppen, oder Level 4 um dich selbst zu\n"
 "halfoppen."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7652,7 +7130,7 @@ msgstr ""
 "/msg %S HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7672,9 +7150,20 @@ msgstr ""
 "Registrierung, die du mit dem REGISTER Befehl \n"
 "gesetzt hast."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7708,7 +7197,7 @@ msgstr ""
 "\n"
 "Ignores werden nicht bei IRC Operatoren erzwungen."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7728,7 +7217,7 @@ msgstr ""
 "ALL angibst, wird die Begrüssungsnachricht und \n"
 "die Successors (Vertreter) ebenfalls angezeigt."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7746,7 +7235,7 @@ msgstr ""
 "benutzt, werden alle Informationen angezeigt.\n"
 "(Egal ob sie versteckt sind oder nicht.)"
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7762,7 +7251,7 @@ msgstr ""
 "du max. empfangen kannst. Mit angegebenem Parameter\n"
 "wird die gleiche Information über den Channel angezeigt."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7790,7 +7279,7 @@ msgstr ""
 "Informationen über den Nicknamen angezeigt. Diese\n"
 "Funktion ist beschränkt auf Services Administratoren."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7809,12 +7298,12 @@ msgstr ""
 "Parameter ein Botnick ist, werden Informationen wie \n"
 "Erstellungsdatum oder Anzahl der Channels angezeigt."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7827,14 +7316,15 @@ msgstr ""
 "Zugriffsliste des Channels einen Level grösser 5 \n"
 "(oder INVITE) hat."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7849,7 +7339,7 @@ msgstr ""
 "wird dieser im Server Informationsfeld angezeigt,\n"
 "ansonsten nur \"Jupitered by <nick>\"."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7865,7 +7355,7 @@ msgstr ""
 "Standardmässig ist für diese Funktion ein Level\n"
 "von mindestens 5 erforderlich."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7891,7 +7381,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7913,12 +7403,14 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7958,14 +7450,14 @@ msgstr ""
 "Achtung: Die Berechtigungsstufen für diesen Befehl\n"
 "können variieren!"
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7980,7 +7472,25 @@ msgstr ""
 "\n"
 "*** SpamMan has been kicked off channel #my_channel by %S (chemical (Flood))"
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7999,7 +7509,7 @@ msgstr ""
 "bevor er einen Ban bekommt. Wenn keine ttb \n"
 "angegeben wird, wird er nie gebannt."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -8030,7 +7540,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -8049,7 +7559,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -8074,7 +7584,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8090,7 +7600,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8110,7 +7620,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8129,8 +7639,8 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8140,17 +7650,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8181,7 +7691,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8206,7 +7716,7 @@ msgstr ""
 "festes Limit für die Anzahl der dem Operator anzuzeigenden \n"
 "Einträge."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8224,7 +7734,7 @@ msgstr ""
 "numerischen Bereich angibt, Channelnamen müssen\n"
 "ohne '#' angegeben werden."
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8265,7 +7775,8 @@ msgstr ""
 "    LIST *!*@*.bar.org\n"
 "    Listet alle Nicknamen von Usern in der bar.org Domain."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8293,7 +7804,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Syntax: LIST Muster [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8327,13 +7837,14 @@ msgstr ""
 "        Zeigt alle registrierten Nicknamen an, die das NOEXPIRE\n"
 "        Flag gesetzt haben."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8349,11 +7860,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Zeigt Memos mit den Nummern 2 bis 5 und 7 bis 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Syntax: LOGONNEWS ADD Text"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8382,11 +7893,11 @@ msgstr ""
 "\n"
 "Diese Funktion ist beschr?nkt auf die Services Administartoren."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Syntax: LOGONNEWS DEL {Nummer | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8402,7 +7913,7 @@ msgstr ""
 "den Besitzer des Nicknamens. Beachte jedoch, dass du \n"
 "nicht mehr gewarnt wirst, dich erneut zu identifizieren."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8430,12 +7941,13 @@ msgstr ""
 "\n"
 "Diese Funktion ist beschränkt auf die Services Administartoren."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Syntax: MODE Channel Modi\n"
@@ -8444,7 +7956,34 @@ msgstr ""
 "beliebigen Channels zu verändern. Der Paramater hat das\n"
 "gleiche Format wie der normale /MODE Befehl."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8454,7 +7993,7 @@ msgstr ""
 "Dieser Befehl listet Informationen über das benannte, geladene \n"
 "Module auf."
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8463,7 +8002,7 @@ msgstr ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Listet alle derzeit geladenen Module auf."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8474,7 +8013,7 @@ msgstr ""
 "Dieser Befehl lädt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8485,7 +8024,7 @@ msgstr ""
 "Dieser Befehl lädt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8496,10 +8035,12 @@ msgstr ""
 "Dieser Befehl entfernt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8524,7 +8065,7 @@ msgstr ""
 "Achtung: Der Server wird in keinster Weise\n"
 "von den Services geprüft."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8537,7 +8078,7 @@ msgstr ""
 "ein /whois auf dich anwendet, deine echte IP Adresse\n"
 "sehen."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8552,7 +8093,7 @@ msgstr ""
 "werden. Um alle Operflags zu entfernen, nutze einfach ein \n"
 "\"-\" ohne Operflags."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8564,12 +8105,14 @@ msgstr ""
 "Wenn du diesen Befehl benutzt, wird jeder User, der ein /whois\n"
 "auf dich anwendet, diesen vHost anstatt deiner Host sehen."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8583,11 +8126,11 @@ msgstr ""
 "Standardmässig ist dafür ein Level von 5 oder\n"
 "grösser erforderlich."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Syntax: OPERNEWS ADD Text"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8617,30 +8160,38 @@ msgstr ""
 "\n"
 " Diese Funktion ist beschr?nkt auf die Services Administartoren."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Syntax: OPERNEWS DEL {Nummer | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Syntax: OWNER #Channel\n"
+"Syntax: OP Channel [Nickname]\n"
 "\n"
-"Gibt dir Owner Status im Channel.\n"
+"Setzt den Operator-Status des angegebenen Nicknamen \n"
+"in dem Channel. If nick is not given,\n"
+"it will op you.\n"
 "\n"
-"Benötigt Founder Zugriffslevel im jeweiligen Channel."
+"Standardmässig ist dafür ein Level von 5 oder\n"
+"grösser erforderlich."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8654,10 +8205,11 @@ msgstr ""
 "aufrufen oder von denjenigen mit Level 10 und grösser, \n"
 "die den Schutz auf sich selbst anwenden."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8730,7 +8282,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8749,11 +8301,11 @@ msgstr ""
 "werden. Für das normale Beenden der Services sollte\n"
 "der SHUTDOWN Befehl benutzt werden."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Syntax: RANDOMNEWS ADD Text"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8775,18 +8327,19 @@ msgstr ""
 "\n"
 "Diese Funktion ist beschr?nkt auf die Services Administartoren."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Syntax: RANDOMNEWS DEL {Nummer | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8806,7 +8359,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Zeigt den Inhalt der Memos 2 bis 5 und 7 bis 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8858,7 +8411,8 @@ msgstr ""
 "oder in dessen Gruppe sein. Als dritte Möglichkeit\n"
 "kannst du das Passwort für den Nicknamen angeben."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8869,7 +8423,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8900,24 +8454,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8974,15 +8529,15 @@ msgstr ""
 "Channel-Privilegien bekommen. Für weitere Informationen\n"
 "über diese Funktion tippe /msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -9004,7 +8559,7 @@ msgstr ""
 "Nicknamens oder in der Gruppe des Nicknamen sein. Weiterhin \n"
 "musst du das richtige Passwort für den Nicknamen haben."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -9020,7 +8575,7 @@ msgstr ""
 "sie wirksam zu machen (so wie die Services Nicknamen,\n"
 "Aktivierung der Verbindungseinschränkungen, etc.)"
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -9033,7 +8588,7 @@ msgstr ""
 "(auch Passcode genannt) erneut an die gespeicherte Emailadresse\n"
 "des Users, sobald der User ihn ausführt."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -9044,7 +8599,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -9057,13 +8612,14 @@ msgstr ""
 "die Datenbanken speichern, und danach neustarten\n"
 "(die ausführbare Datei erneut aufrufen).\t"
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -9079,23 +8635,25 @@ msgstr ""
 "bekommst du eine Auto-Memo die dich Informirmiert\n"
 "das der / die jenige dein Memo-Text gelesen hat."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Setzt verschiedene Einstellungen für den Nicknamen.  Gültig für option ist:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -9104,7 +8662,7 @@ msgstr ""
 "angegebenen Nicknamen automatisch Op-Status zu geben,\n"
 "wenn der Nick die Channels betritt."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9117,7 +8675,7 @@ msgstr ""
 "angezeigt wird. Der neue Ursprung muss ein Nickname der \n"
 "entsprechenden Gruppe sein."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9128,7 +8686,7 @@ msgstr ""
 "Verknüpft die angegeben Emailadresse mit dem\n"
 "Nicknamen."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9145,7 +8703,7 @@ msgstr ""
 "ist. Vorraussetzung ist, dass der Benutzer die entsprechenden\n"
 "Rechte besitzt."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9168,22 +8726,22 @@ msgstr ""
 "Der zweite Parameter bestimmt, ob die Information angezeigt\n"
 "werden soll (OFF) oder nicht (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9203,7 +8761,7 @@ msgstr ""
 "Ausserdem ist es möglich, dass die Netz-Admins\n"
 "diese Option deaktiviert haben."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9221,7 +8779,7 @@ msgstr ""
 "Die Nummer sollte aus der Liste der unterstützten Sprachen gewählt \n"
 "werden, die man mit tippen des Befehls /msg %S HELP SET LANGUAGE bekommt."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9237,7 +8795,7 @@ msgstr ""
 "(Queries), ansonsten werden die Antworten als Notices\n"
 "geschickt (Standard)."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9250,18 +8808,19 @@ msgstr ""
 "verfällt. Wird NOEXPIRE auf ON gesetzt verfällt\n"
 "der Nickname nie."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Ändert das Passwort um sich als Besitzer eines Nicknamens\n"
 "zu identifizieren."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9283,16 +8842,16 @@ msgstr ""
 "dem INFO Befehl Informationen über den Nicknamen \n"
 "abrufen, unabhängig vom Privat-Modus.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9307,7 +8866,7 @@ msgstr ""
 "fehlender Identifizierung den Nicknamen nicht killen\n"
 "(ist von der KILL Option unabhängig)."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9317,13 +8876,14 @@ msgstr ""
 "\n"
 "Der Bot sagt den eingegebenen Text auf dem angegebenen Channel."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Syntax: SEND {Nickname | Channel} Memo-Text\n"
@@ -9334,16 +8894,18 @@ msgstr ""
 "er/sie eine neue Memo hat.\n"
 "Der Empfänger (Nickname/Channel) muss registriert sein."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Syntax: SENDALL Memo-Text\n"
 "Sendet allen registrieten Usern eine Nachricht mit dem \n"
 "Memo-Text."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9363,7 +8925,7 @@ msgstr ""
 "Kann in manchen Netzen auf IRC Operatoren begrenzt\n"
 "sein."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9400,7 +8962,7 @@ msgstr ""
 "Siehe die Hilfe zu EXCEPTION um weitere Informationen\n"
 "über das Einschränken von Verbindungen zu erhalten."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9414,7 +8976,68 @@ msgstr ""
 "du mit SET <nickname> <ident>@<hostmaske> auch eine Ident\n"
 "wie einen vHost setzen."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Syntax: %s Channel SECUREOPS {ON | OFF}\n"
+"\n"
+"Ändert die Secure-Ops Option für einen Channel.\n"
+"Wird diese Option eingeschaltet, können Nicknamen, \n"
+"die nicht auf der Zugriffsliste des Channels stehen, \n"
+"keinen Op-Status erhalten."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Syntax: %s Channel SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Aktiviert oder deaktiviert signierte Kicks für einen\n"
+"Channel. Ist SIGNKICK aktiviert, wird der Grund\n"
+"eines Kicks der durch %S KICK ausgeführt wurde, durch\n"
+"den Nicknamen des Kickers signiert.\n"
+"\n"
+"Wird LEVEL benutzt, werden Kicks durch Nicknamen\n"
+"deren Level grösser oder gleich dem SIGNKICK Level ist,\n"
+"nicht durch den Nicknamen signiert.\n"
+"Siehe /msg %S HELP LEVELS für weitere Informationen."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Syntax: %s Channel TOPICLOCK {ON | OFF}\n"
+"\n"
+"Aktiviert oder deaktiviert die topic lock-Option\n"
+"für den angegebenen Channel.\n"
+"Wenn topic lock eingeschaltet ist, wird %S jede\n"
+"Änderung des Topics verhindern/rückgängig machen,\n"
+"ausser es wurde durch TOPIC eingestellt."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9425,6 +9048,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9450,7 +9074,7 @@ msgstr ""
 "Achtung: Die Berechtigungsstufen für diesen Befehl\n"
 "können variieren!"
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9461,7 +9085,7 @@ msgstr ""
 "Verhindert, das der Bot durch Nicht-IRC Operatoren\n"
 "assigned werden kann."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9477,7 +9101,7 @@ msgstr ""
 "\n"
 "Verfügbare Optionen:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9492,7 +9116,7 @@ msgstr ""
 "Bot gekickt, auch wenn sie nicht das NOKICK-Level\n"
 "haben."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9507,7 +9131,7 @@ msgstr ""
 "User mit voice (+v) vom Bot nicht gekickt, auch \n"
 "wenn sie nicht das NOKICK-Level haben."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9540,7 +9164,7 @@ msgstr ""
 "Kommando ausführen könnte. (Beispiel: Jemand, \n"
 "der kein Op ist, kann auch niemanden mit !op oppen.)"
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9557,7 +9181,22 @@ msgstr ""
 "Msg definiert haben und weiterhin auch die \n"
 "Berechtigung haben, dass diese angezeigt wird."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9572,7 +9211,7 @@ msgstr ""
 "Option gewählt wird, bereits ein Bot zugewiesen \n"
 "sein, so verfällt die Zuweisung."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9585,7 +9224,7 @@ msgstr ""
 "auf ON gestellt, wird der Channel bei Nichtnutzung\n"
 "nicht auslaufen."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9602,26 +9241,17 @@ msgstr ""
 "die sonst %s übernimmt. \n"
 "(Modechanges, Kicks, Begrüssungsnachrichten usw.)"
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Syntax: SET Option Parameter\n"
-"\n"
-"Stellt verschiedene Optionen zu deinem Nicknamen ein.\n"
-"Option kann eines der folgenden Werte sein:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9640,7 +9270,18 @@ msgstr ""
 "Tippe: /msg %S HELP SET Option für weitere Informationen\n"
 "über eine bestimmte Option."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Syntax: SET Option Parameter\n"
+"\n"
+"Stellt verschiedene Optionen zu deinem Nicknamen ein.\n"
+"Option kann eines der folgenden Werte sein:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9650,7 +9291,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Syntax: SET Option Einstellungen\n"
@@ -9668,7 +9308,7 @@ msgstr ""
 "    IGNORE     Ignore-Modus an oder aus\n"
 "    LIST       Optionen-Liste"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9681,30 +9321,7 @@ msgstr ""
 "erlaubt es ChanServ Dir automatisch Op-Status zu geben,\n"
 "wenn Du die Channels betrittst."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Syntax: SET DEBUG {ON | OFF | Nummer}\n"
-"\n"
-"Schaltet den Debug-Modus an oder aus. Wird der aktiviert,\n"
-"werden alle Daten von/an die Services gesendet werden\n"
-"(und ein paar anderen Debug-Meldungen) in ein Logfile\n"
-"geschrieben. Wird Nummer angegeben, wird der Debugging\n"
-"Level auf Nummer gesetzt.\n"
-"\n"
-"Diese Option ist äquivalent mit der Befehlszeilen-\n"
-"Option -debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9721,7 +9338,7 @@ msgstr ""
 "des einzelnen Nicks, er wird nur als \"Ursprung\" der \n"
 "Gruppe in der Liste aufgeführt."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9736,7 +9353,7 @@ msgstr ""
 "Informationen über deinen Nicknamen mit dem INFO \n"
 "Befehl anfordert."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9753,7 +9370,7 @@ msgstr ""
 "du hast den nötigen Zugriffslevel in der Access-Liste\n"
 "des Channels. \t"
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9777,18 +9394,8 @@ msgstr ""
 "Der zweite Parameter bestimmt, ob die Information angezeigt\n"
 "werden soll (OFF) oder nicht (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Mit diese Einstellung kannst du  Anope's IGNORE-System \n"
-"an oder aus machen."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9802,7 +9409,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9822,7 +9429,7 @@ msgstr ""
 "Ausserdem ist es möglich, dass die Netz-Admins\n"
 "diese Option deaktiviert haben."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9841,7 +9448,7 @@ msgstr ""
 "Nummer muss von der folgenden Liste der unter-\n"
 "stützten Sprachen ausgewählt werden: "
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9858,7 +9465,7 @@ msgstr ""
 "0 gesetzt, kann dir niemand mehr Memos senden.\n"
 "Du kannst es jedoch auch nicht höher als %d setzen."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9904,7 +9511,7 @@ msgstr ""
 "kann auch nicht die Grenze von %d Memos überschreiten.\n"
 "Der HARD Befehl kann er auch nicht nutzen."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9913,7 +9520,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Zeigt dir eine Liste der verfügbaren Einstellungen von %S"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9929,10 +9536,11 @@ msgstr ""
 "(Queries), ansonsten werden dir die Antworten als Notices\n"
 "geschickt (Standard)."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9947,7 +9555,7 @@ msgstr ""
 "Diese Option ist äquivalent mit der Befehlszeilen-\n"
 "Option -noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9987,7 +9595,7 @@ msgstr ""
 "\n"
 "ON ist eine Kombination aus LOGON und NEW."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9999,7 +9607,7 @@ msgstr ""
 "Ändert das Passwort, mit dem du dich als Besitzer des\n"
 "Nicknamen identifizierst."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -10021,7 +9629,7 @@ msgstr ""
 "dem INFO Befehl Informationen über deinen Nicknamen \n"
 "abrufen, unabhängig vom Privat-Modus.)"
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -10052,16 +9660,16 @@ msgstr ""
 "Diese Option ist äquivalent mit der Befehlszeilen-\n"
 "Option -readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -10076,7 +9684,7 @@ msgstr ""
 "fehlender Identifizierung den Nicknamen nicht killen\n"
 "(ist von der KILL Option unabhängig)."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -10091,14 +9699,15 @@ msgstr ""
 "werden, wenn er wirklich gebraucht wird. Danach sollte er\n"
 "sofort wieder ausgeschaltet werden."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Syntax: SETALL Nickname Hostmaske.\n"
@@ -10109,7 +9718,7 @@ msgstr ""
 "* Anmerkung: Dieser Befehl betrifft keine Nicknamen,\n"
 "die nachträglich zu der Gruppe hinzugefügt wurden."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -10120,10 +9729,11 @@ msgstr ""
 "Die Services werden durch dieses Befehl normal\n"
 "beendet und die Datenbanken werden gespeichert."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10159,7 +9769,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10220,10 +9830,11 @@ msgstr ""
 "SNLINE CLEAR entfernt alle Einträge aus der \n"
 "SNLINE-Liste."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10295,7 +9906,8 @@ msgstr ""
 "/msg %S HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10311,31 +9923,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10387,21 +9999,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR löscht alle Einträge der SQLINE Liste."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10411,16 +10009,18 @@ msgstr ""
 "Zeigt alle Nicknamen, die Zugriff auf die Services haben samt Level \n"
 "und Online-Status."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Syntax: STAFF Memo-Text\n"
 "Sendet allen Usern mit Zugriff auf die Services eine Nachricht mit\n"
 "dem Memo-Text."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10467,7 +10067,7 @@ msgstr ""
 "gesetzt, unter anderem die max. Anzahl gleichzeitig\n"
 "verbundenen User."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10492,12 +10092,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR error-message"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10538,7 +10139,7 @@ msgstr ""
 "der Rest wird ignoriert. Wenn kein Nickname angegeben wird,\n"
 "wird dein STATUS angezeigt."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10557,7 +10158,7 @@ msgstr ""
 "\n"
 "Ein Grund kann auf manchen Netzwerke notwendig sein."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10567,7 +10168,8 @@ msgstr ""
 "\n"
 "Erzwingt die Änderung des Nicknamens eines User zu dem neuen Nicknamen."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10580,31 +10182,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10661,7 +10263,7 @@ msgstr ""
 "\n"
 "SZLINE CLEAR entfernt alle Einträge aus der SZLINE-Liste."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10684,7 +10286,7 @@ msgstr ""
 "\n"
 "Standardmässig auf Founder (Gründer) beschränkt. "
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10698,7 +10300,7 @@ msgstr ""
 "beliebigen Users zu ändern. Der Paramater hat das gleiche \n"
 "Format wie der normale /MODE Befehl."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10717,7 +10319,7 @@ msgstr ""
 "Channel wieder zugewiesen werden kann, ohne das \n"
 "alle Einstellungen verloren gehen."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10736,7 +10338,7 @@ msgstr ""
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10753,7 +10355,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10766,7 +10368,7 @@ msgstr ""
 "wieder frei. Alle vorherigen Einstellungen werden\n"
 "übernommen."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10778,7 +10380,7 @@ msgstr ""
 "Erzwingt die Services, sofort alle Datenbanken auf der\n"
 "Festplatte zu aktualisieren."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10802,12 +10404,14 @@ msgstr ""
 "zusätzlich INVISIBLE angegeben, werden nur User mit dem Flag\n"
 "+i angezeigt."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10823,10 +10427,11 @@ msgstr ""
 "um anderen Voice zu erteilen, oder Level 3 um dich\n"
 "selbst zu voicen."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10890,7 +10495,7 @@ msgstr ""
 "/msg %S HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10906,7 +10511,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10914,7 +10519,7 @@ msgstr ""
 "Syntax: SUSPEND Nickname Grund\n"
 "SUSPEND verhindert das der angegebene Nickname sich identifizieren kann."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10922,7 +10527,7 @@ msgstr ""
 "Syntax: UNSUSPEND Nickname\n"
 "Gibt einen Nicknamen der SUSPENDED ist wieder frei."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10934,54 +10539,55 @@ msgstr ""
 "setzt benötigte Channel-Modes (ModeonID), aktualisiert deinen vHost und\n"
 "deine userflags (lastseentime, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC Channel [Topic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "Die IMMED Option ist in diesem Netzwerk nicht verfügbar."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "Die AKILL-Liste wurde geleert."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Das Defcon-Level ist jetzt auf Level: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "Die Emailadresse %s wird jetzt bei %s INFO Abrufen versteckt."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "Die Emailadresse %s wird jetzt bei %s INFO Abrufen angezeigt."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "Die SNLINE-Liste wurde geleert."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "Die SQLINE-Liste wurde geleert."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "Die SZLINE-Liste wurde geleert."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Der Channel %s hat keinen Schlüßel."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Die folgenden Befehle/Funktionen werden unterstützt. \n"
@@ -10989,37 +10595,37 @@ msgstr ""
 "AUTODEOP und NOJOIN Maximum-Levels sind, alle anderen\n"
 "hingegegen sind Minimum-Level."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Der Host %s hat momentan %d Verbindungen und ein Limit von %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr ""
 "Die letzte Memo die du zu %s gesendet hast (gesendet am %s) wurde gelesen."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Die letzte Memo die du zu %s gesendet hast (gesendet am %s) wurde nicht "
 "gelesen."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Die letzte Quit-Nachricht von %s wird jetzt bei %s INFO Abrufen versteckt."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 "Die letzte Quit-Nachricht von %s wird jetzt bei %s INFO Abrufen angezeigt."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
@@ -11027,7 +10633,7 @@ msgstr ""
 "Die letzte bekannte user@host Maske von %s wird jetzt bei %s INFO Abrufen "
 "versteckt."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
@@ -11035,34 +10641,34 @@ msgstr ""
 "Die letzte bekannte user@host Maske von %s wird jetzt bei %s INFO Abrufen "
 "angezeigt."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Du hast keine Berechtigung das Memo-Limit für %s zu ändern."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr ""
 "Der für %s angezeigte Ursprung muss ein Nickname aus der zugehörigen Gruppe "
 "sein!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Der neue \"Anführer\" deiner Gruppe ist jetzt %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Der Nickname %s wird jetzt zu %s geändert."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
@@ -11070,19 +10676,19 @@ msgstr ""
 "Die Services-Zugriffsberechtigungen von %s werden jetzt bei %s INFO Abrufen "
 "versteckt."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Die Services-Zugriffsberechtigungen von %s werden jetzt bei %s INFO Abrufen "
 "angezeigt."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Es gibt %d benachrichtigungen für den Channel %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -11090,7 +10696,7 @@ msgstr ""
 "Es sind derzeit keine Bots verfügbar. Frag einen \n"
 "Services Administrator, ob er einen erstellt."
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -11100,12 +10706,12 @@ msgstr ""
 "davon.\n"
 "Tippe /msg %s HELP GLIST und /msg %s HELP DROP für weitere Infos."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Es gibt %d Benachrichtigung für Channel %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -11113,28 +10719,28 @@ msgstr ""
 "Es gibt eine neue Nachricht für Channel %s.\n"
 "Tippe /msg %s READ %s %d um sie zu lesen."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Der Bot von %s wurde entfernt."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Es gibt keine Logon News."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Es gibt keine Oper-News."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Keine randomnews vorhanden."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Du hast keine zulässige Email Adresse gesetzt."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -11151,32 +10757,28 @@ msgstr ""
 "    PRIVATE        Verhindert das Bots von Nicht-IRC Operatoren\n"
 "                   assigned werden können."
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Dieser Channel wurde verboten."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Dieser Channel wurde registriert von %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Dieser Channel wurde auf SUSPENDED gesetzt."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Dieser Channel kann nicht benutzt werden."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Dieser Channel wird nicht auslaufen."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "Modul KANN NICHT entfernt werden."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -11184,7 +10786,7 @@ msgstr ""
 "Dieser Nickname wurde bereits angefordert, bitte prüfe deinen Email Account "
 "für das Passwort."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -11192,7 +10794,7 @@ msgstr ""
 "Dieser Nickname benötigt das Email Bestätigungs Passwort vor Abschluß der "
 "Registrierung."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11200,20 +10802,20 @@ msgstr ""
 "Dieser Nickname gehört schon jemand anderem. Bitte wähle einen anderen.\n"
 "(Sollte dieser Nickname dir gehören, tippe /msg %s IDENTIFY Passwort.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Dieser Nickname ist registriert, du kannst ihn nicht benutzen."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Dieser Nickname ist zur Zeit gesperrt"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Dieser Nickname ist zur Zeit gesperrt, Grund: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11223,15 +10825,15 @@ msgstr ""
 "ist, tippe /msg %s IDENTIFY Passwort. Ansonsten wähle bitte\n"
 "einen anderen Nickname."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Dieser Nickname kann nicht benutzt werden. Bitte wähle einen anderen."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Dieser Nickname wird nicht auslaufen."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11239,44 +10841,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Topic-Sperre"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Topic-Wiederherstellung"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Topic-Sperre Option für %s ist jetzt OFF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Topic-Sperre Option für %s ist jetzt ON."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Die Topic-Beibehaltung für %s ist jetzt deaktiviert (OFF)."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Die Topic-Beibehaltung für %s ist jetzt aktiviert (ON)."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Schalte Caps-Lock aus!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Tippe: /msg %S HELP Befehl für hilfe bei jedem der\n"
@@ -11286,7 +10879,7 @@ msgstr ""
 "    Channel-Nachrichten lesen. Dies kann mit dem\n"
 "    %s LEVELS Befehl geändert werden."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11298,7 +10891,7 @@ msgstr ""
 "\n"
 "Die Befehle sind nur für Services Admins verfügbar."
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11306,7 +10899,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11314,7 +10907,7 @@ msgstr ""
 "Tippe /msg %S HELP Option für weitere Informationen\n"
 "zu einem bestimmten Befehl."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11326,128 +10919,109 @@ msgstr ""
 "nicht \n"
 "zugänglich."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr ""
 "Tippe /msg %s LIST NEW um eine Auflistung deiner neuen Memos zu erhalten."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Tippe /msg %s READ %d um sie zu lesen."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Tippe /msg %s READ LAST um sie zu lesen."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE Nickname Modi"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN channel"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN Channel [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND Channel"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND Nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Kann Modul %s nicht laden"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Kann Modul %s nicht entfernen"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Ubekannte SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Unbekannte SET Option %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Unbekannte STATS Option %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Unbekannter Befehl %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Unbekannter Befehl %s.  \"/msg %s HELP\" für Hilfe."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Unbekanntes Mode-Zeichen: %c wurde ignoriert."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Unbekannte Option %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Unbekannte Option %s.\n"
-"Tippe /msg %S HELP KICK für weitere Informationen."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Unbekannte Option %s.\n"
 "Tippe /msg %S HELP SET für weitere Informationen."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Datenbanken wurden aktualisiert."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink-Fähigkeiten: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink Server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "User %s wurde nicht in der NickServ Datenbank gefunden."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "User              : %6d Einträge, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11456,11 +11030,11 @@ msgstr ""
 "Tippe:\n"
 "/msg %s RELEASE %s ein, um ihn vor dem %s-Timeout zurückzubekommen."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "User stimmt mit Channel Exception überein."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11468,66 +11042,78 @@ msgstr ""
 "User-Liste:\n"
 "Nickname                 Maske"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Voice-Schutz"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"VOP Liste für %s:\n"
-"  Nummer  Nickname"
+"Warnung: Du hast die maximale Anzahl gespeicherter Memos überschritten (%d). "
+"Du kannst keine weiteren Memos empfangen, bis du einige deiner jetzigen "
+"Memos gelöscht hast."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Voice-Schutz"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Warnung: Du hast die maximale Anzahl gespeicherter Memos erreicht (%d). Du "
+"kannst keine weiteren Nachrichten empfangen, bis du einige deiner jetzigen "
+"Memos gelöscht hast."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Pass bitte auf was du sagst!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Du bist bereits Mitglied der Gruppe %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Du bist bereits angemeldet."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Du bist jetzt kein Super-Admin mehr."
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Dir ist es nicht erlaubt, diesen Channel zu betreten."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Du hast keine Berechtigung dein Memo-Limit zu ändern."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Du bist jetzt ein Super-Admin."
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Du bist jetzt ein IRC Operator."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11535,38 +11121,45 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Du bist jetzt in der Gruppe %s vertreten."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Das Erhalten von Empfangsbestätigungen ist nur beim Senden\n"
 "einer Memo an andere User möglich."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Du kannst dich doch nicht selber ghosten!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr ""
+"Ausloggen von %s nicht möglich, da es sich um einen Services Administrator "
+"handelt."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Du kannst dich nicht selber recovern!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11576,7 +11169,7 @@ msgstr ""
 "Nutze stattdessen die AOP, SOP und VOP Befehle.\n"
 "Tippe /msg %s HELP Befehl für weitere Informationen."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11586,7 +11179,7 @@ msgstr ""
 "Nutze stattdessen die AOP, SOP, HOP und VOP Befehle.\n"
 "Tippe /msg %s HELP Befehl für weitere Informationen."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11594,66 +11187,66 @@ msgstr ""
 "Du kannst diesen Befehl nicht benutzen. Benutze Stattdessen ACCESS.\n"
 "Tippe /msg %s HELP ACCESS für weitere Informationen."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Du kannst das Memo-Limit für %s nicht höher als %d setzen."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Du kannst dein Memo-Limit nicht höher als %d setzen."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Du kannst in diesem Netzwerk deine eMail-Adresse nicht entfernen."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Du hast insgesamt %d Memos, davon sind %d ungelesen."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Du hast insgesamt %d Memos, davon ist eine ungelesen."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Du hast %d Memos."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Du hast insgesamt %d Memos, alle davon sind ungelesen."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Du hast derzeit eine ungelesene Memo."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Du hast eine neue Memo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Du hast keine Memos."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Du hast %d neue Memos."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Du hast eine neue Memo."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11661,33 +11254,37 @@ msgstr ""
 "Du hast eine neue Nachricht von %s empfangen.\n"
 "Tippe /msg %s READ %d um sie zu lesen."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Dein Ban in %s wurde entfernt."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Du hast kein Limit in der Anzahl deiner Memos."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Du hast keine Memos."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Du hast keine neuen Memos."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Du musst eine zulässige Zahl als Zeit eingeben."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11696,26 +11293,18 @@ msgstr ""
 "funktioniert.\n"
 "Tippe /msg %S HELP ASSIGN für weitere Informationen."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Du musst Channel-Operator sein um diesen Channel zu registrieren."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Du musst länger als %d Sekunden verbunden sein, um einen Nicknamen zu "
 "registrieren."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Du musst auch Mode +i festsetzen um Mode +K festsetzen zu können."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Lock Mode +L setzt das Festsetzen des Modes +l vorraus."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11725,41 +11314,41 @@ msgstr ""
 "NickServ kann dir dann dein Passwort per Mail senden, falls du es\n"
 "vergessen solltest."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Du wirst bei neuen Memos benachrichtigt, wenn du dich identifizierst bzw "
 "wenn sie eintreffen."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Du wirst bei neuen Memos benachrichtigt, wenn du dich identifizierst."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Du wirst bei neuen Memos benachrichtigt, wenn sie eintreffen."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Du wirst ab sofort keine Memos mehr empfangen können."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "Du wirst nicht länger per Email über neue Memos benachrichtigt."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Du wirst nicht benachrichtigt bei neuen Memos."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "Du wirst jetzt per Email über neue Memos informiert."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11767,34 +11356,54 @@ msgstr ""
 "Dein IRCd unterstützt keine vIdents. Falls das inkorrekt sein sollte, melde "
 "das bitte als einen Bug."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Deine Access-Liste ist leer."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "Die Autokick-Liste von %s ist leer."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Ignore-Liste ist leer."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Dein Memo-Limit wurde aufgehoben."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Dein Memo-Limit wurde auf %d gesetzt."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Dein Memo-Limit liegt bei %d, und kann nicht geändert werden."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Dein Memo-Limit liegt bei %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Dein Memo-Limit liegt bei 0, du kannst keine Memos empfangen."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11802,180 +11411,732 @@ msgstr ""
 "Dein Memo-Limit liegt bei 0, du kannst keine Memos empfangen. Das Limit kann "
 "von dir nicht verändert werden."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Du wurdest ausgeloggt."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr ""
 "Dein Nickname ist bereits registriert, tippe /msg %s DROP um ihn zu löschen."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Dein Nickname ist nicht registriert."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Die Registrierung deines Nicknamens wurde gelöscht."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Dein Nickname wurde geändert in %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Dein Passcode wurde noch einmal an %s geschickt."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Dein Passwort ist %s - behalte es für spätere Benutzung."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 "Dein Passwort ist zu lang. Versuche es erneut mit einen kürzeren Passwort."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Dein vHost (%s) ist jetzt aktiviert."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Dein vHost (%s@%s) ist jetzt aktiviert."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Logon News - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Oper News - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Random News - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "nicht aktiv"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "läuft nicht aus"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "aktiv"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "verfällt beim nächstem Datenbank-Update"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "verfällt in %d Tag"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "verfällt in %d Tagen"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "verfällt in %d Stunde, %d Minute"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "verfällt in %d Stunde, %d Minuten"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "verfällt in %d Stunden, %d Minute"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "verfällt in %d Stunden, %d Minuten"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "verfällt in %d Minute"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "verfällt in %d Minuten"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vHost für %s wurde gelöscht."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vHost für %s wurde gesetzt: %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vHost für %s wurde gesetzt: %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vHost für die Gruppe %s wurde gesetzt: %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vHost für die Gruppe %s wurde gesetzt: %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vHost für die Gruppe %s wurden gelöscht."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "xOP Listen-System"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "XOP System für %s ist jetzt OFF."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "XOP System für %s ist jetzt ON."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "XOP System ist nicht verfügbar."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {Nickname | Channel} Memo-text"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s wurde der %s AOP-Liste hinzugefügt."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s wurde der %s HOP-Liste hinzugefügt."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s wurde der %s SOP-Liste hinzugefügt."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s wurde der %s VOP-Liste hinzugefügt."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s wurde gelöscht von der %s HOP-Liste."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s wurde von der %s SOP-Liste gelöscht."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s wurde gelöscht von der %s VOP-Liste."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s wurde auf die %s HOP-Liste verschoben."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s wurde auf %s SOP-Liste verschoben."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s wurde auf die %s VOP-Liste verschoben."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s wurde nicht gefunden in der %s HOP-Liste."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s wurde nicht gefunden in der %s SOP-Liste."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s wurde nicht gefunden in der %s VOP-Liste."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Stellt die Sprache ein, in der die Services\n"
+#~ "               dem Nicknamen antworten sollen."
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE      Verhindert das Erscheinen deines Nicknamens \n"
+#~ "                 auf der Liste von /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d Tage"
+
+#~ msgid "%d hours"
+#~ msgstr "%d Stunden"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d Minuten"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d Sekunden"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "Die HOP-Liste von %s ist leer."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "Die SOP-Liste von %s ist leer."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "Die VOP-Liste von %s ist leer."
+
+#~ msgid "1 day"
+#~ msgstr "1 Tag"
+
+#~ msgid "1 hour"
+#~ msgstr "1 Stunde"
+
+#~ msgid "1 minute"
+#~ msgstr "1 Minute"
+
+#~ msgid "1 second"
+#~ msgstr "1 Sekunde"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "CLEAR-Befehl erlaubt"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "HALFOP/DEHALFOP-Befehl erlaubt"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Die %s HOP-Liste wurde geleert."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Die SOP-Liste von %s wurde geleert."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Die VOP-Liste von %s wurde geleert."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "%d Einträge wurden von der %s HOP-Liste gelöscht."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "%d Einträge wurden von der %s SOP-Liste gelöscht."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "%d Einträge wurden von der %s VOP-Liste gelöscht."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "1 Eintrag wurde von der %s HOP-Liste gelöscht."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "1 Eintrag wurde von der %s SOP-Liste gelöscht."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "1 Eintrag wurde von der %s VOP-Liste gelöscht."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "eMail-Adresse wurde entfernt."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Ende der User-Liste."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Begrüssungsnachricht von %s wurde entfernt."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Der Bot ist nicht im Channel %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "Eintrittsnachricht: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Die Access-Liste für %s leer."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Access-Liste von %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Begrüssungsnachricht von %s wurde geändert."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Fantasy mode ist jetzt OFF im %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Begrüssungsnachricht ist jetzt OFF im %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "HOP Liste für %s:\n"
+#~ "  Nummer  Nickname"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Interner Fehler - kann die Anfrage nicht verarbeiten."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Logon News-Eintrag #%d wurde gelöscht."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s ist nicht registriert."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Nickname Registrierung (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Nick-Passwort (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Kein # vor dem Channelnamen gefunden."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "No-Bot-Mode ist jetzt OFF im Channel %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Keine passenden Einträge in der %s HOP-Liste."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Keine passenden Einträge in der %s SOP-Liste."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Keine passenden Einträge in der %s VOP-Liste."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Kein solcher Eintrag (#%d) in der %s AOP-Liste."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Kein solcher Eintrag (#%d) in der %s HOP-Liste."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Kein solcher Eintrag (#%d) in der %s SOP-Liste."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Kein solcher Eintrag (#%d) in der %s VOP-Liste."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Op-notice Option für %s ist jetzt OFF."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Peace Option für %s ist jetzt OFF."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Bitte warte %d Sekunden bis du den SEND Befehl wieder benutzen kannst."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Private-Mode des Bots im %s ist jetzt OFF."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Private Option für %s ist jetzt OFF."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Der Privat-Modus (PRIVATE) ist für %s jetzt deaktiviert (OFF)."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Schutz des Nicknamens %s ist jetzt deaktiviert (OFF)."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Kill-Schutz ist jetzt ON, ohne Wartezeit."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER Passwort [eMail]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Eingeschränkter Access Option für %s ist jetzt OFF."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "SOP Liste für %s:\n"
+#~ "  Nummer  Nickname"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Channel %s ist nicht registriert"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND Channel [Grund]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Secure Founder Option für %s ist jetzt OFF."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Secure-Ops Option für %s ist jetzt OFF."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Secure Option für %s ist jetzt OFF."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt deaktiviert (OFF)."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Services können die Modi nicht ändern. Ist der Server richtig "
+#~ "konfiguriert?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Services laufen seit %d Tag, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Services laufen seit %d Stunde, %d Minute"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Services laufen seit %d Stunde, %d Minuten"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Services laufen seit %d Stunden, %d Minute"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Services laufen seit %d Minute, %d Sekunde"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Services laufen seit %d Minute, %d Sekunden"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Services laufen seit %d Minuten, %d Sekunde"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Signierte kicks Option für %s ist jetzt OFF."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr "Die Channel HOP-Liste kann derzeit nicht geändert werden."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr "Die Channel SOP-Liste kann derzeit nicht geändert werden."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr "Die Channel VOP-Liste kann derzeit nicht geändert werden."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr "Du kannst maximal %d AOP/SOP/VOP Einträge in einem Channel haben."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Symbiosis-Mode ist jetzt OFF im %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Syntax: RANDOMNEWS ADD Text"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR Channel was"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Syntax: OPERNEWS ADD Text"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Syntax: SET DEBUG {ON | OFF | Nummer}\n"
+#~ "\n"
+#~ "Schaltet den Debug-Modus an oder aus. Wird der aktiviert,\n"
+#~ "werden alle Daten von/an die Services gesendet werden\n"
+#~ "(und ein paar anderen Debug-Meldungen) in ein Logfile\n"
+#~ "geschrieben. Wird Nummer angegeben, wird der Debugging\n"
+#~ "Level auf Nummer gesetzt.\n"
+#~ "\n"
+#~ "Diese Option ist äquivalent mit der Befehlszeilen-\n"
+#~ "Option -debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Syntax: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Begrüssungsnachricht %s wurde entfernt."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "Modul KANN NICHT entfernt werden."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Topic-Sperre Option für %s ist jetzt OFF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Die Topic-Beibehaltung für %s ist jetzt deaktiviert (OFF)."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Unbekannter Befehl %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Unbekannte Option %s.\n"
+#~ "Tippe /msg %S HELP KICK für weitere Informationen."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "User %s wurde nicht in der NickServ Datenbank gefunden."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "VOP Liste für %s:\n"
+#~ "  Nummer  Nickname"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Bot %s wurde gelöscht."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] Die Memo die du zum %s gesendet hast wurde angesehen."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] Die Memo die du zum %s gesendet hast wurde angesehen."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Die letzte Memo an %s wurde widerrufen."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Dein vHost (%s) ist jetzt aktiviert."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Bot %s wurde gelöscht."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "XOP System für %s ist jetzt OFF."
diff --git a/lang/anope.el_GR.po b/language/anope.el_GR.po
index 4af909805..9f0d3aaa8 100644
--- a/lang/anope.el_GR.po
+++ b/language/anope.el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:34-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Greek\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Ãéá ðåñéóóüôåñåò ðëçñïöïñßåò óå ìéá óõãêåêñéìÝíç åíôïëÞ,ãñÜøôå\n"
 "/msg %S HELP ^_command^_."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -55,14 +55,15 @@ msgstr ""
 "åíôïëÝò ãñÜøôå /msg %S HELP command. \n"
 "    "
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "Ï %S óáò åðéôñÝðåé íá êáôï÷õñþóåôå êáé íá ÷åéñéóôåßôå\n"
@@ -75,12 +76,12 @@ msgstr ""
 "óõãêåêñéìÝíç åíôïëÞ, ðëçêôñïëïãÞóôå /msg %S HELP åíôïëÞ.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -94,122 +95,106 @@ msgstr ""
 "\n"
 "Ïé åíôïëÝò ôïõ %S åßíáé:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s Changed the DEFCON level to %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí AOP ëßóôá ôïõ %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí HOP ëßóôá ôïõ %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "Ï/ç %s ðñïóèÝèçêå óôï access list ôïõ %s ìå level %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí autokick ëßóôá ôïõ %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s ðñïóèÝèçêå óôçí ëßóôá ôùí êáêþí ëÝîåùí ôïõ %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s ðñïóèÝèçêå óôçí ëßóôá AKILL."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s ðñïóèÝèçêå óôçí ëßóôá SNLINE."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s ðñïóèÝèçêå óôçí ëßóôá SQLINE."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s ðñïóèÝèçêå óôçí ëßóôá SZLINE."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s Ýãéíå ðñïóèÞêç óôçí ëßóôá ðñüóâáóÞò óïõ."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s Ýãéíå ðñïóèÞêç óôçí ëßóôá ðñüóâáóÞò óïõ."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s Ý÷åéò Þäç %s êáêÝò ëÝîåéò."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "Ï/ç %s õðÜñ÷åé Þäç óôçí autokick ëßóôá ôïõ %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s õðÜñ÷åé Þäç óôçí ëßóôá AKILL."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s õðÜñ÷åé Þäç óôçí ëßóôá SNLINE."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s õðÜñ÷åé Þäç óôçí ëßóôá SQLINE."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s õðÜñ÷åé Þäç óôçí ëßóôá SZLINE."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s äåí ìðïñåß íá ðÜñåé ôüóï ÷ñüíï ôo ban."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s changed your usermodes."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -218,132 +203,113 @@ msgstr ""
 "%s channel list:\n"
 "¼íïìá                 ×ñÞóôåò  ÅðéëïãÝò   Topic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí AOP ëßóôá ôïõ %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí HOP ëßóôá ôïõ %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s äéáãñÜöôçêå áðü ôï access list ôïõ %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "Ï/ç %s äéáãñÜöôçêå áðü ôçí autokick list ôïõ %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s äéáãñÜöôçêå áðü ôçí ëßóôá ôùí êáêþí ëÝîåùí áðï ôï %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s äéáãñÜöçêå áðü ôçí ëßóôá session-limit exception."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s äéáãñÜöçêå áðü ôçí ëßóôá AKILL."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s äéáãñÜöçêå áðü ôçí ëßóôá SNLINE."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s äéáãñÜöçêå áðü ôçí ëßóôá SQLINE."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s äéáãñÜöçêå áðü ôçí ëßóôá SZLINE."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s äéáãñÜöôçêå áðü ôçí ëßóôá ðñüóâáóÞò óïõ."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s áðåíåñãïðïéÞèçêáí óôï êáíÜëé %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s Ý÷åé ðïëëÜ êáôï÷õñùìÝíá êáíÜëéá."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s Ý÷åé Þäç êáëõöèåß áðü ôïí %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s Ýãéíå ðñïóèÞêç óôçí ëßóôá ðñüóâáóÞò óïõ."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s äåí åßíáé óùóôüò ban ôýðïò."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s äåí åßíáé óùóôü bot Þ êáôï÷õñùìÝíï êáíÜëé."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s äåí åßíáé ëáíèáóìÝíç äéåýèõíóç."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s äåí åßíáé óõíÝ÷åéá åíåñãü ðéá óôï êáíÜëé %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s äåí åßíáé áõôÞ ôç óôéãìÞ ìÝóá óôï êáíÜëé %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s åßíáé áðü ôùñá åíåñãü óôï êáíÜëé %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s not found on ignore list."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -352,107 +318,72 @@ msgstr ""
 "%s matches an except on %s and cannot be banned until the except have been "
 "removed."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s moved to %s AOP list."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s moved to %s HOP list."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s moved to %s SOP list."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s moved to %s VOP list."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "Ï/ç %s äåí âñÝèçêå ç èÝóç óôçí AOP ëßóôá ôïõ %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "Ï/ç %s äåí âñÝèçêå óôçí HOP ëßóôá ôïõ %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "Ï/ç %s äåí âñÝèçêå óôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "Ï/ç %s äåí âñÝèçêå óôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "Ï/ç %s äåí âñÝèçêå óôïõ %s óôçí access list."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "O %s äåí âñÝèçêå óôçí autokick list ôïõ %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s äåí âñÝèçêå óôç ëßóôá ôùí êáêþí ëÝîåùí ôïõ %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s äåí âñÝèçêå óôçí ëßóôá session."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s äåí âñÝèçêå óôçí ëßóôá session-limit exception."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s äåí âñÝèçêå óôçí ëßóôá AKILL."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s äåí âñÝèçêå óôçí ëßóôá SNLINE."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s äåí âñÝèçêå óôçí ëßóôá SQLINE."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s äåí âñÝèçêå óôçí ëßóôá SZLINE."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s äåí âñÝèçêå óôç ëßóôá ðñüóâáóÞò óïõ."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s äéáãñÜöôçêå áðü ôçí ëßóôá ðñüóâáóÞò óïõ."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -461,33 +392,33 @@ msgstr ""
 "%s ëßóôá ÷ñçóôþí:\n"
 "¼íïìá                 ÌÜóêá"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s will no longer be ignored."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s will now be ignored for %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s will now permanently be ignored."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Óçìåßùóç: ¼ëåò ïé åíôïëÝò óôÝëíïíôáé óôïí %S êáé êáôáãñÜöïíôáé!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Óçìåßùóç: Ïé õðçñåóßåò åßíáé ìüíï áíáãíþóéìåò; ïé üðïéåò áëëáãÝò Ýãéíáí èá "
 "÷áèïýí!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -495,11 +426,11 @@ msgstr ""
 "Õðåíèýìéóç: Ïé ìÜóêåò ôùí AKILL äåí ðñÝðåé íá ðåñéÝ÷ïõí øåõäþíõìá; "
 "óéãïõñÝøïõ ïôé äåí ðåñéÝ÷åéò øåõäþíõìï óôçí ìÜóêá."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Õðåíèýìéóç: ìðïñåßò ìüíï íá ðñïóèÝóåéò IP ìÜóêåò óôçí ëßóôá SZLINE."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -542,42 +473,38 @@ msgstr ""
 "÷ñçóéìïðïéþíôáò ôçí åíôïëÞ LEVELS; ãñÜøôå /msg %S HELP LEVELS ãéá\n"
 "ðëçñïöïñßåò."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Ðñïåéäïðïßçóç: ¸÷åéò îåðåñÜóåé ôï íïýìåñï ìçíõìÜôùí ðïõ ìðïñåßò íá ëÜâåéò (%"
-"d).  Äåí èá ìðïñåßò íá ëÜâåéò Üëëá áí äåí óâÞóåéò ìåñéêÜ áðü ôá ðáëéÜ "
-"ìçíýìáôá ðïõ Ý÷åéò."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Ðñïåéäïðïßçóç: ¸÷åé öôÜóåé óôï ìÝãéóôï íïýìåñï ìçíõìÜôùí (%d).  Äåí èá "
-"ëÜâåéò êáéíïýñãéá ìçíýìáôá áí äåí óâÞóåéò ìåñéêÜ áðü ôá ðáëéÜ ðïõ Ý÷åéò."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] The memo you sent has been viewed."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] The memo you sent to %s has been viewed."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER ^_êùäéêü^_ ^_email^_"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER ^_êùäéêü^_ ^_email^_"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP ^_óôü÷ïò^_ ^_êùäéêü^_"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -588,7 +515,7 @@ msgstr ""
 "åíÝñãåéåò.  Ç êáôÜ÷ñçóç ôïõ %S èá ïäçãÞóåé, ôïõëÜ÷éóôïí,\n"
 "óå áðþëåéá ôùí áíÜëïãùí øåõäùíýìùí."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -601,7 +528,7 @@ msgstr ""
 "åíôïëÞ áíáãíþñéóçò ìÝóù êùäéêïý, ìðïñïýí íá äïýí ôçí access, AKICK,\n"
 "êáé ôá level ïðïéïõäÞðïôå êáíáëéïý."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -614,372 +541,388 @@ msgstr ""
 "ìðïñïýí íá\n"
 "äïõí ôçí  ëßóôá access  ãéá êÜèå øåõäþíõìï (/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "            ÅðéëïãÝò : %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "            vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            vhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "            ¼íïìá ôïõ Bot : %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "           ¼íïìá ôïõ bot : äåí õðÜñ÷åé ãéá ôçí þñá."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "          ÅðéëïãÝò: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "        Êåöáëáßá ãñÜììáôá ìå kick : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr ""
 "        Êåöáëáßá ãñÜììáôá ìå kick : %s (%d kick(s) to ban; minimum %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "        Êåöáëáßá ãñÜììáôá ìå kick : %s (minimum %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "        ÊáíáëÜñ÷çò: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Ôýðïò Ban: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "       ¸íôïíç ÷áñáêôÞñåò ìå kick : %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "       ¸íôïíç ÷áñáêôÞñåò ìå kick : %s (%d kick(s) to ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       ÅðáíÜëçøç ìå kick : %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       ÅðáíÜëçøç ìå kick : %s (%d kick(s) to ban; %d lines in %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       ÅðáíÜëçøç ìå kick : %s (%d lines in %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       ÌÜóêá : %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      ×ñþìáôá ìå kick : %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      ×ñþìáôá ìå kick : %s (%d kick(s) to ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "       Ôýðïò Ban: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "      Ôåëåõôáßá ÷ñÞóç: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "      ÅðéëïãÝò êëåéäþìáôïò: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "      ÅðáíÜëçøç ìå kick : %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "      ÅðáíÜëçøç ìå kick : %s (%d kick(s) to ban; %d times)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "      ÅðáíÜëçøç ìå kick : %s (%d times)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "      ÕðïêáíáëÜñ÷çò: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspended: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "        Êåöáëáßá ãñÜììáôá ìå kick : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "       ¸íôïíç ÷áñáêôÞñåò ìå kick : %s (%d kick(s) to ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "       Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "       Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "     Ôåëåõôáßï topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "     Êáôï÷õñþèçêå: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (áðåíåñãïðïéçìÝíï)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (êáíáëÜñ÷çò ìüíï)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     ÁëëÜæåé ôç ëßóôá ôùí åîïõóéïäïôçìÝíùí äéåõèýíóåùí"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     ÁëëÜæåé ôç ëßóôá ôùí åîïõóéïäïôçìÝíùí ÷ñçóôþí"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "ACT                Makes the bot do the equivalent of a \"/me\" command"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áðüññéøçò"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áðüññéøçò"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       ÐñïóèÝôåé ip êëð óôçí ëßóôá AKILL"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      List channels you have access on"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        ÁëëÜæåé ôçí ëßóôá ôùí AOP ÷ñçóôþí"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             ÆçôÜôå áðü ôï bot íá Ýñèåé óôï êáíÜëé óáò"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           ÁëëÜæåôå ôçí ëßóôá êáêþí ëÝîåùí"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bans a selected nick on a channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       ÁëëÜæåé ôïí ôýðï ôïõ ban ðïõ èá êÜíïõí ôá Services"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                ÁëëÜæåé ôçí ëßóôá ôùí bot ôïõ äéêôýïõ"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Ëßóôá ìå äéáèÝóéìá bots"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Áêõñþíåé ôï ôåëåõôáßï ìÞíõìá ðïõ óôÝëíåôå"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL all users on a specific channel"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Åìöáíßæåé üëá ôá êáíÜëéá"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Checks if last memo to a nick was read"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Êáèáñßæåé ôá modes áðü ôï êáíÜëé"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirm a nickserv auth code"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "    ÄçìéïõñãÞèçêå : %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipulate the DefCon system"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Delete the vhost of another user"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    ÄéáãñÜöåé Ýíá Þ ðïëëÜ ìçíýìáôá"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Delete the vhost for all nicks in a group"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deops a selected nick on a channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          ÁëëÜæåé ôçí ðåñéãñáöÞ ôïõ êáíáëéïý"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoices a selected nick on a channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    ÁëëÜæåé ôçí ëßóôá ôùí ïìÜäùí"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Áêõñþíåé ôçí êáôï÷ýñùóç åíüò êáíáëéïý"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       ÄéáãñÜöåé Ýíá øåõäþíõìï"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "    ÐåñéãñáöÞ: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Óõó÷åôßæåé ìßá äéåýèõíóç e-mail ìå ôï øåõäþíõìü óáò"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      ÁëëÜæåé ôï ìÞíõìá åéóáãùãÞò ðïõ óôÝëíåôå óå üëïõò ôïõò\n"
-"                     ÷ñÞóôåò ðïõ ìðÝíïõí óôï êáíÜëé"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   ÁëëÜæåéò ôçí ëßóôá ôïõ session-limit exception"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr ""
 "    FORBID     ÊáôáóôÝëåé ôï êáíÜëé,äåí ìðïñåß íá ôï ÷ñçóéìïðïéÞóç êáíåßò"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr ""
 "    FORBID     ÊáôáóôÝëåé Ýíá øåõäþíõìï,äçë ôï êÜíåé íá ìçí ôï ÷ñçóéìïðïéåß\n"
 "               êáíåßò,üðïéïò ôï ðÜñåé Ý÷åé kill"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       ÁëëÜæåé ôïí founder ôïõ êáíáëéïý"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -987,71 +930,76 @@ msgstr ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Returns the key of the given channel"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Åìöáíßæåé ôïí êùäéêü ãéá ôï óõãêåêñéìÝíï øåõäþíõìï\n"
 "               (ìüíï áí ç êùäéêïðïßçóç åßíáé áíåíåñãÞ)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lists all nicknames in your group"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      ÓôÝëíåé ìÞíõìá óå üëïõò ôïõò ÷ñÞóôåò"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Óõó÷åôßæåé Ýíá ìÞíõìá ÷áéñåôéóìïý ìå ôï øåõäþíõìü óáò"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Syncs the vhost for all nicks in a group"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      ÌðÝíåôå óå ïìÜäá øåõäþíõìïõ"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "    ÌÞíõìá ÷áéñåôéóìïý: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Halfops a selected nick on a channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr ""
 "    HIDE       Áðïêñýðôåé óõãêåêñéìÝíá ôìÞìáôá ðëçñïöïñéþí ôïõ øåõäùíýìïõ"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Óáò áíáãíùñßæåé ìå ôç ÷ñÞóç êùäéêïý"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Modify the Services ignore list"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1059,48 +1007,48 @@ msgstr ""
 "INFO               Allows you to see BotServ information about a channel or "
 "a bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Displays information about a given nickname"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Lists information about the named registered channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Displays information about your memos"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        \"Jupiter\" óå server"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 "    KEEPTOPIC     Íá áëëÜæåé ôï topic üôáí äåí ÷ñçóéìïðïéåßôáé ôï êáíÜëé"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Ñõèìßæåôáé  ôé íá êÜíåé óôïõò \"Üôáêôïõò ÷ñÞóôåò\""
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Áðïìáêñýíåé ôï ÷ñÞóôç áðü ôï êáíÜëé"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicks a selected nick from a channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Åíåñãïðïéåß/áðåíåñãïðïéåß ôçí ðñïóôáóßá ìå áðïóýíäåóç"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1108,94 +1056,87 @@ msgstr ""
 "    LANGUAGE   ÁëëÜæåé ôç ãëþóóá ðïõ ÷ñçóéìïðïéïýí ïé\n"
 "                   õðçñåóßåò üôáí ôéò ÷ñçóéìïðïéåßôå"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Åðáíáêáèïñßæåé ôï íüçìá ôùí åðéðÝäùí ðñüóâáóçò"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Displays one or more vhost entries."
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       List all registered nicknames that match a given pattern"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lists all registered channels matching the given pattern"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Åìöáíßæåé ëßóôá ìå ôá ìçíýìáôá óáò"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   ÁëëÜæåéò ôá ìçíýìáôá ðïõ èá åìöáíßæïíôáé üôáí áõôïß èá "
 "ìðÝíïõí\n"
 "        óôï äßêôõï"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Êëåßäùìá ôùí Modes ôïõ êáíáëéïý"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        ÁëëÜæåé modes óå êáíÜëé êáé Üëëá"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Êáèáñßæåé ôá modes áðü ôï êáíÜëé"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Info about a loaded module"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     List loaded modules"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Un-Load a module"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        ÁëëÜæåé ôçí ìÝèïäï åðéêïéíùíßáò ìå ôéò õðçñåóßåò"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1203,96 +1144,87 @@ msgstr ""
 "    NOOP        Áöáéñåß ðñïóùñéíÜ üëåò ôéò O:ãñáììÝò áðü ôïí server \n"
 "                    áõôüìáôá"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Deactivates your assigned vhost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Give Operflags to a certain user"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Activates your assigned vhost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Gives Op status to a selected nick on a channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 "    OPERNEWS    ÁëëÜæåéò ôá ìçíýìáôá ðïõ èá åìöáíßæïíôáé óôïõò ÷ñÞóôåò ðïõ\n"
 "        ãßíïíôáé oper"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Íá óôÝëíåé ìÝóá óôï êáíÜëé ìÞíõìá ðïéïò ÷ñçóéìïðïéåß OP/"
 "DEOP \n"
 "         åíôïëÝò"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gives you owner status on channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "    ÅðéëïãÝò : %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   ÁëëÜæåé ôïí êùäéêü ôïõ øåõäùíýìïõ óáò"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Íá åëëáôþíåé ôçí ÷ñÞóç \"âßáéùí\" åíôïëþí"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr ""
 "    PRIVATE       Íá ìçí åìöáíßæåôáé ôï êáíÜëé üôáí ãßíåôáé åíôïëÞ LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Åìðïäßæåé ôï øåõäþíõìü óáò íá åìöáíßæåôáé\n"
-"                   ìå ôçí åíôïëÞ  /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protects a selected nick on a channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr ""
 "    QUIT        Ôåñìáôßæåé ôï ðñüãñáììá ôùí Services ÷ùñßò íá óþóåé ôéò "
 "áëëáãÝò"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1301,249 +1233,252 @@ msgstr ""
 "åìöáíßæïíôáé \n"
 "                    üôáí áõôïß èá ìðÝíïõí óôï äßêôõï"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   ÄéáâÜæåé Ýíá Þ ðïëëÜ ìçíýìáôá"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr ""
 "    RECOVER    Áðïóýíäåóç åíüò Üëëïõ ÷ñÞóôç ðïõ Ý÷åé ðÜñåé ôï øåõäþíõìü óáò"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Êáôï÷õñþíåé Ýíá øåõäþíõìï"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Êáôï÷õñþíåé Ýíá øåõäþíõìï"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 "    RELEASE    ÁíÜêôçóç ôçò êáôáêñÜôçóçò ôïõ øåõäùíýìïõ,ìåôÜ áðü RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Îáíáöïñôþíåé ôï services' configuration áñ÷åßï"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Resend a nickserv auth code"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords."
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Óþæåé ôéò âÜóåéò äåäïìÝíùí êáé åðáíåêêéíåß ôá Services"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr ""
 "    RESTRICTED    Áðáãüñåõóç åéóüäïõ óôï êáíÜëé áí äåí Ý÷åéò access åêåß"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Sends a memo and requests a read receipt"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Áíôéèåôïò ìå kick : %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Áíôéèåôïò kick : %s (%d kick(s) to ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "SAY                Makes the bot say the given text on the given channel"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Åíåñãïðïßçóç ôïõ %S ,ìåëëïíôéêÞ áóöÜëåéá"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Åíåñãïðïéåß/áðåíåñãïðïéåß ôç ëåéôïõñãßá áóöÜëåéáò"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER ÁóöÜëåéá ôïõ founder áðü ôï êáíÜëé"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Ìüíï üóïé Ý÷ïõí access èá Ý÷ïõí op"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   ÓôÝëíåé Ýíá ìÞíõìá óå Ýíá øåõäþíõìï Þ Ýíá êáíÜëé"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Send a memo to all registered users"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr ""
 "    SENDPASS   ÎÝ÷áóåò ôïí êùäéêü? Äïêßìáóå áõôü êáé èá óôï óôåßëïõìå åìåßò"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     ÂëÝðåéò ôçí ëßóôá ìå ôá host sessions"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                ÁëëÜæåôå ôéò åðéëïãÝò ôïõ bot"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Set the vhost of another user"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Ñõèìßæåéò äéÜöïñåò åðéëïãÝò ôùí Services"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr ""
 "    SET        Ñõèìßæåé ôéò åðéëïãÝò êáé ôéò ðëçñïöïñßåò\n"
 "               ôïõ êáíáëéïý\t"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr ""
 "    SET        ÁëëáãÞ åðéëïãþí, óõìðåñéëáìâÜíåôáé ç ðñïóôáóßá ìå áðïóýíäåóç"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    ÁëëÜæåé ôéò åðéëïãÝò ôùí ìçíõìÜôùí"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Set the vhost for all nicks in a group"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr ""
 "    SHUTDOWN    Ôåñìáôßæåé ôï ðñüãñáììá ôùí Services ìå ôáõôü÷ñïíï ãñÜøéìï "
 "ôùí\n"
 "        áëëáãþí"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Åìöáí. kicks ôá ïðïßá ãßíïíôáé ìå ôçí åíôïëÞ KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      ÐñïóèÝôåé ip óôçí ëßóôá SNLINE"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        ÁëëÜæåé ôçí ëßóôá ôùí SOP ÷ñçóôþí"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      ÐñïóèÝôåé ip óôçí ëßóôá SQLINE"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Display Services staff and online status"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF  Send a memo to all opers/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr ""
 "    STATS       Äåß÷íåé óôáôéóôéêÜ ó÷åôéêÜ ìå ôá Services êáé ôï äßêôõï"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     ÅðéóôñÝöåé ôçí óõãêåêñéìÝíç access level ôïõ ÷ñÞóôç óôï\n"
 "               êáíÜëé"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Returns the owner status of the given nickname"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     ÁëëÜæåé ôïí successor ôïõ êáíáëéïý"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
 "               channel data and settings"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend a given nick"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Forcefully change a user's nickname"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      ÐñïóèÝôåé ip óôçí ëßóôá SZLINE"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     Ôï Topic ìðïñåß íá áëëÜîåé ìå ôçí åíôïëÞ TOPIC"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Change a user's modes"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Unassigns a bot from a channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Releases a suspended channel"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend a given nick"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1551,85 +1486,85 @@ msgstr ""
 "    UPDATE      Åíåñãïýí ôá Services (âÜóåéò äåäïìÝíùí) ãéá\n"
 "                    íá ãßíïõí update óôï äßóêï áìÝóùò"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Åìöáíßæåé üëïõò ôïõò ÷ñÞóôåò"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    ×ñçóéìïðïéåßôáé óôï/á : %d êáíÜëé/á"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Voices a selected nick on a channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr ""
 "    XOP           Áí åßíáé ON äïõëåýåé ìå AOP/SOP,áí åßíáé off ìå access"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   ÊáêÝò ëÝîåéò þóôå íá êÜíåé kick : %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   ÊáêÝò ëÝîåéò þóôå íá êÜíåé kick : %s (%d kick(s) to ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "   E-mail äéåýèõíóç: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "  Åßíáé óôï äßêôõï áðü: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "   Ôåëåõôáßá öïñÜ ðïõ Þôáí óôï äßêôõï: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "   Ôï Topic ãñÜöôçêå áðü ôïí: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1638,17 +1573,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1657,98 +1592,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "  ÌÞíõìá åéóüäïõ: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "  Ðñáãìáôéêü üíïìá : %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "  ÊáôÜóôáóç êáôï÷ýñùóçò ìå ôçí çìåñïìçíßá: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  ÕðïãñÜììéóç ìå kick : %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  ÕðïãñÜììéóç ìå kick : %s (%d kick(s) to ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Íïýìåñï  ÁðïóôïëÝáò            Çìåñïìçíßá/¿ñá"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1757,7 +1696,7 @@ msgstr ""
 "%3d  %s (by %s on %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1766,25 +1705,16 @@ msgstr ""
 "%3d %s (áðü %s óôï %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (stuck) (áðü %s óôï %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (by %s on %s; %s)\n"
 "    Limit: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1793,255 +1723,261 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Ïé åíôïëÝò ôïõ %S åßíáé::"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s äåí èá ðáñáôçñçèåß ãéá íÝá ìçíýìáôá."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modules loaded."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bots äéáèÝóéìá."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d ìÝñåò"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (áðü %s óôï %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d þñåò"
+msgid "%d Modules loaded."
+msgstr "%d Modules loaded."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d ëåðôÜ"
+msgid "%d bots available."
+msgstr "%d bots äéáèÝóéìá."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d øåõäþíõìá ìÝóá óôçí ïìÜäá."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d äåõôåñüëåðôá"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "Ç AOP ëßóôá ôïõ %s åßíáé Üäåéá."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "Ç HOP ëßóôá ôïõ %s åßíáé Üäåéá."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "Ç SOP ëßóôá ôïõ %s åßíáé Üäåéá."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "Ç VOP ëßóôá ôïõ %s åßíáé Üäåéá."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "Ç ëßóôá ôïõ %s access list åßíáé Üäåéá."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "H autokick list ôïõ %s åßíáé Üäåéá."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "Ç ëßïóôá ôùí êáêþí ëÝîåùí ôïõ %s åßíáé Üäåéá."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
 "%s äåí ìðïñåß íá åßíáé successor óôï êáíÜëé %s ãéáôß åßíáé founder óå áõôü."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s äåí ìðïñåßò íá ëÜâåéò Üëëá ìçíýìáôá."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Ïé åíôïëÝò ôïõ %S åßíáé::"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr ""
 "%s ç ìÜóêá åßíáé ðïëý ðëáôéÜ; Ðáñáêáëþ ÷ñçóéìïðïéÞóôå ìéá ðéï êáèïñéóìÝíç "
 "ìÜóêá."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s Ý÷åéò %d ìçíýìáôá, åê ôùí ïðïßùí %d äåí Ý÷ïõí äéáâáóôåß."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s Ý÷åéò %d ìçíýìáôá, åê ôùí ïðïßùí 1 äåí Ý÷åé äéáâáóôåß."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s Ý÷åéò %d ìçíýìáôá."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s Ý÷åéò %d ìçíýìáôá; åê ôùí ïðïßùí üëá äåí Ý÷ïõí äéáâáóôåß."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s Ý÷åéò 1 ìÞíõìá, êáé äåí ôï Ý÷åéò äéáâÜóåé áêüìá."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s Ý÷åéò 1 ìÞíõìá.."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s äåí Ý÷åéò êáíÝíá ìÞíõìá."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s Ý÷åéò ðïëëÜ ìçíýìáôá êáé äåí ìðïñåßò íá ëÜâåéò Üëëá."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s äåí Ý÷åéò üñéï ìçíõìÜôùí."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s äåí Ý÷åéò ìçíýìáôá."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "Ï/ç %s äåí Ý÷åé êáíÝíá íÝï ìÞíõìá."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s åßíáé %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "Ï %s åßíáé ãéá ôçí þñá off."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s åßíáé Þóç ìÝóá óôï äßêôõï."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s is disabled"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s is enable"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is no longer a Super-Admin"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s äåí èá ðáñáôçñçèåß ãéá íÝá ìçíýìáôá."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr "%s èá ðáñáôçñçèåß ãéá íÝá ìçíýìáôá óôï logon êáé üôáí èá öôÜóïõí."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s èá ðáñáôçñçèåß ãéá íÝá ìçíýìáôá óôï logon."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s èá ðáñáôçñçèåß üôáí ôá íÝá ìçíýìáôá èá öôÜóïõí."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s is now a Super-Admin"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Ç AOP ëßóôá ôïõ %s åßíáé :\n"
+"  Íïýìåñï  Øåõäþíõìï"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "O %s äåí âñÝèçêå óôçí autokick list ôïõ %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "Ï/ç %s äéáãñÜöôçêå áðü ôçí autokick list ôïõ %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s äåí èá óïõ Ýñ÷åôáé êáìßá ðáñáôÞñçóç áðü ôçí õðçñåóßá."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s èá óïõ ãßíåôáé ðáñáôÞñçóç ïôé Ýñ÷ïíôáé ìçíýìáôá áðü ôçí õðçñåóßá."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2050,94 +1986,78 @@ msgstr ""
 "%s áðü ôþñá üôáí èá êÜíåéò åíôïëÞ logon èá âëÝðåéò ôá ìçíýìáôá ðïõ èá óïõ "
 "óôÝëíïõí êáèþò èáóáé óôï äßêôõï."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s üôáí èá êÜíåéò log on Þ èá åðáíÝñ÷åóáé áðü away èá ëáìâÜíåéò ôá ìçíýìáôá."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) ðñïóèÝèçêå óôïõ bot ôçí ëßóôá."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s's üñéï ìçíõìÜôùí åßíáé %d, êáé äåí ìðïñåß íá áëëá÷ôåß."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Ôïõ/ôçò %s's ôï üñéï ìçíõìÜôùí åßíáé %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL any new clients connecting"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Force Chan Modes (%s) to be set on all channels"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore any non-opers with message"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill any NEW clients connecting"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* No MLOCK changes"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* No new channel registrations"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* No new memos sent"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* No new nick registrations"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Silently ignore non-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Use the reduced session limit of %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 ìÝñá"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 þñá"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 ëåðôü"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 äåõôåñüëåðôï"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<Üãíùóôï>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "A massmemo has been sent to all registered users."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2146,134 +2066,136 @@ msgstr ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "A passcode has been sent to %s, please type /msg %s confirm <passcode> to "
 "complete registration"
 
-#: language.cpp:5126
+#: include/language.h:114
 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"
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Error! A vhost can only contain A-Z, a-z, 0-9, '.' and '-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT channel text"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mask]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-or-usermask] [reason]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "Ç AKICK ENFORCE ãéá ôïí %s ïëïêëçñþèçêå; %d ÷ñÞóôåò èá åðéññåáóôïýí."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "Ç ëßóôá AKILL åßíáé Üäåéá."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
 "[reason]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Ç AOP ëßóôá ôïõ %s åßíáé :\n"
-"  Íïýìåñï  Øåõäþíõìï"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN chan nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Äåí Ý÷åéò ôçí åðéôñåðüìåíç Üäåéá."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Ç Access level ãéá ôïí %s óôï %s Üëëáîå óå %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Ç Access level ôïõ %s óôï %s äåí áëëÜæåé áðü ôïí %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr ""
 "Ç Access level ðñÝðåé íá åßíáé áíÜìåóá óôï %d êáé %d óõìðáñáëáìâáíüìåíïõ."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Ç Access level äåí ðñÝðåé íá åßíáé ðïôÝ óôï ìçäÝí."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Ï âáèìüò access ãéá ôï êáíÜëé %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Ï âáèìüò Access ãéá ôï %s óâÞóôçêå óôï áñ÷éêü."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Ëßóôá ðñüóâáóçò ãéá %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Ç access ëßóôá ôïõ %s åßíáé:\n"
 "  Íïýíåñï   Âáèìüò  Øåõäþíõìï"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Ëßóôá ðñüóâáóçò:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2282,22 +2204,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí autokick ëßóôá ôïõ %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "ÐñïóôÝèçêå Ýíáò êáíïíéóìüò Þ ðëçñïöïñßá óôç èÝóç (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "ÐñïóèÝèçêå Ýíá íÝï ìÞíõìá ãéá ôïõò opers èÝóç (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "ÐñïóèÝèçêå Ýíá íÝï ìÞíõìá óôçí èÝóç (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2305,239 +2232,232 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "¼ëåò ïé O:ãñáììÝò ôïõ %s Ý÷ïõí áðïìáêñõíèåß."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "¼ëåò ïé O:ãñáììÝò ôïõ %s Ý÷ïõí óâçóôåß."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "¼ëá ôá bans áðü ôï êáíÜëé %s Ý÷ïõí áðïìáêñõíèåß."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "¼ëá ôá excepts áðü ôï êáíÜëé %s Ý÷ïõí áðïìáêñõíèåß."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "All invites on channel %s have been removed."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "¼ëïé ïé êáíïíéóìïß Þ ïé ðëçñïöïñßåò äéáãñÜöçêáí."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "All memos for channel %s have been deleted."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "¼ëá ôá modes êáèáñßóôçêáí áðü ôï êáíÜëé %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "¼ëá ôá modes áðü ôï êáíÜëé %s Ý÷ïõí óâçóôåß."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "¼ëá ôá ìçíýìáôá äéáãñÜöçêáí."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "¼ëá ôá íÝá ãéá ôïõò opers äéáãñÜöçêáí."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "¼ëá ôá ìçíýìáôá äéáãñÜöçêáí."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "¼ëïé ïé ÷ñÞóôåò Ýãéíáí kick áðü ôï êáíÜëé %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "All vhost's in the group %s have been set to %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "ÅðéôñÝðåôáé íá êÜíåéò (de)halfop ôïí åáõôü óïõ"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "ÅðéôñÝðåôáé íá êÜíåéò (de)op ôïí åáõôü óïõ"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "ÅðéôñÝðåôáé íá êÜíåéò (de)protect ôïí åáõôü óïõ"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "ÅðéôñÝðåôáé íá êÜíåéò (de)voice ôïí åáõôü óïõ"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "ÅðéôñÝðåôáé íá ìðåß/âãåß ôï bot"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "ÅðéôñÝðåôáé íá êÜíåéò Ban ôïí åáõôü óïõ"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "ÅðéôñÝðåôáé íá êÜíåéò kick ôïí åáõôü óïõ"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr ""
 "ÅðéôñÝðåôáé íá äåßò ôçí ëßóôá êáé íá äéáâÜóåéò ôá ìçíýìáôá ðïõ Ý÷ïõí óôáëåß "
 "óôï êáíÜëé"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "ÅðéôñÝðåôáé íá ðáñÝìâåôáé êáé íá áëëÜîåôáé ôçí ëßóôá ðñüóâáóçò"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé AKICK åíôïëÞ"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí BADWORDS åíôïëÞ"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí BAN åíôïëÞ"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé CLEAR åíôïëÞ"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí GETKEY åíôïëÞ"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò HALFOP/DEHALFOP åíôïëÝò"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí INFO åíôïëÞ ìå ôçí ALL åðéëïãÞ"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé INVITE åíôïëÞ"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí KICK åíôïëÞ"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé OP/DEOP åíôïëÝò"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò PROTECT/DEPROTECT åíôïëÝò"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò SAY êáé ACT åíôïëÝò"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé SET åíôïëÞ (not FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí TOPIC åíôïëÞ"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé UNBAN åíôïëÞ"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò VOICE/DEVOICE åíôïëÝò"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò fantaisist åíôïëÝò"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "ÅðéôñÝðåôáé íá âëÝðåôáé ôçí ëßóôá ðñüóâáóçò"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Ç Autokick list ôïõ %s åßíáé:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Ôï êáíÜëé äßíåé operator status óå êáôï÷õñùìÝíá Þ ìç øåõäþíõìá"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Ôï êáíÜëé äßíåé óå øåõäþíõìá +a äçëáäÞ áóöÜëåéá"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Ôï êáíÜëé äßíåé half op Þ +h óå êáôï÷õñùìÝíá Þ ìç øåõäþíõìá"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Ôï êáíÜëé äßíåé öùíÞ Þ +v óå êáôï÷õñùìÝíá Þ ìç øåõäþíõìá"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2547,7 +2467,7 @@ msgstr ""
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2556,111 +2476,109 @@ msgstr ""
 "Ç ëßóôá ìå ôéò êáêÝò ëÝîåéò ôïõ %s åßíáé:\n"
 "  Íïýì   ËÝîç                           Ôýðïò"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Ç ëßóôá ôùí êáêþí ëÝîåùí åßíáé Üäåéá."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Ban ôýðïò ôïõ êáíáëéïý %s åßíáé ôþñá #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "¼ëá ôá modes êáé ôá bans êáèáñßóôçêáí áðü ôï êáíÜëé %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s õðÜñ÷åé Þäç."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Ôï Bot %s äåí õðÜñ÷åé."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Ôï Bot %s èá ìðåé óôï %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Bot %s Üëëáîå óå %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Bot %s äéáãñÜöçêå."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s is already assigned to channel %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Ôï Bot èá êÜíåé kick ôïõò ops ôïõ êáíáëéïý %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Ôï Bot èá êÜíåé kick ôïõò voices ôïõ êáíáëéïý %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Ôï Bot äåí èá êÜíåé kick ôïõå ops ôïõ êáíáëéïý %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Ôï Bot äåí èá êÜíåé kick ôïõò voices ôïõ êáíáëéïý %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Bot Hosts may only contain valid host characters."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents may only contain %d characters."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Bot Idents may only contain valid characters."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks may only contain valid nick characters."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Ôï Bot äåí åßíáé óôï êáíÜëé %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Bot ëßóôá:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Ôï Bot èá ìðåß óôï êáíÜëé üôáí åßíáé ôïõëÜ÷éóôïí ìÝóá\n"
-"%d ÷ñÞóôç(åò)."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2671,7 +2589,7 @@ msgstr ""
 "%d kicks ãéá ôïí ßäéï ÷ñÞóôç. ×ñçóéìïðïßçóå ôçí BADWORDS åíôïëÞ\n"
 "ãéá íá ðñïóèÝóåéò Þ íá áöáéñÝóåéò êáêÝò ëÝîåéò."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2680,20 +2598,20 @@ msgstr ""
 "åíôïëÞ\n"
 "ãéá íá ðñïóèÝóåéò Þ íá áöáéñÝóåéò êáêÝò ëÝîåéò."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Ôï Bot èá êÜíåé kick Ýíôïíïõò ÷áñáêôÞñåò, êáé èá êÜíåé ban ìåôÜ  áðü \n"
 "%d kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Ôï Bot èá êÜíåé ôþñá kick Ýíôïíïõò ÷áñáêôÞñåò."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2704,7 +2622,7 @@ msgstr ""
 "%d ÷áñáêôÞñåò êáé %d%% áðü ôï ìÞíõìá), êáé èá \n"
 "ãßíåé ban ìåôÜ áðü %d kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2713,47 +2631,47 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick êåöáëáßá (ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí\n"
 "%d ÷áñáêôÞñåò êáé %d%% áðü ôï ìÞíõìá)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá ÷ñþìáôá, êáé èá êÜíåé ban ìåôÜ áðü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Ôï Bot èá êÜíåé kick ãéá ÷ñþìáôá."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá åðáíáëÞøåéò (%d ãñáììÝò óå %d äåõôåñüëåðôá), êáé \n"
 "èá êÜíåé ban ìåôÜ áðü %d kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Ôï Bot èá êÜíåé kick ãéá åðáíáëÞøåéò (%d ãñáììÝò óå %d äåõôåñüëåðôá)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2764,7 +2682,7 @@ msgstr ""
 "ôï ßäéï ðñÜãìá), êáé èá ãßíåôáé ban ìåôÜ áðü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2773,140 +2691,156 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá åðáíáëÞøåéò (÷ñÞóôåò ðïõ ëÝíå %d öïñÝò\n"
 "ôï ßäéï ðñÜãìá)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá reverses, êáé èá êÜíåé ban ìåôÜ áðü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Ôï Bot èá êÜíåé kick ãéá reserves."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá õðïãñáììéóìÝíïõò ÷áñáêôÞñåò, êáé èá êÜíåé ban ìåôÜ "
 "áðü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñÞóôç."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Ôï Bot èá êÜíåé kick ãéá õðïãñáììéóìÝíïõò ÷áñáêôÞñåò."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Ôï Bot èá êÜíåé kick ãéá ÷ñþìáôá."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick êáêÝò ëÝîåéò ðëÝïí."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick Ýíôïíïõò ÷áñáêôÞñåò ðëÝïí."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick êåöáëáßá ðëÝïí."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá ÷ñþìáôá ðëÝïí."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá åðáíáëÞøåéò ðëÝïí."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá åðáíáëÞøåéò ðëÝïí."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá reverses ðëÝïí."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá õðïãñáììéóìÝíïõò ÷áñáêôÞñåò ðëÝïí."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Ôï Bot äåí èá êÜíåé kick êåöáëáßá ðëÝïí."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots åßíáé ìüíï ãéá IRC operators:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "ÄéáâáóìÝíá Bytes   : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "ÃñáììÝíá Bytes : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {øåõäþíõìï | êáíÜëé}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR channel what"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES channel [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Can't logout %s because he's a Services Operator."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR channel what"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Äåí ìðïñåß íá óôáëåß óôç äéåýèõíóç ôï ìÞíõìá ãéá ôçí þñá; ðáñáêáëþ "
 "ðñïóðÜèçóå ëßãï áñãüôåñá."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Changed usermodes of %s."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Áõôü ôï êáíÜëé %s äåí õðÜñ÷åé."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Ôï êáíÜëé %s äéáãñÜöôçêå áðü ôéò õðçñåóßåò."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2915,142 +2849,103 @@ msgstr ""
 "Áõôü ôï êáíÜëé %s Ý÷åé ðáñáêñáôçèåß áðü ôïí %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Ôï êáíÜëé %s åßíáé Þäç êáôï÷õñùìÝíï!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Ôï êáíÜëé %s ðáñáêñáôåßôå."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Channel %s is now released."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Channel %s is now suspended."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Áõôü ôï êáíÜëé %s äåí Ý÷åé êáôï÷õñùèåß."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Áõôü ôï êáíÜëé %s äåí ìðïñåß íá êáôï÷õñùèåß Þ íá ÷ñçóéìïðïéçèåß."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Ôï êáíÜëé %s äåí ìðïñåß íá êáôï÷õñùèåß."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Ôï êáíÜëé %s åßíáé êáôï÷õñùìÝíï áðü ôï øåõäþíõìü óïõ: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "ÊáíÜëéá       : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Ôï êáíÜëé %s èá ëÞîåé."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Ôï êáíÜëé %s äåí èá ëÞîåé."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Channel %s AOP list has been cleared."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Channel %s HOP list has been cleared."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Channel %s SOP list has been cleared."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Channel %s VOP list has been cleared."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Channel %s access list has been cleared."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Channel %s akick list has been cleared."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Channel %s is now released."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Ç åíôïëÞ Channel AOP ëßóôá ðåñéÝ÷åé ìüíï êáôï÷õñùìÝíá øåõäþíõìá."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Ç åíôïëÞ Channel HOP ëßóôá ðåñéÝ÷åé ìüíï êáôï÷õñùìÝíá øåõäþíõìá."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Ç åíôïëÞ Channel SOP ëßóôá ðåñéëáìâÜíåé ìüíï êáôï÷õñùìÝíá øåõäþíõìá."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Ç åíôïëÞ Channel SQLINEs äåí õðïóôçñßæåôáé áðü ôïí IRCd óïõ,ãéáõôï äåí "
 "ìðïñåßò íá ôéò ÷ñçóéìïðïéÞóåéò."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Ç åíôïëÞ Channel VOP ëßóôá ðåñéëáìâÜíåé ìüíï êáôï÷õñùìÝíá øåõäþíõìá."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Ç Channel access ëßóôá ðåñéëáìâÜíåé ìüíï êáôï÷õñùìÝíá øåõäþíõìá."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3058,11 +2953,7 @@ msgstr ""
 "Ëßóôá Êáíáëéïý:\n"
 "¼íïìá                 ×ñÞóôåò  ÅðéëïãÝò   Topic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Ôï êáíÜëé äåí åðéôñÝðåé ôï operator status"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3071,7 +2962,7 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3079,31 +2970,16 @@ msgstr ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description "
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Äåí ìðïñåß íá ðáñáêñáôçèåß ôï êáíÜëé %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Äåí ìðïñåßò íá ðáñáêñáôÞóåéò áõôü ôï øåõäþíõìï %s!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Couldn't release channel %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Couldn't suspended channel %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Ç Ýùò ôþñá AKILL ëßóôá åßíáé:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3111,15 +2987,15 @@ msgstr ""
 "Ç åùò ôþñá AKILL ëßóôá åßíáé:\n"
 "  Íïõ   ÌÜóêá                              Ëüãïò"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Current Module list:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Current SNLINE list:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3127,11 +3003,11 @@ msgstr ""
 "Ç Ýùò ôþñá ëßóôá SNLINE åßíáé ïé åîçò:\n"
 "  Íïõ   ÌÜóêá                              Ëüãïò"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Ç Ýùò ôþñá ëßóôá SQLINE åßíáé ïé åîÞò:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3139,11 +3015,11 @@ msgstr ""
 "Ç Ýùò ôþñá ëßóôá SQLINE åßíáé ïé åîÞò:\n"
 " Íïõ   ÌÜóêá                              Ëüãïò"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Ç Ýùò ôþñá ëßóôá SZLINE åßíáé ïé åîÞò:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3151,729 +3027,617 @@ msgstr ""
 "Ç Ýùò ôþñá ëßóôá SZLINE åßíáé ïé åîÞò:\n"
 "  Íïõ    ÌÜóêá                              Ëüãïò"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Ç Ýùò ôþñá ëßóôá Session Limit Exception åßíáé ïé åîÞò:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Ùò ôþñá õðÜñ÷ïõí AKILLs: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Ùò ôþñá õðÜñ÷ïõí SNLINEs: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Ùò ôþñá õðÜñ÷ïõí SQLINEs: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Ùò ôþñá õðÜñ÷ïõí SZLINEs: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Ïé ùò ôþñá ÷ñÞóôåò: %d (%d ops)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [êáíÜëé] {íïõ | list | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP channel"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: %d ìÝñåò"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: %d þñåò"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: %d ëåðôÜ"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: 1 ìÝñá"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: 1 þñá"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: 1 ëåðôü"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò AKILL: Äåí ëÞãåé ðïôÝ"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: %d ìÝñåò"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: %d þñåò"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: %d ëåðôÜ"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: 1 ìÝñá"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: 1 þñá"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: 1 ëåðôü"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SNLINE: Äåí ëÞãåé ðïôÝ"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: %d ìÝñåò"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: %d þñåò"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: %d ëåðôÜ"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: 1 ìÝñá"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: 1 þñá"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: 1 ëåðôü"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SQLINE: Äåí ëÞãåé ðïôÝ"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: %d ìÝñåò"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: %d þñåò"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: %d ëåðôÜ"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: 1 ìÝñá"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: 1 þñá"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: 1 ëåðôü"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Åîáñ÷Þò ÷ñüíïò ëÞîçò SZLINE: Äåí ëÞãåé ðïôÝ"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí AOP ëßóôá ôïõ %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ÇOP ëßóôá ôïõ %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü %s access list."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí autokick list %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôï %s ,ôç ëßóôá ôùí êáêþí ëÝîåùí."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá session-limit exception."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá AKILL."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá SNLINE."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá SQLINE."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá SZLINE."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí AOP ëßóôá ôïõ %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "ÄéáãñÜöçêå 1 8Ýóç áðü ôçí HOP ëßóôá ôïõ %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "ÄéáãñÜöçêå 1 8Ýóç áðü ôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "ÄéáãñÜöçêå 1 8Ýóç áðü ôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "ÄéáãñÜöåé 1 èÝóç áðü %s access list."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "ÄéáãñÜöôçêå 1 èÝóç áðü ôçí autokick list %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôïõ %s ëßóôá êáêþí ëÝîåùí."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá session-limit exception."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá AKILL."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá SNLINE."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá SQLINE."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá SZLINE."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "ÄéáãñÜöçêå 1 èÝóç áðü ôçí AOP ëßóôá ôïõ %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "ÐåñéãñáöÞ ôïõ %s Üëëáîå óå %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "áðåíåñãïðïéçìÝíï"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Displayed all records (Count: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Displayed records from %d to %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Displayed records matching key %s (Count: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Ìçí ÷ñçóéìïðïéåßò Ýíôïíïõò ÷áñáêôÞñåò ìÝóá óôï êáíÜëé!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Ìçí ÷ñçóéìïðïéåßò ÷ñþìáôá ìÝóá óôï êáíÜëé!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Ìçí åßóáé áíôßèåôïò ìÝóá óôï êáíÜëé!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Ìçí ÷ñçóéìïðïéåßò áõôÞ ôç ëÝîç %s óôï êáíÜëé!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Ìçí ÷ñçóéìïðïéåßò ÷áñáêôÞñåò õðïãñÜììéóçò óôï êáíÜëé!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Ç äéåýèõíóç ôïõ e-mail áðåíåñãïðïéÞèçêå."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "Ç äéåýèõíóç ãéá %s åßíáé ëáíèáóìÝíç."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Match %s to %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "åíåñãïðïéçìÝíï"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "End of %s list."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Ôåëïò ôçò ëßóôáò ðñïóâáóçò."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "ÔÝëïò ëßóôáò êáíáëéïý."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "ÔÝëïò ôçò ëßóôáò - %d/%d âñÝèçêáí êáé åìöáíßóôçêáí."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "ÔÝëïò ôçò ëßóôáò - %d/%d âñÝèçêáí êáé åìöáíßóôçêáí."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "ÔÝëïò ëßóôáò ÷ñçóôþí."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "ÅëëçíéêÜ"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Ôï ìÞíõìá õðïäï÷Þò ôïõ %s Üëëáîå."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Ôï ìÞíõìá õðïäï÷Þò ôïõ %s äåí Ý÷åé ïñéóôåß."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Exception ãéá %s (#%d) ìåôáêéíÞèçêå óôç èÝóç %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Ôï ÷ñïíéêü üñéï ôïõ/çò %s Üëëáîå"
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID êáíÜëé ëüãïò"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID êáíÜëé [ëüãïò]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nickname reason"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nickname [reason]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Öáíôáóßá"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Ç Fantasy åðéëïãÞ åßíáé ôþñá ON óôï êáíÜëé %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Ç Fantasy åðéëïãÞ åßíáé ôùñá OFF óôï êáíÜëé %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Ç Fantasy åðéëïãÞ åßíáé ôþñá ON óôï êáíÜëé %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s will no longer be ignored."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Ï Founder ôïõ %s Üëëáîå êáé ðÞãå óôïí %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host No WildCards!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr ""
 "Ç GETPASS åíôïëÞ äåí åßíáé äéáèÝóéìç ãéáôß ÷ñçóéìïðïéåßôáé ç êùäéêïðïßçóç."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [password]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL message"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP ^_óôü÷ïò^_ ^_êùäéêü^_"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Ôï øåõäþíõìï óïõ Ýãéíå kill ìÝóù ghost åíôïëÞò."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "×áéñåôéóìüò"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Ôï ìÞíõìá ÷áéñåôéóìïý íá äéáôõðþíåôáé"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Ç åðéëïãÞ ÷áéñåôéóìïý åßíáé OFF óôï êáíÜëé %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Ç åðéëïãÞ ÷áéñåôéóìïý åßíáé ON óôï êáíÜëé %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Ç HOP ëßóôá ôïõ %s åßíáé:\n"
-"  Íïýìåñï  Øåõäþíõìï"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"You have requested to have the pasword for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts ìå ôï ëéãüôåñï %d sessions:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY ^_êùäéêü^_"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO channel"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {chan | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE êáíÜëé"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 "Áí äåí áëëÜîåéò ôï øåõäþíõìï áõôü ìÝóá óå 20 äåõôåñüëåðôá, èá óôï áëëÜîù "
 "áõôüìáôá åãþ."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 "Áí äåí áëëÜîåéò ôï øåõäþíõìï áõôü ìÝóá óå Ýíá ëåðôü, èá óôï áëëÜîù áõôüìáôá "
 "åãþ."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Ç åíôïëÞ Ignore èá ÷ñçóéìïðïéåßôáé."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Ç åíôïëÞ Ignore äåí ÷ñçóéìïðïéåßôáé."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ignore list has been cleared."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Ç ëßóôá ignore ôùí õðçñåóéþí åßíáé Üäåéá."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Bot ëßóôá:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3889,29 +3653,25 @@ msgstr ""
 "ÐëçêôñïëïãÞóôå /msg %S HELP SET åðéëïãÞ ãéá ðåñéóóüôåñåò ðëçñïöïñßåò\n"
 "óå ìßá óõãêåêñéìÝíç åðéëïãÞ."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Ðëçñïöïñßåò ãéá ôï bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Ðëçñïöïñßåò ãéá ôï êáíÜëé %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Åóùôåñéêü ëÜèïò - áäýíáôç ðñüóâáóç óôç ðáñÜêëçóç."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "ËáíèáóìÝíïò ÷ñüíïò ëÞîçò."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3919,13 +3679,13 @@ msgstr ""
 "ËÜèïò hostmask. Ìüíï ðñáãìáôéêÜ hostmasks ÷ñçóéìïðïéïýíôáé êáé ü÷é øåõäþíõìá "
 "Þ usernames."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Invalid passcode has been entered, please check the e-mail again, and retry."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3934,297 +3694,311 @@ msgstr ""
 "ËÜèïò session limit. ÐñÝðåé íá åßíáé ëÜèïò ï integer greater Þ ðñÝðåé íá "
 "åßíáé ìåôáîý ìçäÝí êáé %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "ËÜèïò threshold value. ÐñÝðåé íá åßíáé ìåãáëýôåñï áðü ôï 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE servername [reason]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK channel option {ON|OFF} [settings]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK channel user reason"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST pattern"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [êáíÜëé] [list | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Ç ãëþóóá Üëëáîå óå ÅëëçíéêÜ."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ôï ôåëåõôáßï ìÞíõìá ðïõ ðÞãáéíå ãéá ôïí %s áêõñþèçêå."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Ôåëåõôáßï áðï÷áéñåôéóôÞñéï ìÞíõìá: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ôåëåõôáßá äéåýèõíóç: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Ï âáèìüò ãéá ôïí %s óôï êáíÜëé %s Üëëîå óå %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Ï âáèìüò ðñÝðåé íá åßíáé ìåôáîý %d êáé %d."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "ÁõôÞ ç åíôïëÞ åßíáé ÷ñÞóéìç ãéá áõôÞ ôçí åðéëïãÞ."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Ç ëßóôá ìå ôéò êáôá÷ùñÞóåéò âñÝèçêáí %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Ç ëßóôá ìå ôá øåõäþíõìá óôçí ïìÜäá ôïõ %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Ç ëßóôá ìå ôá øåõäþíõìá óôçí ïìÜäá:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "ÊáíÜëéá ôïðéêÜ äåí ìðïñïýí íá êáôï÷õñùèïýí."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Êáíïíéóìüò Þ ðëçñïöïñßá óôç èÝóç #%d äéáãñÜöçêå."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Êáíïíéóìüò óôç èÝóç #%d äåí âñÝèçêå!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Êáíïíéóìïß:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE channel modes"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO FileName"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD FileName"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Ç ìÜóêá %s åßíáé Þäç ìÝóá óôçí ëßóôá ðñüóâáóçò."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Ç ìÜóêá ðñÝðåé íá åßíáé ôçò ìïñöÞò user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "ÌÝãéóôïé ÷ñÞóôåò: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "ÌÞíõìá %d áðü ôï %s (%s).  Ãéá íá ôï óâÞóåéò, ãñÜøå: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "ÌÞíõìá %d áðü %s (%s).  Ãéá íá ôï óâÞóåéò, ãñÜøå: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "ÌÞíõìá %d äéáãñÜöçêå."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Ôï üñéï ìçíõìÜôùí áðåíåñãïðïéÞèçêå ãéá ôïí %s."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Ôï üñéï ìçíõìÜôùí ãéá ôïí %s Üëëáîå óå %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Ôï üñéï ìçíõìÜôùí ãéá ôïí %s Üëëáîå óå 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr ""
 "Ôï üñéï ìçíõìÜôùí åßíáé ðïëý ìåãÜëï; ïñéïèÝôçóÝ ôï %d óõìðåñéëáìâáíïìÝíïõ."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Ôï ìÞíõìá óôÜëèçêå óôïí %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "ÌÞíõìá ãéá ôïí %s.  Ãéá íá ôï äéáâÜóåéò, ãñÜøå: /msg %s READ num"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Ìçíýìáôá ãéá ôïí %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ %s num"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "ÌÞíõìá ãéá ôïí %s.  Ãéá íá ôï äéáâÜóåéò, ãñÜøå: /msg %s READ num"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Ìçíýìáôá ãéá ôïí %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ %s num"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "ÅðéëïãÞ ìçíýìáôïò"
 
-#: language.cpp:866
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Ç åðéëïãÞ %c áãíïÞèçêå ãéáôß äåí ìðïñåßò íá ôï êëåéäþóåéò."
-
-#: language.cpp:1314
-#, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "¼ëá ôá Mode +o Ý÷åé êáèáñéóôåß áðü ôï êáíÜëé %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Ç åðéëïãÞ êëåéäþìáôïò óôï êáíÜëé %s Üëëáîå óå %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "      ÅðéëïãÝò êëåéäþìáôïò: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s loaded"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s loaded"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s unloaded"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Author: %s loaded: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliases    : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS ÏìÜäåò     : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Ôá bot's íá ìçí ðåôÜíå Ýîù ôïõò kickers"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "New memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "ÍÝá ìçíýìáôá ãéá ôïí %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ num"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr ""
 "ÍÝá ìçíýìáôá ãéá ôï %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ %s num"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Ç ëßóôá ôùí íÝùí åßíáé ãåìÜôç!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4233,146 +4007,132 @@ msgstr ""
 "Áõôü ôï øåõäþíõìï %s Ý÷åé ðáñáêñáôçèåß áðü ôïí %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is an illegal nickname and cannot be used."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is currently in use."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Ôï øåõäþíõìï %s áðü ôþñá ðáñáêñáôåßôáé."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Ôï øåõäþíõìï %s äåí êñáôåßôáé.."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Áõôü ôï øåõäþíõìï %s äåí ÷ñçóéìïðïéåßôå áõôÞ ôç óôéãìÞ."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Áõôü ôï øåõäþíõìï %s äåí åßíáé êáôï÷õñùìÝíï."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Áõôü ôï øåõäþíõìï %s äåí ìðïñåß íá êáôï÷õñùèåß Þ íá ÷ñçóéìïðïéçèåß."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s not found on ignore list."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s doesn't have a memo from you."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Ôï øåõäþíõìü óïõ %s äåí êáôÝ÷åôáé ãéá ôçí þñá."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is currently suspended."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NOT registered, please try again later."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nickname %s confirmed"
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Ôï øåõäþíõìï %s óâÞóôçêå åðéôõ÷þò áðü ôçí õðçñåóßá."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Áõôü ôï øåõäþíõìï %s åßíáé Þäç êáôï÷õñùìÝíï!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Áõôü ôï øåõäþíõìï %s äåí ìðïñåß íá êáôï÷õñùèåß."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Áõôü ôï øåõäþíõìï %s êáôï÷õñþèçêå õðü ôçí äéåýèõíóÞ óïõ: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Nickname Registration (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Ï êùäéêüò ôïõ øåõäþíõìïõ (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4383,161 +4143,116 @@ msgstr ""
 "ôçò áõôüìáôçò ëÞîçò, ð.ò. èá äéáãñÜöïíôáé áõôüìáôá\n"
 "ìåôÜ áðü %d ìÝñåò áí äåí ÷ñçóéìïðïéïýíôáé."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "No # found in front of channel name."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "ÊáíÝíá Bot Ý÷åé åðéëïãÞ OFF óôï êáíÜëé %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "ÊáíÝíá Bot Ý÷åé åðéëïãÞ ON óôï êáíÜëé %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No Emails listed for %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "ÊáíÝíá bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Äåí õðÜñ÷åé äéáèÝóéìç âïÞèåéá ãéá %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No information about module %s is available"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "ÊáíÝíáò Êáíïíéóìüò Þ ðëçñïöïñßá ãéá íá äéáãñáöåß!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí AOP ëßóôá ôïõ %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Äåí âñÝèçêáí èÝóåéò óôçí HOP ëßóôá ôïõ %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Äåí âñÝèçêáí èÝóåéò óôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Äåí âñÝèçêáí èÝóåéò óôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôïõ %s óôçí access list."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí autokick list ôïõ %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Äåí âñÝèçêáí ïé èÝóåéò óôçí ëßóôá ôùí êáêþí ëÝîåùí ôïõ %s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá session-limit exception."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá AKILL."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá SNLINE."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá SQLINE."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá SZLINE."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "ÊáíÝíá ìÞíõìá äåí áêõñþèçêå."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "No modules currently loaded"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Äåí õðÜñ÷ïõí èÝóåéò óôçí ëßóôá ãéá íá äéáãñÜøåéò!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Äåí âñÝèçêáí ìçíýìáôá ãéá íá äéáãñáöïýí!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "×ùñßò ëüãïò"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "¼÷é signed kick üôáí ôï SIGNKICK LEVEL ÷ñçóéìïðïéåßôáé"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí AOP ëßóôá ôïõ %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí HOP ëßóôá ôïõ %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí SOP ëßóôá ôïõ %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí VOP ëßóôá ôïõ %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "ÊáíÝíá"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Äåí åðéôñÝðåôáé íá ìðåßôå óôï êáíÜëé áí åßíáé RESTRICTED"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4548,95 +4263,93 @@ msgstr ""
 "(äçë êáíÝíáò ÷ñÞóôçò ðïõ Ý÷åé access äåí ìðÝíåé óôï êáíÜëé\n"
 "ãéá åêåßíç ôçí ðåñßïäï ôùí çìåñþí) èá äéáãñáöåß áõôüìáôá."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Íïõ  Limit  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "Ðïéïò ÷ñçóéìïðïßçóå OP"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]\t"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Ïé ðáëéÝò ðëçñïöïñßåò åßíáé ßäéåò ìå ôéò êáéíïýñãéåò."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Op-notice option for %s is now OFF."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Op-notice option for %s is now ON."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Ç èÝóç #%d äéáãñÜöçêå."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Ç èÝóç #%d óôçí ëßóôá äåí âñÝèçêå!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "ÍÝá ôùí Opers:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "An O:Line with the flags %s has been added for %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Ðñïóôáóßá óôïõò Ops"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Ç åðéëïãÞ %s äåí ìðïñåß íá ÷ñçóéìïðïéçèåß óôï äßêôõï áõôü."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Passcode for %s is %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Ï êùäéêüò Ýãéíå äåêôüò - ôþñá åßóáé áíáãíùñéóìÝíïò."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4644,60 +4357,56 @@ msgstr ""
 "Ï êùäéêüò áíáãíþñéóçò áðáéôåßôáé ãéá áõôÞ ôçí åíôïëÞ.\n"
 "ÎáíáðñïóðáèÞóôå áöïý ãñÜøåôå /msg %s IDENTIFY ^_êùäéêüò^_."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Ï êùäéêüò ãéá ôïí %s åßíáé %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "ËÜèïò êùäéêüò."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Ï êùäéêüò ôïõ %s Ý÷åé óôáëèåß."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Åéñçíéêü"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Peace option for %s is now OFF."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Peace option for %s is now ON."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 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."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4706,176 +4415,135 @@ msgstr ""
 "(ð.÷. ôï ðñáãìáôéêü ïíïìÜ óïõ Þ ôï øåõäþíõìï óïõ), êáé íá ìçí ðåñéÝ÷åé êåíü "
 "Þ äéÜöïðïõò Üëëïõò ÷áñáêôÞñåò."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Please use a valid server name when juping"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Please use the symbol of # when attempting to register"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Ðáñáêáëþ ðåñßìåíå %d äåõôåñüëåðôá êáé îáíáðñïóðÜèçóå."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Ðáñáêáëþ ðåñßìåíå %d äåõôåñüëåðôá êáé ìåôÜ îáíá÷ñçóéìïðïßçóå ôçí åíôïëÞ "
 "ïìáäïðïßçóçò."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Ðáñáêáëþ ðåñßìåíå %d äåõôåñüëåðôá êáé ìåôÜ îáíá÷ñçóéìïðïßçóå ôçí åíôïëÞ "
 "êáôï÷ýñùóçò îáíÜ."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Please wait %d seconds before using the RSEND command again."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Ðáñáêáëþ ðåñßìåíå %d äåõôåñüëåðôá ðñéí ÷ñçóéìïðïéÞóåéò ôçí åíôïëÞ SEND îáíÜ."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Ìõóôéêüôçôá"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Ìõóôéêüôçôá åðéëïãÞò ôïõ bot %s åßíáé ôþñá OFF."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Ìõóôéêüôçôá åðéëïãÞò ôïõ bot %s åßíáé ôþñá ON."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Private option for %s is now OFF."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Private option for %s is now ON."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Ðñïóôáóßá"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr ""
-"Ç åðéëïãÞ ðñïóôáóßáò åßíáé ôþñá ON, ìå êáíÝíá ðåñéèþñéï íá ãßíåé åíôïëÞ "
-"áíáãíþñéóçò."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Providing command: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [êáíÜëé] {list | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [password]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER channel description"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER ^_êùäéêü^_ ^_email^_"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER ^_êùäéêü^_ [^_email^_]\t"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [password]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | channel} memo-text"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Ôï ìÞíõìá óôçí èÝóç #%d äéáãñÜöçêå."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Ôï ìÞíõìá óôçí èÝóç #%d äåí âñÝèçêå!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "ÍÝá ãéá ôï äßêôõï:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4883,297 +4551,308 @@ msgstr ""
 "Registration step 1 may have expired, please use \"/msg %s register "
 "<password> <email>\" first."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Ìüíï üóïé Ý÷ïõí Access"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Restricted access option for %s is now OFF."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Restricted access option for %s is now ON."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY channel text"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {øåõäþíõìï | êáíÜëé} ðåñéå÷üìåíï"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr ""
 "Ç SENDPASS åíôïëÞ äåí åßíáé äéáèÝóéìç ãéáôß ÷ñçóéìïðïéåßôáé ç êùäéêïðïßçóç."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST üñéï"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET channel option settings"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET channel NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET channel PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET channel option parameters"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET channel DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET channel DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET channel FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET channel GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET channel OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET channel NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET channel PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET channel SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET channel SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET channel SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET channel XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET ^_åðéëïãÞ^_ ^_ðáñÜìåôñïé^_"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET option setting"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE ^_number^_"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [êáíÜëé] üñéï"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [÷ñÞóôçò | êáíÜëé] {üñéï | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "Ç ëßóôá SNLINE åßíáé Üäåéá."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5181,341 +4860,326 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Ç SOP ëßóôá ôïõ %s åßíáé:\n"
-"  Íïýìåñï  Øåõäþíõìï"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "Ç ëßóôá SQLINE åßíáé Üäåéá."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
 "[reason]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Channel %s not registered"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND channel reason"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND channel [reason]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND channel reason"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick newnick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "Ç ëßóôá SZLINE åßíáé Üäåéá."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
 "[reason]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "ÁóöáëÝò"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "ÁóöÜëåéá óôïí ÊáíáëÜñ÷ç"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Ìüíï áõôïß ðïõ Ý÷ïõí access èá ðáßñíïõí op áðü opers"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Secure founder option for %s is now OFF."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Secure founder option for %s is now ON."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Secure ops option for %s is now OFF."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Secure ops option for %s is now ON."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Secure option for %s is now OFF."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Secure option for %s is now ON."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "ÁóöÜëåéá"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "This service is temporarly disabled, please try again later"
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services are now at DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Ôá Services åßíáé ôþñá óå åðéëïãÞ íá ëÞãåé."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Ôá Services åßíáé ôþñá óå åðéëïãÞ íá ìçí ëÞãåé."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Ôá Services åßíáé ôþñá ìüíï áíÜãíùóçò."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Ôá Services åßíáé óå åðéëïãÞ áíÜãíùóçò-åããñáöÞò."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Ôá Services åßíáé ôþñá óå debug åðéëïãÞ (âáèìüò %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Ôá Services åßíáé ôþñá óå debug åðéëïãÞ."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Ôá Services åßíáé ôþñá óå ìç-debug åðéëïãÞ."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Ïé õðçñåóßåò Ý÷ïõí ñõèìéóôåß íá ìçí óôÝëíïõí ìÞíõìá óôç äéåýèõíóç."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Ç ëßóôá ignore ãéá ôéò õðçñåóßåò:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Ïé õðçñåóßåò áäõíáôïýí íá áëëÜîïõí ôéò åðéëïãÝò.  Ïé servers åßíáé óùóôÜ "
-"öôéáãìÝíïé?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Ïé õðçñåóßåò áäõíáôïýí íá áëëÜîïõí ôéò åðéëïãÝò.  Ïé servers' U: ãñáììÝò "
 "åßíáé ïé óùóôÝò?"
 
-#: language.cpp:1939
+#: modules/core/os_stats.cpp:137
 #, c-format
-msgid "Services up %d day, %02d:%02d"
+msgid "Services up %d days, %02d:%02d"
 msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ìÝñåò, %02d:%02d"
 
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ìÝñåò, %02d:%02d"
+msgid "Services up %d hours, %d minutes"
+msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñåò, %d ëåðôÜ"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñá, %d ëåðôü"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôÜ, %d äåõôåñüëåðôá"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñá, %d ëåðôÜ"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñåò, %d ëåðôü"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñåò, %d ëåðôÜ"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôü, %d äåõôåñüëåðôï"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôü, %d äåõôåñüëåðôá"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôÜ, %d äåõôåñüëåðôï"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôÜ, %d äåõôåñüëåðôá"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Ôï áñ÷åßï ôùí õðçñåóéþí,conf file Ýãéíå reloaded,åðáíáöïñôþèçêå."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Ïé õðçñåóßåò áðåëåõèÝñùááí ôï øåõäþíõìü óïõ."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Session limit ãéá ôïí %s ñõèìßóôçêå óå %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Ç Session limiting  åíôïëÞ åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessions      : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Ç åðéëïãÞ %s äåí åßíáé ãíùóôÞ.  ÃñÜøå /msg %s HELP LEVELS DESC ãéá ôç ëßóôá "
 "ìå ôéó áíáëõôéêÝò åðéëïãÝò."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr ""
 "Ç åðéëïãÞ ãéá DEBUG ðñÝðåé íá åßíáé ON, OFF, Þ Ýíá êáôçãïñéìáôéêü íïýìåñï."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Ç åðéëïãÞ ãéá IGNORE ðñÝðåé íá åßíáé ON Þ OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Ç åðéëïãÞ ãéá NOEXPIRE ðñÝðåé íá åßíáé ON Þ OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "Ç åðéëïãÞ ãéá READONLY ðñÝðåé íá åßíáé ON Þ OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr "Setting for SuperAdmin must be ON or OFF."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Signed kick option for %s is now OFF."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Signed kick option for %s is now ON."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5524,216 +5188,187 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Signed kick option for %s is now ON."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "ÄçëùìÝíá kicks"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND has been disabled on this network."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá bot assignment åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Óõãíþìç, ç äçìéïõñãßá ôïõ bot áðÝôõ÷å."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôï bot åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá bot åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ AOP åßíáé åêôüò ëåéôïõñãßáò."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ HOP åßíáé åêôüò ëåéôïõñãßáò."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ SOP åßíáé åêôüò ëåéôïõñãßáò."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ VOP åßíáé åêôüò ëåéôïõñãßáò."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ access åßíáé åêôüò ëåéôïõñãßáò."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ akick åßíáé åêôüò ëåéôïõñãßáò."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá bad words åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá äéáãñáöÞò êáíáëéþí åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr ""
 "Óõãíþìç, ïé åðéëïãÝò ãéá ôçí ñýèìéóç ôùí êáíáëéþí åßíáé áðåíåñãïðïéçìÝíåò."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá êáôï÷ýñùóåéò êáíáëéþí äåí ëåéôïõñãåß ãéá ôçí þñá."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr ""
-"Óõãíþìç, ç ïìáäïðïßçóç ôïõ øåõäþíõìïý óïõ åßíáé ãéá ôçí þñá áðåíåñãïðïéçìÝíç."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Óõãíþìç, ç áíáãíþñéóç áðÝôõ÷å."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Óõãíþìç, ç õðçñåóßá kicker åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Óõãíþìç, ç åíôïëÞ setting åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr ""
 "Óõãíþìç, ôá ìçíýìáôá äåí ìðïñïýí íá óôáëïýí ãéáôß åßíáé áíåíåñãÞ ç õðçñåóßá."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 "Óõãíþìç, ç õðçñåóßá ãéá íá óâÞíåé ôá  øåõäþíõìá åßíáé áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr ""
 "Óõãíþìç, ç ïìáäïðïßçóç ôïõ øåõäþíõìïý óïõ åßíáé ãéá ôçí þñá áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr ""
 "Óõãíþìç, ç õðçñåóßá ãéá ôïí êáèïñéóìü êáé ôéò åðéëïãÝò ôïõ øåõäþíõìïõ åßíáé "
 "ãéá ôçí þñá áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Óõãíþìç, ç êáôï÷ýñùóç øåõäþíõìïõ åßíáé  ãéá ôçí þñá áðåíåñãïðïéçìÝíç."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Óõãíþìç, ç êáôï÷ýñùóç áðÝôõ÷å."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Óõãíþìç, ìðïñåßò ìüíï íá ÷ñçóéìïðïéÞóåéò %d AOP/SOP/VOP óôï êáíÜëé."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Óõãíþìç, ìðïñåßò ìüíï íá Ý÷åéò %d access óôï êáíÜëé."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Óõãíþìç, ìðïñåßò ìüíï íá Ý÷åéò %d ðñüóâáóç óå êáôÜôáîç ôïõ øåõäþíõìïõ."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Óõãíþìç, ìðïñåßò ìüíï íá Ý÷åéò %d access óôï êáíÜëé."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Óõãíþìç, ìðïñåßò ìüíï íá Ý÷åéò %d autokick ìÜóêá óôï êáíÜëé."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Óõãíþìç, ìðïñåßò ìüíï íá Ý÷åéò %d êáêÝò ëÝîåéò ãéá Ýíá êáíÜëé."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Óõãíþìç, Ý÷åéò Þäç îåðåñÜóåé ôï üñéï êáôï÷ýñùóåéò ôùí %d êáíáëéþí."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Óõãíþìç, Ý÷åéò Þäç öôÜóåé óôï üñéï êáôï÷ýñùóåéò ôùí %d êáíáëéþí."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Ôá óôáôéóôéêÜ óâÞóôçêáí."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status updated (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Ìçí åðáíáëáìâÜíåéò óå ðïëëÝò óåéñÝò!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Ìçí åðáíáëáìâÜíåéò ôá ßäéá!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Ï Successor ôïõ %s äåí Ý÷åé ïñéóôåß."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Ï Successor ôïõ %s Üëëáîå êáé ðÞãå óôïí %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Óõìâßùóç"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "ÅðéëïãÞ óõìâßùóçò åßíáé ôþñá OFF óôï êáíÜëé %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "ÅðéëïãÞ óõìâßùóçò åßíáé ôþñá ON óôï êáíÜëé %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Óýíôáîç åíôïëÞò: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5761,7 +5396,7 @@ msgstr ""
 "2: ôï ban èá åßíáé ôçò ìïñöÞò *!*@host\n"
 "3: ôï ban èá åßíáé ôçò ìïñöÞò *!*user@*.domain"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5774,27 +5409,12 @@ msgstr ""
 "ÁëëÜæåôå ôçí ðåñéãñáöÞ ôïõ êáíáëéïý, ç ïðïßá öÝíåôáé ìå ôçí åíôïëÞ\n"
 "LIST êáé INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Óýíôáîç: %s êáíÜëé ENTRYMSG [ìÞíõìá]\n"
-"\n"
-"ÁëëÜæåé ôï ìÞíõìá åéóáãùãÞò ôï ïðïßï óôÝëíåôå óå êÜèå ÷ñÞóôç ìÝóù /notice\n"
-"(ðáñáôÞñçóç) üôáí áõôüò ìðÝíåé óôï êáíÜëé.  Áí äåí äùèåß êáìßá ðáñÜìåôñïò,\n"
-"äåí èá óôÝëíåôå êáíÝíá ìÞíõìá óôï ÷ñÞóôç,ï ïðïßïò èá åéóÝñ÷åôáé óôï êáíÜëé."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Óýíôáîç: %s êáíÜëé FOUNDER øåõäþíõìï\n"
@@ -5802,7 +5422,7 @@ msgstr ""
 "ÁëëÜæåé ôïí founder ôïõ êáíáëéïý.  Ôï íÝï øåõäþíõìï ðñÝðåé íá åßíáé\n"
 "êáôï÷õñùìÝíï."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5820,79 +5440,7 @@ msgstr ""
 "èá õðåíèõìßæåôáé áðü ôïí %S ìåôÜ ôïí ôåëåõôáßï ÷ñÞóôç ðïõ èá öýãåé áðü\n"
 "ôï êáíÜëé, êáé èá áðïèçêåýåôáé ãéá ôçí åðüìåíç öïñÜ."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Óýíôáîç: %s êáíÜëé MLOCK modes\n"
-"    \n"
-"Êáèïñßæåé ôï êëåßäùìá ôùí modes ãéá ôï êáíÜëé. Ï %S\n"
-"óáò åðéôñÝðåé íá êáèïñßóåôå óõãêåêñéìÝíá modes ãéá ôï êáíÜëé\n"
-"ôá ïðïßá èá åßíáé ðÜíôá åíåñãïðïéçìÝíá (Þ ü÷é).  Ôá modes\n"
-"ðïõ ìðïñïýí íá êëåéäùèïýí åßíáé: i, k, l, m, n, p, s, êáé t.\n"
-"ÊÜèå Ýíá áðü áõôÜ ôá modes ìðïñåß íá êëåéäùèåß, íá îåêëåéäùèåß íá\n"
-"ìç óõìðåñéëçöèåß êáèüëïõ.\n"
-"\n"
-"Ç ðáñÜìåôñïò modes óõíôÜóóåôáé ìå ôïí ßäéï ôñüðï üðùò ç åíôïëÞ \n"
-"/MODE. ¸ôóé ôá modes ìåôÜ áðü Ýíá + êëåéäþíïíôáé êáé ôá modes ìåôÜ \n"
-"áðü Ýíá - îåêëåéäþíïíôáé.\n"
-"    \n"
-"Ðñïóï÷Þ:  Áí ÷ñçóéìïðïéåßôå ôï mode êëåéäþìáôïò ìå êëåéäß,\n"
-"üðùò óôï äåýôåñï ðáñÜäåéãìá ðáñáêÜôù, èá ðñÝðåé åðßóçò íá\n"
-"åíåñãïðïéÞóåôå ôçí åðéëïãÞ RESTRICTED ãéá ôï êáíÜëé (äåßôå\n"
-"HELP SET RESTRICTED), áëëéþò ïðïéïóäÞðïôå ìðáßíåé óôï\n"
-"êáíÜëé üôáí áõôü åßíáé Üäåéï, èá ìðïñåß íá äåß ôï êëåéäß!\n"
-"\n"
-"Ðáñáäåßãìáôá:\n"
-"\n"
-"    SET #êáíÜëé MLOCK +nt-iklps\n"
-"        Åíåñãïðïéåß ôá modes n êáé t, êáé áðåíåñãïðïéåß ôá modes i,\n"
-"        k, l, p êáé s. Ôï mode m, äå óõìðåñéëáìâÜíåôáé ãéá íá ìðïñåß\n"
-"    íá åßíáé åíåñãïðïéçìÝíï Þ ìç.\n"
-"\n"
-"    SET #êáíÜëé MLOCK +knst-ilmp my-key\n"
-"        Åíåñãïðïéåß ôá modes k, n, s êáé t, êáé áðåíåñãïðïéåß ôá\n"
-"        modes i, l, m êáé p.  Åðßóçò êáèïñßæåé ôï êëåéäß ôïõ êáíáëéïý\n"
-"        íá åßíáé \"my-key\".\n"
-"\n"
-"    SET #êáíÜëé MLOCK +\n"
-"        Áöáéñåß ôï êëåßäùìá ôùí modes.  ¼ëá ôá modes ôïõ\n"
-"        êáíáëéïý åßíáé åëåýèåñá íá åíåñãïðïéçèïýí Þ íá\n"
-"    áðåíåñãïðïéçèïýí."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5910,7 +5458,7 @@ msgstr ""
 "êáé \n"
 "ACCESS áðü êÜðïéï ÷ñÞóôç ãéá ôï êáíÜëé."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5927,7 +5475,7 @@ msgstr ""
 "ban Þ íá áöáéñÝóåé op áðü êÜðïéïí ÷ñÞóôç ï ïðïßïò Ý÷åé ìåãáëýôåñï\n"
 "level áðü áõôüí Þ ßóï ìå áõôüí ìÝóù åíôïëþí %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5972,7 +5520,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5986,13 +5534,13 @@ msgstr ""
 "¼ôáí åíåñãïðïéåßôáé ç private åíôïëÞ,  ôï êáíÜëé äå óõìðåñéëáìâÜíåôáé\n"
 "óôç ëßóôá ðïõ ðñïêýðôåé áðü ôçí åíôïëÞ /msg %S LIST."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Óýíôáîç: %s êáíÜëé RESTRICTED {ON | OFF}\n"
@@ -6001,7 +5549,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -6020,7 +5568,7 @@ msgstr ""
 "ìå ôïí êùäéêü ôïõò, èá Ý÷ïõí ðñüóâáóç óôï êáíÜëé üðùò ïñßæåôáé êáé\n"
 "áðü ôç ëßóôá ðñüóâáóçò."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6040,51 +5588,12 @@ msgstr ""
 "áíáãíþñéóçò ìå ôïí %S.\n"
 "    "
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Óýíôáîç: %s êáíÜëé SECUREOPS {ON | OFF}\n"
-"\n"
-"Åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí åðéëïãÞ ðñïóôáôåõìÝíçò äéá÷åßñçóçò\n"
-"ãéá Ýíá êáíÜëé.  ¼ôáí åíåñãïðïéåßôáé ç ðñïóôáôåõìÝíç äéá÷åßñçóç, ïé\n"
-"÷ñÞóôåò ðïõ äåí åßíáé óôç ëßóôá ðñüóâáóçò, äå ìðïñïýí íá ðÜñïõí op."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Óýíôáîç: %s êáíÜëé SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí åðéëïãÞ signed kicks ôïõ\n"
-"êáíáëéïý.  ¼ôáí åíåñãïðïéåßôáé ç åðéëïãÞ SIGNKICK, ôá kicks èá \n"
-"åêôåëïýíôáé  %S KICK command will have the nick that used the\n"
-"ìå åíôïëÞ ðåñéÝ÷ïíôáò ôïí ëüãï.\n"
-"\n"
-"Áí ÷ñçóéìïðïéåßò LEVEL, áõôïß ðïõ Ý÷ïõí ìåãáëýôåñç level Þ ßóç \n"
-"ìå ôçí SIGNKICK level ôïõ êáíáëéïý äåí èá Ý÷ïõí \n"
-"kicks signed. Äåò /msg %S HELP LEVELS ãéá ðåñéóóüôåñåò ðëçñïöïñßåò. "
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6101,24 +5610,7 @@ msgstr ""
 "áí äçë Ý÷åé (%d), ôï êáíÜëé èá óâçóôåß,óáí íá ìçí åß÷å ïñéóôåß\n"
 "successor.  Ôï íÝï øåõäþíõìï èá ðñÝðåé íá åßíáé êáôï÷õñùìÝíï."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Óýíôáîç: %s êáíÜëé KEEPTOPIC {ON | OFF}\n"
-"\n"
-"Åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí åðéëïãÞ êëåßäùìá topic ôïõ êáíáëéïý.\n"
-"¼ôáí ôï êëåßäùìá topic åßíáé on, ï %S äåí èá åðéôñÝðåé óå êáíÝíáí íá "
-"áëëÜîåé\n"
-"ôï topic ôïõ êáíáëéïý åêôüò ôçò åíôïëÞò TOPIC ôïõ."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6157,10 +5649,11 @@ msgstr ""
 "Áí áðü xOP system ôï ãõñßóåôå óå access system\n"
 "äåí èá õðÜñîåé êáíÝíá ðñüâëçìá."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6173,18 +5666,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6242,7 +5739,7 @@ msgstr ""
 "\n"
 "Ç åíôïëÞ ACCESS CLEAR äéáãñÜöåé üëåò ôéó èÝóåéò ôçò ëßóôáò access."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6292,7 +5789,7 @@ msgstr ""
 "        Åìöáíßæåé ôçí ôñÝ÷ïõóá ëßóôá ðñüóâáóçò.\n"
 "    "
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6304,12 +5801,18 @@ msgstr ""
 "ÊÜíåé ôï bot íá åíåñãåß,äçë íá åêôåëåß åíôïëÞ \"/me\"\n"
 "åìöáíßæïíôáò ôï ìÞíõìá óôï áíÜëïãï êáíÜëé."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6330,15 +5833,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6407,7 +5901,8 @@ msgstr ""
 "Ç åíôïëÞ AKICK CLEAR äéáãñÜöåé üëåò ôéò èÝóåéò ðïõ ðåñéÝ÷ïíôáé óôçí\n"
 "ëßóôá akick."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6415,21 +5910,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6502,7 +5997,7 @@ msgstr ""
 "Ìüíï ãéá ôïõò Services operators.\t\n"
 "    "
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6541,7 +6036,7 @@ msgstr ""
 "Channels that have the NOEXPIRE option set will be prefixed by \n"
 "an exclamation mark."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6558,10 +6053,11 @@ msgstr ""
 "on. With two parameters lists channels that nickname has \n"
 "level access or greater on."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6637,7 +6133,7 @@ msgstr ""
 "êáé /msg %S HELP SET XOP ãéá íá îÝñåôå ðùò èá åðéëÝîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óýóôçìá."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6651,7 +6147,8 @@ msgstr ""
 "ìåôÜ íá ôï ñõèìßóåéò ãéá ôéò áíÜãêåò ôïõ êáíáëéïý óïõ.\n"
 "    "
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6683,7 +6180,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6720,7 +6217,7 @@ msgstr ""
 "Ç åíôïëÞ BADWORDS CLEAR êáèáñßæåé üëåò ôéò èÝóåéò áðü ôçí ëßóôá\n"
 "badword."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6737,7 +6234,7 @@ msgstr ""
 "access \n"
 "êáé ðáñáðÜíù óôï êáíÜëé."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6780,7 +6277,7 @@ msgstr ""
 "èá äéáãñáöåß. Åðßóçò, áí Ýíáò ÷ñÞóôçò ÷ñçóéìïðïéåß Þäç ôï øåõäþíõìï\n"
 "ôçí þñá ðïõ öôéÜ÷íåéò ôï bot, èá ãßíåé kill."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6790,7 +6287,7 @@ msgstr ""
 "\n"
 "Åìöáíßæåé ôçí ëßóôá ìå ôá äéáèÝóéìá bots áõôïý ôïõ äéêôýïõ."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6804,7 +6301,7 @@ msgstr ""
 "íá\n"
 "ìçí Ýãéíå."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6816,7 +6313,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6840,7 +6337,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6852,71 +6349,32 @@ msgstr ""
 "Checks whether the _last_ memo you sent to nick has been read\n"
 "or not. Note that this does only work with nicks, not with chans."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Óýíôáîç: CLEAR êáíÜëé ôé áêñéâþò\n"
-"\n"
-"ÆçôÜò áðü ôïí %S íá êáèáñßóåé ôéò åðéëïãÝò ðïõ Ý÷åé ôï êáíÜëé.  ôé áêñéâþò\n"
-"ìðïñåß íá åßíáé ìéá áðü ôéò áêüëïõèåò åðéëïãÝò:\n"
-"\n"
-"     MODES    Êáèáñßæåé üëá ôá modes áðü ôï êáíÜëé (äçë clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Êáèáñßæåé üëá ôá bans áðü ôï êáíÜëé.\n"
-"     EXCEPTS  Êáèáñßæåé üëá ôá excepts áðü ôï êáíÜëé.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Áöáéñåß ôï channel-operator status (mode +o) áðü\n"
-"                  üëïõò ôïõò channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Áöáéñåß ôá \"voice\" status (mode +v) áðü ôïí êáèÝíá.\n"
-"     USERS    ÐåôÜåé (kicks) üëïõò ôïõò ÷ñÞóôåò áðü ôï êáíÜëé.\n"
-"\n"
-"Áðü default, ÷ñçóçìïðïéåßôáé, ìüíï áðü áõôïýò ðïõ Ý÷ïõí founder access óôï\n"
-"êáíÜëé."
+"Óýíôáîç: DEOWNER #êáíÜëé\n"
+"\n"
+"ÊÜíåé ôï áêñéâþò áíôßèåôð ôçò åíôïëÞò owner. \n"
+" \n"
+"Ìüíï ãéá áõôïýò ðïõ Ý÷ïõí founder access óôï êáíÜëé."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Óýíôáîç: CLEARMODES êáíÜëé [ALL]\n"
-"\n"
-"Êáèáñßæåé üëá ôá binary modes (i,k,l,m,n,p,s,t) êáé êÜíåé bans áðü ôï\n"
-"êáíÜëé.  Áí ç ðáñÜìåôñïò ALL äßíåôáé, êáèáñßæåé üëïõò üóïé åßíáé ops êáé\n"
-"voices (+o êáé +v modes) óôï êáíÜëé.\n"
-"\n"
-"Ìüíï ãéá ôïõò Services operators."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6941,7 +6399,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6953,12 +6411,14 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6975,7 +6435,7 @@ msgstr ""
 "êáé ðáñáðÜíù access óôï êáíÜëé, Þ áðü ôïõò HOPs Þ áõôïýò ðïõ Ý÷ïõí level 4 \n"
 "êáé ðáñáðÜíù ãéá íá êÜíïõí dehalfop ôïí åáõôü ôïõò."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6985,11 +6445,12 @@ msgstr ""
 "Deletes the vhost assigned to the given nick from the\n"
 "database."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7020,22 +6481,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      ÄéáãñÜöïíôáé ôá ìçíýìáôá ìå íïýìåñá 2 Ýùò 5 êáé 7 Ýùò 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntax: DELALL <nick>.\n"
 "Deletes the vhost for all nick's in the same group as\n"
 "that of the given nick."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7048,29 +6512,35 @@ msgstr ""
 "Áðü default, ÷ñçóéìïðïéåßôáé áðü áõôïýò ðïõ åßíáé AOPs Þ áðü áõôïýò ðïõ \n"
 "Ý÷ïõí âáèìü (level) 5 access êáé üóïõò Ý÷ïõí ðáñáðÜíù level op/deop."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Óýíôáîç: DEOWNER #êáíÜëé\n"
+"Óýíôáîç: DEOP #êáíÜëé [øåõäþíõìï]\n"
 "\n"
-"ÊÜíåé ôï áêñéâþò áíôßèåôð ôçò åíôïëÞò owner. \n"
-" \n"
-"Ìüíï ãéá áõôïýò ðïõ Ý÷ïõí founder access óôï êáíÜëé."
+"Ç åíôïëÞ áõôÞ êÜíåé deop ôï æçôïýìåíï øåõäþíõìï ôï ïðïßï åßíáé óôï êáíÜëé.\n"
+"Áí äåí åðéëÝîåôå ôï øåõäþíõìï, èá êÜíåé deop óôïí åáõôü óáò.\n"
+"\n"
+"Áðü default, ÷ñçóéìïðïéåßôáé áðü áõôïýò ðïõ åßíáé AOPs Þ áðü áõôïýò ðïõ \n"
+"Ý÷ïõí âáèìü (level) 5 access êáé üóïõò Ý÷ïõí ðáñáðÜíù level op/deop."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Óýíôáîç: DEPROTECT #êáíÜëé [øåõäþíõìï]\n"
 "\n"
@@ -7084,12 +6554,14 @@ msgstr ""
 "level (âáèìü) 10 Þ êáé ðáñáðÜíù ãéá íá âãÜëïõí ôçí ðñïóôáóßá áðü ôïí åáõôü "
 "ôïõò."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7106,7 +6578,7 @@ msgstr ""
 "êáé ðáñáðÜíù óôï êáíÜëé, Þ áðü ôïõò VOPs Þ áõôïýò ðïõ Ý÷ïõí level 3 \n"
 "êáé ðáñáðÜíù ãéá íá êÜíïõí devoice ôïí åáõôü ôïõò."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7118,7 +6590,7 @@ msgstr ""
 "ÊÜíåé ôï êáíÜëé îåêáôï÷õñþóçìï,ôï áöÞíåé åëåýèåñï ÷ùñßò founder. Ãéá íá\n"
 "ãßíåé áõôü ðñÝðåé ï founder."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7131,9 +6603,10 @@ msgstr ""
 "ìðïñïõí íá ôï êÜíïõí áõôü óå Ýíá êáíÜëé, ÷ùñßò íá êÜíïõí åíôïëÞ áíáãíþñéóçò\n"
 "ãéá ôï êáíÜëé."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7141,6 +6614,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7159,7 +6636,7 @@ msgstr ""
 "ðëçñïöïñßåò.)\n"
 "    "
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7184,8 +6661,8 @@ msgstr ""
 "íá ôï \n"
 "êÜíïõí ïé (åðéêåöáëåßò) Services Operators."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7196,7 +6673,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7218,7 +6695,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7265,7 +6742,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Åðéêåöáëåßò Õðçñåóéþí."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7283,7 +6760,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7301,7 +6778,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7315,7 +6792,7 @@ msgstr ""
 "this command is used, a message including the person who issued\n"
 "the command and the email it was used on will be logged."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7325,16 +6802,15 @@ msgstr ""
 "\n"
 "Óáò äåß÷íåé ôï êëåéäß ôïõ óõãêåêñéìÝíïõ êáíáëéïý."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Óýíôáîç: GETPASS øåõäþíõìï\n"
 "\n"
@@ -7347,14 +6823,14 @@ msgstr ""
 "\n"
 "ÁõôÞ ç åíôïëÞ äåí åßíáé äéáèÝóéìç áí åßíáé åíåñãÞ ç êùäéêïðïßçóç."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7378,7 +6854,7 @@ msgstr ""
 "íá âñßóêåôáé óôç ëßóôá ðñüóâáóçò ôïõ øåõäùíýìïõ, Þ íá Ý÷åôå\n"
 "äþóåé ôïí óùóôü êùäéêü ãéá ôï øåõäþíõìï."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7388,7 +6864,7 @@ msgstr ""
 "\n"
 "Åìöáíßæåé üëá ôá øåõäþíõìá ðïõ áíÞêïõí óôçí ßäéá ïìÜäá."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7408,7 +6884,7 @@ msgstr ""
 "ôïõ æçôïýìåíïõ øåõäþíõìïõ. Ìüíï ïé Services Operators \n"
 "ìðïñïýí íá ôï êÜíïõí."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7421,7 +6897,7 @@ msgstr ""
 "ÅðéôñÝðåé óôïõò IRCops íá óôÝëíïõí ìõíÞìáôá óå üëïõò ôïõò ÷ñÞóôåò ôïõ \n"
 "äéêôýïõ.  Ôï ìÞíõìá èá óôÝëíåôáé áðü ôï øåõäþíõìï õðçñåóßáò %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7435,7 +6911,7 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7503,16 +6979,17 @@ msgstr ""
 "Óçìåßùóç: üëá ôá øåõäþíõìá ðïõ áíÞêïõí óôçí ßäéá ïìÜäá Ý÷ïõí ôïí ßäéï \n"
 "êùäéêü."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Óýíôáîç: HALFOP #êáíÜëé [øåõäþíõìï]\n"
 "\n"
@@ -7525,10 +7002,11 @@ msgstr ""
 "êáé ðáñáðÜíù access óôï êáíÜëé, Þ áðü ôïõò HOPs Þ áõôïýò ðïõ Ý÷ïõí level 4 \n"
 "êáé ðáñáðÜíù ãéá íá êÜíïõí halfop ôïí åáõôü ôïõò."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7603,7 +7081,7 @@ msgstr ""
 "êáé /msg %S HELP SET XOP ãéá íá îÝñåôå ðùò èá åðéëÝîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óýóôçìá."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7622,9 +7100,20 @@ msgstr ""
 "ï ßäéïò ìå áõôüí ðïõ Ýäùóåò ãéá íá êáôï÷õñþóçò ôï øåõäþíõìï,\n"
 "äçë ìå ôçí REGISTER åíôïëÞ."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7654,7 +7143,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7676,7 +7165,7 @@ msgstr ""
 "Áðü default, ç åðéëïãÞ ALL åßíáé ïñéóìÝíç ìüíï óå áõôïýò ðïõ Ý÷ïõí\n"
 "founder access óôï óõãêåêñéìÝíï êáíÜëé."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7693,7 +7182,7 @@ msgstr ""
 "÷ñçóéìïðïéÞóåôå ôçí ðáñÜìåôñï ALL óôçí åíôïëÞ, èá äåßôå\n"
 "üëåò ôéò ðëçñïöïñßåò, Üó÷åôá áí áõôÝò áðïêñýðôïíôáé Þ ü÷é."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7708,7 +7197,7 @@ msgstr ""
 "áðü áõôÜ äåí Ý÷ïõí äéáâáóôåß, êáé ðüóá ìçíýìáôá ìðïñåßôå íá ëÜâåôå.\n"
 "Ìå ôçí ðáñÜìåôñï, åìöáíßæïíôáé ïé ßäéåò ðëçñïöïñßåò êáé ãéá Ýíá êáíÜëé."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7735,7 +7224,7 @@ msgstr ""
 "áíÜëïãï øåõäþíõìï.  ÁõôÞ ç åíôïëÞ åßíáé ìüíï ãéá ôïõò Services\n"
 "admins."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7754,12 +7243,12 @@ msgstr ""
 "èá äåéò ðëçñïöïñßåò ó÷åôéêÜ ìå ôï bot.\n"
 "    "
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7772,14 +7261,15 @@ msgstr ""
 "êáé\n"
 "ðáñáðÜíù óôï êáíÜëé."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7798,7 +7288,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7815,7 +7305,7 @@ msgstr ""
 "access \n"
 "êáé ðáñáðÜíù óôï êáíÜëé."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7840,7 +7330,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7860,12 +7350,14 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7912,14 +7404,14 @@ msgstr ""
 "Óçìåßùóç: ç access óå áõôÞ ôçí åíôïëÞ åëÝã÷åôáé áðü ôçí\n"
 "level SET."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7935,7 +7427,25 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7952,7 +7462,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7979,7 +7489,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7995,7 +7505,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -8018,7 +7528,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8034,7 +7544,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8051,7 +7561,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8068,8 +7578,8 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb\n"
 "ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8079,17 +7589,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8121,7 +7631,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8145,7 +7655,7 @@ msgstr ""
 "The list uses the value of NSListMax as a hard limit for the\n"
 "number of items to display to a operator at any 1 time."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8160,7 +7670,7 @@ msgstr ""
 "øÜîåé.\n"
 "(Ôá êáíÜëéá ðïõ Ý÷ïõí åðéëïãÞ PRIVATE äåí åìöáíßæïíôáé.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8202,7 +7712,8 @@ msgstr ""
 "        Åìöáíßæåé üëá ôá øåõäþíõìá ðïõ áíïßêïõí óå ÷ñÞóôåò\n"
 "        ðïõ óõíäÝïíôáé ìå äéåýèõíóç bar.org."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8230,7 +7741,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Óýíôáîç: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8254,13 +7764,14 @@ msgstr ""
 "        Åìöáíßæåé üëá ôá êáôï÷õñùìÝíá øåõäþíõìá ðïõ åßíáé óå no-expire.\n"
 "        "
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8276,11 +7787,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "     Ëßóôá ìçíõìÜôùí íïýìåñï 2 ðåñíÜ 5 êáé 7 ðåñíÜ 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Óýíôáîç: LOGONNEWS ADD ðåñéå÷üìåíï"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8309,11 +7820,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Óýíôáîç: LOGONNEWS DEL {íïýìåñï | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8329,7 +7840,7 @@ msgstr ""
 "ðëÝïí. Óçìåßùóç, üðùò êáé íá÷åé, äåí èá óïõ ãßíåé ðáñáôÞñçóç Þ íá óïõ \n"
 "æçôçèåß íá îáíáêÜíåéò åíôïëÞ áíáãíþñéóçò."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8354,12 +7865,13 @@ msgstr ""
 "REVALIDATE, ïé õðçñåóßåò èá óå ñùôÞóïõí ãéá ðïéï øåõäþíõìï.\n"
 "Áõôü ôï êÜíïõí ìüíï ïé (åðéêåöáëåßò) Services operators."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Óýíôáîç: MODE êáíÜëé modes\n"
@@ -8369,7 +7881,34 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8378,7 +7917,7 @@ msgstr ""
 "Syntax: MODINFO FileName\n"
 "This command lists information about the specified loaded module"
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8388,7 +7927,7 @@ msgstr ""
 "\n"
 "Lists all currently loaded modules."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8399,7 +7938,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8410,7 +7949,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8421,10 +7960,12 @@ msgstr ""
 "This command unloads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8449,7 +7990,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8461,7 +8002,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see your real IP address."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8475,7 +8016,7 @@ msgstr ""
 "Flags have to be prefixed with a \"+\" or a \"-\". To\n"
 "remove all flags simply type a \"-\" instead of any flags."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8487,12 +8028,14 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see the vhost instead of your real IP address."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8505,11 +8048,11 @@ msgstr ""
 "Áðü default, ÷ñçóéìïðïéåßôáé áðü áõôïýò ðïõ åßíáé AOPs Þ áðü áõôïýò ðïõ \n"
 "Ý÷ïõí âáèìü (level) 5 access êáé üóïõò Ý÷ïõí ðáñáðÜíù level op/deop."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Óýíôáîç: OPERNEWS ADD ðåñéå÷üìåíï"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8538,30 +8081,37 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Óýíôáîç: OPERNEWS DEL {íïýìåñï | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Óýíôáîç: OWNER #êáíÜëé\n"
+"Óýíôáîç: OP #êáíÜëé [øåõäþíõìï]\n"
 "\n"
-"Óïõ äßíåé owner status óôï êáíÜëé (êÜôé óáí founder).\n"
+"Ç åíôïëÞ áõôÞ êÜíåé op ôï æçôïýìåíï øåõäþíõìï ôï ïðïßï åßíáé óôï êáíÜëé.\n"
+"Áí äåí åðéëÝîåôå øåõäþíõìï èá äþóåé op óôïí åáõôü óáò.\n"
 "\n"
-"Ìüíï ãéá áõôïýò ðïõ Ý÷ïõí founder access óôï êáíÜëé."
+"Áðü default, ÷ñçóéìïðïéåßôáé áðü áõôïýò ðïõ åßíáé AOPs Þ áðü áõôïýò ðïõ \n"
+"Ý÷ïõí âáèìü (level) 5 access êáé üóïõò Ý÷ïõí ðáñáðÜíù level op/deop."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8575,10 +8125,11 @@ msgstr ""
 "Ý÷ïõí \n"
 "level (âáèìü) 10 Þ êáé ðáñáðÜíù ãéá íá ðñïóôáôåýïõí ôïí åáõôü ôïõò."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8651,7 +8202,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8672,11 +8223,11 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Óýíôáîç: RANDOMNEWS ADD ðåñéå÷üìåíï"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8698,18 +8249,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Óýíôáîç: RANDOMNEWS DEL {íïýìåñï | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8726,7 +8278,7 @@ msgstr ""
 "   ÄéÜâáóå 2-5,7-9\n"
 "      Åìöáíßæåé ôá ìçíýìáôá ìå ôá íïýìåñá 2 Ýùò êáé 5 êáé 7 Ýùò êáé 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8774,7 +8326,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8785,7 +8338,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8816,24 +8369,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8883,15 +8437,15 @@ msgstr ""
 "äéêáéùìÜôùí óôá êáíÜëéá. Ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ãéá áõôÞ \n"
 "ôç ìåëëïíôéêÞ åíôïëÞ, ãñÜøå /msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8912,7 +8466,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8930,7 +8484,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8942,7 +8496,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8953,7 +8507,7 @@ msgstr ""
 "Sends a code key to the nickname which instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8968,13 +8522,14 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators.\t"
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8990,23 +8545,25 @@ msgstr ""
 "memo will be sent to the sender informing him/her that the memo\n"
 "has been read."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -9014,7 +8571,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9026,7 +8583,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9036,7 +8593,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9052,7 +8609,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9075,22 +8632,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9108,7 +8665,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9125,7 +8682,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9139,7 +8696,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9151,17 +8708,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9180,16 +8738,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9203,7 +8761,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9214,13 +8772,14 @@ msgstr ""
 "ÊÜíåé ôï bot íá ëÝåé ôï ìÞíõìá ðïõ ôïõ äþóáôå íá ôï åìöáíßóåé óôï áíÜëïãï \n"
 "êáíÜëé."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Óýíôáîç: SEND {øåõäþíõìï | êáíÜëé} êåßìåíï ìçíýìáôïò\n"
@@ -9232,15 +8791,17 @@ msgstr ""
 "Ôï øåõäþíõìï Þ ôï êáíÜëé ðïõ äßíåôáé, ðñÝðåé íá åßíáé êáôï÷õñùìÝíï.\n"
 "    "
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Syntax: SENDALL memo-text\n"
 "Sends all registered users a memo containing memo-text."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9258,7 +8819,7 @@ msgstr ""
 "\n"
 "Ìüíï ïé IRC operators óôá äßêôõá ðïõ åßíáé ìðïñïýí íá ôï êÜíïõí."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9294,7 +8855,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Åðéêåöáëåßò Õðçñåóéþí."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9308,7 +8869,65 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> set idents for users as \n"
 "well as vhosts."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Óýíôáîç: %s êáíÜëé SECUREOPS {ON | OFF}\n"
+"\n"
+"Åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí åðéëïãÞ ðñïóôáôåõìÝíçò äéá÷åßñçóçò\n"
+"ãéá Ýíá êáíÜëé.  ¼ôáí åíåñãïðïéåßôáé ç ðñïóôáôåõìÝíç äéá÷åßñçóç, ïé\n"
+"÷ñÞóôåò ðïõ äåí åßíáé óôç ëßóôá ðñüóâáóçò, äå ìðïñïýí íá ðÜñïõí op."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Óýíôáîç: %s êáíÜëé SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí åðéëïãÞ signed kicks ôïõ\n"
+"êáíáëéïý.  ¼ôáí åíåñãïðïéåßôáé ç åðéëïãÞ SIGNKICK, ôá kicks èá \n"
+"åêôåëïýíôáé  %S KICK command will have the nick that used the\n"
+"ìå åíôïëÞ ðåñéÝ÷ïíôáò ôïí ëüãï.\n"
+"\n"
+"Áí ÷ñçóéìïðïéåßò LEVEL, áõôïß ðïõ Ý÷ïõí ìåãáëýôåñç level Þ ßóç \n"
+"ìå ôçí SIGNKICK level ôïõ êáíáëéïý äåí èá Ý÷ïõí \n"
+"kicks signed. Äåò /msg %S HELP LEVELS ãéá ðåñéóóüôåñåò ðëçñïöïñßåò. "
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Óýíôáîç: %s êáíÜëé KEEPTOPIC {ON | OFF}\n"
+"\n"
+"Åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí åðéëïãÞ êëåßäùìá topic ôïõ êáíáëéïý.\n"
+"¼ôáí ôï êëåßäùìá topic åßíáé on, ï %S äåí èá åðéôñÝðåé óå êáíÝíáí íá "
+"áëëÜîåé\n"
+"ôï topic ôïõ êáíáëéïý åêôüò ôçò åíôïëÞò TOPIC ôïõ."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9319,6 +8938,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9343,7 +8963,7 @@ msgstr ""
 "Óçìåßùóç: ç access óå áõôÞ ôçí åíôïëÞ äéåõèýíåôáé áðü ôçí\n"
 "level SET."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9356,7 +8976,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9372,7 +8992,7 @@ msgstr ""
 "\n"
 "ÄéáèÝóéìåò åðéëïãÝò:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9386,7 +9006,7 @@ msgstr ""
 "¼ôáí åßíáé åíåñãïðïéçìÝíç, ïé ops äåí èá ôñþíå kick áðü ôï bot\n"
 "áêüìá êáé áí äåí ôáéñéÜæïôí ìå ôçí NOKICK level."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9400,7 +9020,7 @@ msgstr ""
 "¼ôáí åßíáé åíåñãïðïéçìÝíç, ïé voices äåí èá ôñþíå kick áðü ôï bot\n"
 "áêüìá êáé áí äåí ôáéñéÜæïôí ìå ôçí NOKICK level."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9431,7 +9051,7 @@ msgstr ""
 "(ãéá ðáñÜäåéãìá, ãéá íá ÷ñçóéìïðïéÞóåéò !op, èá ðñÝðåé íá Ý÷åéò áñêåôÞ \n"
 "access ãéá ôçí OPDEOP level)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9447,7 +9067,22 @@ msgstr ""
 "óôïõò ÷ñÞóôåò ðïõ èá ìðÝíïõí óôï êáíÜëé, ìå ôçí ðñïõðüèåóç ïôé\n"
 "Ý÷ïõí áñêåôÞ access óôï êáíÜëé."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9463,7 +9098,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9478,7 +9113,7 @@ msgstr ""
 "\n"
 "Ìüíï ïé Services Operators ìðïñïýí íá ôï êÜíïõí."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9495,25 +9130,17 @@ msgstr ""
 "normal áðü ôï %s óôá êáíÜëéá, üëá ôá MODEs,\n"
 "KICKs, êáé èá åìöáíßæåé ôï ìÞíõìá åéóáãùãÞò."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Óýíôáîç: SET option parameters\n"
-"\n"
-"ÁëëÜæåé äéÜöïñåò åðéëïãÝò ôïõ øåõäùíýìïõ.  Ç åðéëïãÞ ìðïñåß íá åßíáé:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9531,7 +9158,17 @@ msgstr ""
 "ÃñÜøôå /msg %S HELP SET åðéëïãÞ ãéá ðåñéóóüôåñåò ðëçñïöïñßåò\n"
 "óå ìéá óõãêåêñéìÝíç åðéëïãÞ."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Óýíôáîç: SET option parameters\n"
+"\n"
+"ÁëëÜæåé äéÜöïñåò åðéëïãÝò ôïõ øåõäùíýìïõ.  Ç åðéëïãÞ ìðïñåß íá åßíáé:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9541,7 +9178,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Óýíôáîç: SET option setting\n"
@@ -9558,7 +9194,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9570,30 +9206,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Óýíôáîç: SET DEBUG {ON | OFF | num}\n"
-"\n"
-"ÁëëÜæåé óå debug mode on Þ off.  Óå debug mode, üëç ç data óôÝëíåôå\n"
-"êáé áðü ôá Services ìÝóù Üëëùí debugging\n"
-"ìçíõìÜôùí ãñÜöïíôáé óå log áñ÷åßï.  Áí ôï _num_ äßíåôáé\n"
-"ôï debug mode åíåñãïðïéåßôáé, ìå debugging level ñõèìéóìÝíï\n"
-"óôï num.\n"
-"\n"
-"ÁõôÞ ç åðéëïãÞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëÞ-line åðéëïãÞ\t\n"
-"-debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9605,7 +9218,7 @@ msgstr ""
 "ÂëÝðåéò óôç ëßóôá ôï øåõäþíõìï óïõ óå ðïéá ïìÜäá åßíáé ôùí \n"
 "õðçñåóéþí. Óôç ëßóôá ðñÝðåé íá åßíáé ôï øåõäþíõìï ðïõ åßíáé óôçí ïìÜäá."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9620,7 +9233,7 @@ msgstr ""
 "ðëçñïöïñßåò\n"
 "óôï êáíÜëé ìå ôçí åíôïëÞ INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9637,7 +9250,7 @@ msgstr ""
 "ç åðéëïãÞ GREET èá åßíáé åíåñãïðïéçìÝíç, êáé ìå ôçí ðñïõðüèåóç ïôé èá Ý÷åéò\n"
 "êáé ôçí êáôÜëëçëç access óå áõôü. "
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9661,18 +9274,8 @@ msgstr ""
 "Ç äåýôåñç ðáñÜìåôñïò êáèïñßæåé ôï áí ç ðëçñïöïñßá èá ðñÝðåé\n"
 "íá åìöáíßæåôáé (OFF) Þ íá áðïêñýðôåôáé (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9686,7 +9289,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Óýíôáîç: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9706,7 +9309,7 @@ msgstr ""
 "åßíáé áðïëýôùò áðáñáßôçôï.  Åðßóçò, ïé äéá÷åéñéóôÝò ôïõ\n"
 "äéêôýïõ ìðïñåß íá Ý÷ïõí áðåíåñãïðïéÞóåé áõôÞ ôçí åðéëïãÞ."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9724,7 +9327,7 @@ msgstr ""
 "Ôï íïýìåñï ðñÝðåé íá åßíáé Ýíá áðü ôá åðüìåíá ðïõ õðÜñ÷ïõí óôçí ëßóôá\n"
 "õðïóôçñéæüìåíùí ãëùóóþí:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9741,7 +9344,7 @@ msgstr ""
 "äå èá ìðïñåß íá óáò óôåßëåé ìçíýìáôá.  ÐÜíôùò äå ìðïñåßôå\n"
 "íá ïñßóåôå ôïí áñéèìü ðÜíù áðü %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9782,7 +9385,7 @@ msgstr ""
 "Äåí ìðïñïýí íá îåðåñÜóïõí ôï üñéï ôùí %d ìçíõìÜôùí, êáé äåí ìðïñïýí íá\n"
 "åðéëÝîïõí hard limit."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9791,7 +9394,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %S settings"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9806,10 +9409,11 @@ msgstr ""
 "÷ñçóéìïðïéïýí ìçíýìáôá, äéáöïñåôéêÜ èá ÷ñçóéìïðïéïýí ðáñáôçñÞóåéò \n"
 "(notices). "
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9824,7 +9428,7 @@ msgstr ""
 "ÁõôÞ ç åðéëïãÞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëÞ-line åðéëïãÞ\n"
 "-noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9861,7 +9465,7 @@ msgstr ""
 "\n"
 "Ç åðéëïãÞ ON ðéï ïõóéþäçò,ç LOGON êáé ç NEW óõíäéáóôéêÞ."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9873,7 +9477,7 @@ msgstr ""
 "ÁëëÜæåé ôïí êùäéêü ðïõ ÷ñçóéìïðïéåßò ãéá ôçí åíôïëÞ áíáãíþñéóçò ôïõ êÜôï÷ïõ\n"
 "øåõäþíõìïõ."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9894,7 +9498,7 @@ msgstr ""
 "áêüìç íá ðÜñåé ðëçñïöïñßåò ãé áõôü, ÷ñçóéìïðïéþíôáò ôçí\n"
 "åíôïëÞ INFO)"
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9924,16 +9528,16 @@ msgstr ""
 "ÁõôÞ ç åðéëïãÞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëÞ-line åðéëïãÞ\n"
 "-readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9946,7 +9550,7 @@ msgstr ""
 "¼ðùò êáé íá÷åé, áí åßóáé óôçí ëßóôá access, ï %S\n"
 "äåí èá êÜíåé auto-kill ìå ôçí õðüëçøç ôçò åðéëïãÞò KILL."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9960,14 +9564,15 @@ msgstr ""
 "This opion is _NOT_ persistant, and should only be used when\n"
 "needed, and set back to OFF when no longer needed."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9978,7 +9583,7 @@ msgstr ""
 "* NOTE, this will not update the vhost for any nick's\n"
 "added to the group after this command was used."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9991,10 +9596,11 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10030,7 +9636,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10084,10 +9690,11 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10162,7 +9769,8 @@ msgstr ""
 "êáé /msg %S HELP SET XOP ãéá íá îÝñåôå ðùò èá åðéëÝîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óýóôçìá."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10178,31 +9786,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10262,21 +9870,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10286,15 +9880,17 @@ msgstr ""
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Syntax: STAFF memo-text\n"
 "Sends all services staff a memo containing memo-text."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10334,7 +9930,7 @@ msgstr ""
 "The RESET option currently resets the maximum user count\n"
 "to the number of users currently present on the network."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10360,12 +9956,13 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10406,7 +10003,7 @@ msgstr ""
 "õðüëïéðá èá áãíïïýíôáé. If no nickname is given, your status\n"
 "will be returned."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10424,7 +10021,7 @@ msgstr ""
 "\n"
 "Reason may be required on certain networks."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10434,7 +10031,8 @@ msgstr ""
 "\n"
 "Forcefully changes a user's nickname from nick to newnick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10447,31 +10045,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10524,7 +10122,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10548,7 +10146,7 @@ msgstr ""
 "Áðü default, ÷ñçóéìïðïåßôáé ìüíï áðü áõôïýò ðïõ Ý÷ïõí founder access óôï\n"
 "êáíÜëé. "
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10562,7 +10160,7 @@ msgstr ""
 "Parameters are the same as for the standard /MODE\n"
 "command."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10579,7 +10177,7 @@ msgstr ""
 "ãéá ôçí ðåñßðôùóç ðïõ èåò íá ôï âÜëåéò áñãüôåñá.\n"
 "    "
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10599,7 +10197,7 @@ msgstr ""
 "ðáñáðÜíù óôï êáíÜëé.\n"
 "    "
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10616,7 +10214,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10628,7 +10226,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspension."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10643,7 +10241,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10668,12 +10266,14 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10689,10 +10289,11 @@ msgstr ""
 "êáé ðáñáðÜíù óôï êáíÜëé, Þ áðü ôïõò VOPs Þ áõôïýò ðïõ Ý÷ïõí level 3 \n"
 "êáé ðáñáðÜíù ãéá íá êÜíïõí voice ôïí åáõôü ôïõò."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10766,7 +10367,7 @@ msgstr ""
 "êáé /msg %S HELP SET XOP ãéá íá îÝñåôå ðùò èá åðéëÝîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óýóôçìá."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10782,7 +10383,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10790,7 +10391,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10798,7 +10399,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10810,143 +10411,144 @@ msgstr ""
 "sets needed chanmodes (ModeonID) and updates your vhost and\n"
 "your userflags (lastseentime, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC êáíÜëé [topic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "Ç IMMED åðéëïãÞ äåí åßíáé äéáèÝóéìç óå áõôü ôï äßêôõï."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "Ç ëßóôá AKILL êáèáñßóôçêå."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "The Defcon Level is now at Level: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "Ç ëßóôá SNLINE êáèáñßóôçêå."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "Ç ëßóôá SQLINE êáèáñßóôçêå."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "Ç ëßóôá SZLINE êáèáñßóôçêå."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Ôá áêüëïõèá feature/function êáôáëáâáßíïíôáé.  Óçìåßùóç,\n"
 "ôá levels (âáèìïß) ãéá AUTODEOP êáé NOJOIN åßíáé ôá ìÝãéóôá levels,\n"
 "åíþ üëá ôá Üëëá åßíáé ôá åëÜ÷éóôá levels."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Ôï host %s Ý÷åé ùò ôþñá %d sessions ìå üñéï ôï %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "The last memo you sent to %s (sent on %s) has been read."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "The last memo you sent to %s (sent on %s) has not yet been read."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Ôï üñéï ôùí ìçíõìÜôùí ãéá ôïí %s äåí ìðïñåß íá áëëá÷ôåß."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Ç íÝá åðßäåéîç åßíáé ôþñá %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "The nick %s is now being changed to %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "There are %d memos on channel %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10954,7 +10556,7 @@ msgstr ""
 "Äåí õðÜñ÷ïõí äéáèÝóéìá bots áõôÞ ôç óôéãìÞ.\n"
 "Ñþôá ôïí Services Operator íá óïõ öôéÜîåé Ýíá!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10964,12 +10566,12 @@ msgstr ""
 "ÃñÜøå /msg %s HELP GLIST êáé /msg %s HELP DROP \n"
 "ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "There is %d memo on channel %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10977,28 +10579,28 @@ msgstr ""
 "There is a new memo on channel %s.\n"
 "Type /msg %s READ %s %d to read it."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Äåí õðÜñ÷åé bot ðïõ íá åßíáé óôï %s ôþñá ðéá."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Äåí õðÜñ÷ïõí êáíïíéóìïß Þ ðëçñïöïñßåò."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Äåí õðÜñ÷ïõí íÝá ãéá ôïõò opers."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Äåí õðÜñ÷ïõí íÝá."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -11012,32 +10614,28 @@ msgstr ""
 "    NOBOT            Äåß÷íåé ôï bot ðïõ Ýãéíå assign áðü ôï êáíÜëé \n"
 "    PRIVATE          Äåëé÷íåé ôï bot ðïõ Ýãéíå assigned áðü ìç IRC operators"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "This channel has been forbidden."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Áõôü ôï êáíÜëé Ý÷åé êáôï÷õñùèåß ìå ôïí %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "This channel has been suspended."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Áõôü ôï êáíÜëé äåí ìðïñåß íá ÷ñçóéìïðïéçèåß."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Áõôü ôï êáíÜëé äåí èá ëÞîåé."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -11045,7 +10643,7 @@ msgstr ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -11053,7 +10651,7 @@ msgstr ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11061,21 +10659,21 @@ msgstr ""
 "Áõôü ôï øåõäþíõìï áíÞêåé óå êÜðïéïí Üëëïí.  Ðáñáêáëþ äéÜëåîå êÜðïéï Üëëï.\n"
 "(Áí áõôü åßíáé ôï øåõäþíõìü óïõ, ãñÜøå /msg %s IDENTIFY ^_êùäéêü^_.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr ""
 "Áõôü ôï øåõäþíõìï åßíáé Þäç êáôï÷õñùìÝíï; äåí ìðïñåßò íá ôï ÷ñçóéìïðïéÞóåéò."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11085,17 +10683,17 @@ msgstr ""
 "øåõäþíõìï óïõ, ãñÜøå /msg %s IDENTIFY ^_êùäéêü^_.  Áëëéþò,\n"
 "ðáñáêáëþ äéÜëåîå êÜðïéï Üëëï øåõäþíõìï."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr ""
 "Áõôü ôï øåõäþíõìï äåí ìðïñåß íá ÷ñçóéìïðïéçèåß.  Ðáñáêáëþ äéÜëåîå êÜðïéï "
 "Üëëï."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Áõôü ôï øåõäþíõìï äåí èá ëÞîåé ðïôÝ."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11103,44 +10701,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Êëåßäùìá ôïõ Topic"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Topic åííáëáãÞò"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Topic lock option for %s is now OFF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Topic lock option for %s is now ON."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Topic retention option for %s is now OFF."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Topic retention option for %s is now ON."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Ìçí ãñÜöåéò ìå êåöáëáßá ãñÜììáôá!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "ÃñÜøôå /msg %S HELP åíôïëÞ ãéá âïÞèåéá óå\n"
@@ -11151,7 +10740,7 @@ msgstr ""
 "    êáíáëéïý. Áõôü ìðïñåß íá áëëÜîåé ìå ôçí åíôïëÞ\n"
 "    LEVELS ôïõ %s."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11161,7 +10750,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11169,7 +10758,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11177,7 +10766,7 @@ msgstr ""
 "ÃñÜøå /msg %S HELP åðéëïãÞ ãéá ðåñéóóüôåñåò ðëçñïöïñßåò\n"
 "ãéá ôçí êÜèå åíôïëÞ."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11189,127 +10778,108 @@ msgstr ""
 "äùèåß óå\n"
 "êáíÝíá ôñßôï ðñüóùðï."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "ÃñÜøå /msg %s LIST NEW ãéá íá äåéò ôçí ëßóôá ìå ôá ìçíýìáôá."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "ÃñÜøå /msg %s READ %d ãéá íá äéáâÜóåéò."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "ÃñÜøå /msg %s READ LAST ãéá íá ôï äéáâÜóåéò."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modes"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN chan"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN êáíÜëé [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND channel"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Unable to load module %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Unable to remove module %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "¢ãíùóôç SET åðéëïãÞ %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "¢ãíùóôç STATS åðéëïãÞ %s.."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "¢ãíùóôç åíôïëÞ %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "¢ãíùóôç åíôïëÞ %s.  \"/msg %s HELP\" ãéá âïÞèåéá."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "¢ãíùóôç åðéëïãÞ ÷áñáêôÞñá %c áãíïÞèçêå."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "¢ãíùóôç åðéëïãÞ %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"¢ãíùóôç åðéëïãÞ %s.\n"
-"ÃñÜøå /msg %S HELP KICK ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "¢ãíùóôç åðéëïãÞ %s.\n"
 "ÃñÜøå /msg %S HELP SET ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Ãßíåôáé Update óôéò âÜóåéò äåäïìÝíùí."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "User %s not found in the nickserv db."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "×ñÞóôçò          : %6d âÜóåéò, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11317,11 +10887,11 @@ msgstr ""
 "User claiming your nick has been killed.\n"
 "/msg %s RELEASE %s to get it back before %s timeout."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "User matches channel except."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11329,67 +10899,78 @@ msgstr ""
 "Ëßóôá ÷ñçóôþí:\n"
 "¼íïìá                 ÌÜóêá"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Ðñïóôáóßá óôïõò Voices"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Ç VOP ëßóôá ôïõ %s åßíáé:\n"
-"  Íïýìåñï  Øåõäþíõìï"
+"Ðñïåéäïðïßçóç: ¸÷åéò îåðåñÜóåé ôï íïýìåñï ìçíõìÜôùí ðïõ ìðïñåßò íá ëÜâåéò (%"
+"d).  Äåí èá ìðïñåßò íá ëÜâåéò Üëëá áí äåí óâÞóåéò ìåñéêÜ áðü ôá ðáëéÜ "
+"ìçíýìáôá ðïõ Ý÷åéò."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Ðñïóôáóßá óôïõò Voices"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Ðñïåéäïðïßçóç: ¸÷åé öôÜóåé óôï ìÝãéóôï íïýìåñï ìçíõìÜôùí (%d).  Äåí èá "
+"ëÜâåéò êáéíïýñãéá ìçíýìáôá áí äåí óâÞóåéò ìåñéêÜ áðü ôá ðáëéÜ ðïõ Ý÷åéò."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Ðñüóå÷å ôçí ãëþóóá óïõ!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Åßóáé Þäç ìÝëïò ôçò ïìÜäáò ôïõ %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "You are already identified."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "You are no longer a SuperAdmin"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Äåí Ý÷åéò ôçí Üäåéá íá åßóáé óå áõôü ôï êáíÜëé."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr ""
 "Äåí Ý÷åéò ôï äéêáßùìá íá áëëÜîåéò ôï üñéï ôùí ìçíõìÜôùí ðïõ èá ëáìâÜíåéò."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "You are now a SuperAdmin"
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11397,36 +10978,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Åßóáé ôþñá ìÝóá óôçí ïìÜäá ôïõ %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Äåí ìðïñåßò íá óêïôþóåéò ôïí åáõôü óïõ!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Can't logout %s because he's a Services Operator."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Äåí ìðïñåßò íá øÜ÷íåéò ôïí åáõôü óïõ!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11436,7 +11022,7 @@ msgstr ""
 "×ñçóéìïðïßçóå AOP, SOP êáé VOP åíôïëÝò áíôß ãéá ôçí access.\n"
 "ÃñÜøå /msg %s HELP command ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11446,7 +11032,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11455,68 +11041,68 @@ msgstr ""
 "åíôïëÞ áíôß ãéá áõôÞ.\n"
 "ÃñÜøå /msg %s HELP ACCESS ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Äåí ìðïñåßò íá èÝóåéò ùò üñéï ìçíõìÜôùí ãéá ôïí %s ìåãáëýôåñï áðü %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Äåí ìðïñåßò íá èÝóåéò ùò üñéï ìçíõìÜôùí ìåãáëýôåñï áðü %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr ""
 "Äåí ìðïñåßò íá áðåíåñãïðïéÞóåéò ôçí äéåýèõíóç ôïõ e-mail óå áõôü ôï äßêôõï."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "ÌÝ÷ñé óôéãìÞò Ý÷åéò %d ìçíýìáôá, åê ôùí ïðïßùí %d äåí Ý÷ïõí äéáâáóôåß."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "ÌÝ÷ñé óôéãìÞò Ý÷åéò %d ìçíýìáôá, åê ôùí ïðïßùí 1 äåí Ý÷åé äéáâáóôåß."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "ÌÝ÷ñé óôéãìÞò Ý÷åéò %d ìçíýìáôá."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr ""
 "ÌÝ÷ñé óôéãìÞò Ý÷åéò %d ìçíýìáôá; åê ôùí ïðïßùí üëá äåí Ý÷ïõí äéáâáóôåß."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "ÌÝ÷ñé óôéãìÞò Ý÷åéò 1 memo, êáé äåí ôï Ý÷åéò äéáâÜóåé."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "ÌÝ÷ñé óôéãìÞò Ý÷åéò 1 ìÞíõìá."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "ÌÝ÷ñéò óôéãìÞò äåí Ý÷åéò êáíÝíá ìÞíõìá."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "¸÷åéò %d íÝá ìçíýìáôá."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "¸÷åéò 1 íÝï ìÞíõìá."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11524,33 +11110,37 @@ msgstr ""
 "¸÷åéò Ýíá íÝï ìÞíõìá áðü %s.\n"
 "ÃñÜøå /msg %s READ %d ãéá íá ôï äéáâÜóåéò."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "ãéíåò unban áðü ôï %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Äåí Ý÷åéò èÝóåé êáíÝíá áñéèìü óôï üñéï ùóôå íá êñáôÞóåéò ìçíýìáôá."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Äåí Ý÷åéò ìçíýìáôá."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Äåí Ý÷åéò íÝá ìçíýìáôá."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "You have to enter a valid number as time."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11558,25 +11148,17 @@ msgstr ""
 "ÐñÝðåé íá êÜíåéò assign óôï bot ãéá íá ìðåß óôï êáíÜëé.\n"
 "ÃñÜøå /msg %S HELP ASSIGN ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr ""
 "ÐñÝðåé íá åßóáé íá Ý÷åéò operator status óôï êáíÜëé ãéá íá ôï êáôï÷õñþóåéò."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "ÐñÝðåé íá êëåéäþóåéò ìå +i üðùò êáé ìå +K."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "ÐñÝðåé íá ôï êëåéäþóåéò ìå +l üðùò êáé ìå +L."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11586,39 +11168,39 @@ msgstr ""
 "Ìå áõôü ôï e-mail èá ìðïñåßò íá ëÜâåéò ôïí êùäéêü óïõ óå\n"
 "ðåñßðôùóç ðïõ ôïí îå÷Üóåéò."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Èá åéäïðïéçèåßò ãéá íÝá ìçíýìáôá üôáí êÜíåéò logon êáé üôáí öôÜóïõí."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Èá åéäïðïéçèåßò ãéá íÝá ìçíýìáôá óôï logon."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Èá åéäïðïéçèåßò ãéá íÝá ìçíýìáôá üôáí èá öôÜóïõí."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Äåí èá åßóáé éêáíüò íá ëÜâåéò Üëëá ìçíýìáôá."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Äåí èá óïõ ãßíåé ðáñáôÞñçóç ãéá íÝá ìçíýìáôá."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11626,34 +11208,54 @@ msgstr ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "H autokick list ôïõ %s åßíáé Üäåéá."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Ç ëßóôá ignore ôùí õðçñåóéþí åßíáé Üäåéá."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé áðåíåñãïðïéçìÝíï."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Ôï üñéï ìçíõìÜôùí Üëëáîå óå %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé %d, êáé äåí ìðïñåß íá áëëá÷ôåß."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé 0; äåí èá ëÜâåéò ðïôÝ êáíÝíá Üëëï ìÞíõìá."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11661,180 +11263,734 @@ msgstr ""
 "Ôï üñéï ìçíõìÜôùí åßíáé 0; äåí èá ëÜâåéò ðïôÝ êáíÝíá Üëëï ìÞíõìá.  Äåí "
 "ìðïñåßò íá áëëÜîåéò áõôü ôï üñéï."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr ""
 "Ôï øåõäþíõìï óïõ äåí ôï êáôÝ÷åéò ôþñá,ðñÝðåé íá êÜíåéò ðÜëé åíôïëÞ "
 "áíáãíþñéóçò ãéá íá ôï êáôÝ÷åéò."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Áõôü ôï øåõäþíõìï åßíáé Þäç êáôï÷õñùìÝíï; ãñÜøå /msg %s DROP áñ÷éêÜ."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Áõôü ôï øåõäþíõìï äåí Ý÷åé êáôï÷õñùèåß."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Ôï øåõäþíõìü óïõ óâÞóôçêå åðéôõ÷þò áðü ôçí õðçñåóßá."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Ôï øåõäþíõìü óïõ Ý÷åé áëëÜîåé óå %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Ï êùäéêüò óïõ åßíáé %s - èõìÞóïõ ôïí ãéá áñãüôåñç ÷ñÞóç."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Your password is too long. Please try again with a shorter password."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Your vhost of %s is now activated."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Your vhost of %s@%s is now activated."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Êáíïíéóìïß Þ ðëçñïöïñßåò - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[ÍÝá ãéá Opers - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[ÍÝá ó÷åôéêÜ ìå ôï äßêôõï - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "áðåíåñãïðïéçìÝíï"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "äåí ëÞãåé ðïôÝ"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "åíåñãïðïéçìÝíï"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "ëÞãåé óôçí åðüìåíç áíáâÜèìéóç õðçñåóéþí"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "ëÞãåé ìÝóá óå %d ìÝñá"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "ëÞãåé ìÝóá óå %d ìÝñåò"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "ëÞãåé ìÝóá óå %d þñá, %d ëåðôÜ"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "ëÞãåé ìÝóá óå %d þñá, %d ëåðôÜ"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "ëÞãåé ìÝóá óå %d þñåò, %d ëåðôÜ"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "ëÞãåé ìÝóá óå %d þñåò, %d ëåðôÜ"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "ëÞãåé ìÝóá óå %d ëåðôü"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "ëÞãåé ìÝóá óå %d ëåðôÜ"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost for %s removed."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost for %s set to %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost for %s set to %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost for group %s set to %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost for group %s set to %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts for group %s have been removed."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "xOP ëßóôá óõóôÞìáôïò"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "xOP lists system for %s is now OFF."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "xOP lists system for %s is now ON."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {øåõäþíõìï | êáíÜëé} ðåñéå÷üìåíï"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí AOP ëßóôá ôïõ %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí HOP ëßóôá ôïõ %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "Ï/ç %s ðñïóèÝèçêå åðéôõ÷þò óôçí VOP ëßóôá ôïõ %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí HOP ëßóôá ôïõ %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "Ï/ç %s äéáãñÜöçêå åðéôõ÷þò áðü ôçí VOP ëßóôá ôïõ %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s moved to %s HOP list."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s moved to %s SOP list."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s moved to %s VOP list."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "Ï/ç %s äåí âñÝèçêå óôçí HOP ëßóôá ôïõ %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "Ï/ç %s äåí âñÝèçêå óôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "Ï/ç %s äåí âñÝèçêå óôçí VOP ëßóôá ôïõ %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Åìðïäßæåé ôï øåõäþíõìü óáò íá åìöáíßæåôáé\n"
+#~ "                   ìå ôçí åíôïëÞ  /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d ìÝñåò"
+
+#~ msgid "%d hours"
+#~ msgstr "%d þñåò"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d ëåðôÜ"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d äåõôåñüëåðôá"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "Ç HOP ëßóôá ôïõ %s åßíáé Üäåéá."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "Ç SOP ëßóôá ôïõ %s åßíáé Üäåéá."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "Ç VOP ëßóôá ôïõ %s åßíáé Üäåéá."
+
+#~ msgid "1 day"
+#~ msgstr "1 ìÝñá"
+
+#~ msgid "1 hour"
+#~ msgstr "1 þñá"
+
+#~ msgid "1 minute"
+#~ msgstr "1 ëåðôü"
+
+#~ msgid "1 second"
+#~ msgstr "1 äåõôåñüëåðôï"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéåßôáé CLEAR åíôïëÞ"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò HALFOP/DEHALFOP åíôïëÝò"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Channel %s HOP list has been cleared."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Channel %s SOP list has been cleared."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Channel %s VOP list has been cleared."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ÇOP ëßóôá ôïõ %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí VOP ëßóôá ôïõ %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "ÄéáãñÜöçêå 1 8Ýóç áðü ôçí HOP ëßóôá ôïõ %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "ÄéáãñÜöçêå 1 8Ýóç áðü ôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "ÄéáãñÜöçêå 1 8Ýóç áðü ôçí VOP ëßóôá ôïõ %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Ç äéåýèõíóç ôïõ e-mail áðåíåñãïðïéÞèçêå."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "ÔÝëïò ëßóôáò ÷ñçóôþí."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Ôï ìÞíõìá õðïäï÷Þò ôïõ %s äåí Ý÷åé ïñéóôåß."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Ôï Bot äåí åßíáé óôï êáíÜëé %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "  ÌÞíõìá åéóüäïõ: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Access list for %s is empty."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Ëßóôá ðñüóâáóçò ãéá %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Ôï ìÞíõìá õðïäï÷Þò ôïõ %s Üëëáîå."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Ç Fantasy åðéëïãÞ åßíáé ôùñá OFF óôï êáíÜëé %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Ç åðéëïãÞ ÷áéñåôéóìïý åßíáé OFF óôï êáíÜëé %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Ç HOP ëßóôá ôïõ %s åßíáé:\n"
+#~ "  Íïýìåñï  Øåõäþíõìï"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "You have requested to have the pasword for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Åóùôåñéêü ëÜèïò - áäýíáôç ðñüóâáóç óôç ðáñÜêëçóç."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Êáíïíéóìüò Þ ðëçñïöïñßá óôç èÝóç #%d äéáãñÜöçêå."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Nickname Registration (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Ï êùäéêüò ôïõ øåõäþíõìïõ (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "No # found in front of channel name."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "ÊáíÝíá Bot Ý÷åé åðéëïãÞ OFF óôï êáíÜëé %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Äåí âñÝèçêáí èÝóåéò óôçí HOP ëßóôá ôïõ %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Äåí âñÝèçêáí èÝóåéò óôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Äåí âñÝèçêáí èÝóåéò óôçí VOP ëßóôá ôïõ %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí AOP ëßóôá ôïõ %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí HOP ëßóôá ôïõ %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí SOP ëßóôá ôïõ %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Äåí õðÜñ÷åé áõôÞ ç èÝóç (#%d) óôçí VOP ëßóôá ôïõ %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Op-notice option for %s is now OFF."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Peace option for %s is now OFF."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Ðáñáêáëþ ðåñßìåíå %d äåõôåñüëåðôá ðñéí ÷ñçóéìïðïéÞóåéò ôçí åíôïëÞ SEND "
+#~ "îáíÜ."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Ìõóôéêüôçôá åðéëïãÞò ôïõ bot %s åßíáé ôþñá OFF."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Private option for %s is now OFF."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr ""
+#~ "Ç åðéëïãÞ ðñïóôáóßáò åßíáé ôþñá ON, ìå êáíÝíá ðåñéèþñéï íá ãßíåé åíôïëÞ "
+#~ "áíáãíþñéóçò."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER ^_êùäéêü^_ [^_email^_]\t"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Restricted access option for %s is now OFF."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Ç SOP ëßóôá ôïõ %s åßíáé:\n"
+#~ "  Íïýìåñï  Øåõäþíõìï"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Channel %s not registered"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND channel [reason]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Secure founder option for %s is now OFF."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Secure ops option for %s is now OFF."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Secure option for %s is now OFF."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Ïé õðçñåóßåò áäõíáôïýí íá áëëÜîïõí ôéò åðéëïãÝò.  Ïé servers åßíáé óùóôÜ "
+#~ "öôéáãìÝíïé?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ìÝñåò, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñá, %d ëåðôü"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñá, %d ëåðôÜ"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d þñåò, %d ëåðôü"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôü, %d äåõôåñüëåðôï"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôü, %d äåõôåñüëåðôá"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Ïé õðçñåóßåò åßíáé óõíäåäåìÝíåò %d ëåðôÜ, %d äåõôåñüëåðôï"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Signed kick option for %s is now OFF."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ HOP åßíáé åêôüò ëåéôïõñãßáò."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ SOP åßíáé åêôüò ëåéôïõñãßáò."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr "Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ VOP åßíáé åêôüò ëåéôïõñãßáò."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr "Óõãíþìç, ìðïñåßò ìüíï íá ÷ñçóéìïðïéÞóåéò %d AOP/SOP/VOP óôï êáíÜëé."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "ÅðéëïãÞ óõìâßùóçò åßíáé ôþñá OFF óôï êáíÜëé %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Óýíôáîç: RANDOMNEWS ADD ðåñéå÷üìåíï"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR channel what"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Óýíôáîç: OPERNEWS ADD ðåñéå÷üìåíï"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Óýíôáîç: SET DEBUG {ON | OFF | num}\n"
+#~ "\n"
+#~ "ÁëëÜæåé óå debug mode on Þ off.  Óå debug mode, üëç ç data óôÝëíåôå\n"
+#~ "êáé áðü ôá Services ìÝóù Üëëùí debugging\n"
+#~ "ìçíõìÜôùí ãñÜöïíôáé óå log áñ÷åßï.  Áí ôï _num_ äßíåôáé\n"
+#~ "ôï debug mode åíåñãïðïéåßôáé, ìå debugging level ñõèìéóìÝíï\n"
+#~ "óôï num.\n"
+#~ "\n"
+#~ "ÁõôÞ ç åðéëïãÞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëÞ-line åðéëïãÞ\t\n"
+#~ "-debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Óýíôáîç åíôïëÞò: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Topic lock option for %s is now OFF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Topic retention option for %s is now OFF."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "¢ãíùóôç åíôïëÞ %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "¢ãíùóôç åðéëïãÞ %s.\n"
+#~ "ÃñÜøå /msg %S HELP KICK ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "User %s not found in the nickserv db."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Ç VOP ëßóôá ôïõ %s åßíáé:\n"
+#~ "  Íïýìåñï  Øåõäþíõìï"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Bot %s äéáãñÜöçêå."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Ôï ôåëåõôáßï ìÞíõìá ðïõ ðÞãáéíå ãéá ôïí %s áêõñþèçêå."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Your vhost of %s is now activated."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Bot %s äéáãñÜöçêå."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/lang/anope.es_ES.po b/language/anope.es_ES.po
index 253d21380..5f8ebd4d1 100644
--- a/lang/anope.es_ES.po
+++ b/language/anope.es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:23-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Spanish\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s para mayor informacion."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Para mayor informacion acerca de un comando especifico\n"
 "tipea /msg %S HELP comando."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -55,14 +55,15 @@ msgstr ""
 "informacion sobre un comando especifico, tipea  \n"
 "/msg %S HELP comando."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S te permite registrar y controlar varios\n"
@@ -75,12 +76,12 @@ msgstr ""
 "tipea /msg %S HELP comando.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -93,122 +94,106 @@ msgstr ""
 "\n"
 "Los comandos de %S incluyen:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s Cambiado el nivel de DEFCON a %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s añadido a la lista AOP de %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s añadido a la lista HOP de %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s añadido a la lista SOP de %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s añadido a la lista VOP de %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s añadido a la lista de acceso de %s con nivel %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s añadido a la lista de kicks automaticos en el canal %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s añadida a  la lista de bad words de  %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s añadido a la lista de AKILLs."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s añadido a la lista de SNLINEs."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s añadido a la lista de SQLINEs."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s añadido a la lista de SZLINEs."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s añadido a tu lista de acceso."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s añadido a tu lista de acceso."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s ya existe en la lista de bad words de %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s ya esta presente en la lista de kick automatico en el canal %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s ya esta presente en la lista de AKILLs."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s ya existe en la lista de SNLINEs."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s ya existe en la lista de SQLINEs."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s ya existe en la lista de SZLINEs."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s no puede ser tomado como veces a banear"
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s cambio tus modos de usuario."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -217,133 +202,114 @@ msgstr ""
 "Lista del canal %s:\n"
 "Nombre               Modos de Usr. Topico"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s borrado de la lista AOP de %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s borrado de la lista HOP de %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s borrado de la lista SOP de %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s borrado de la lista VOP de %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s borrado de la lista de acceso de %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s borrado de la lista de kicks automaticos del canal %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s borrada de la lista de bad words de %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 "%s instancias borradas de la lista de excepciones al limite de sesiones."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s borrado de la lista de AKILLs."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s borrado de la lista de SNLINEs."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s borrado de la lista de SQLINEs."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s borrado de la lista de SZLINEs."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s borrado de tu lista de acceso."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s inhabilitado(s) en el canal %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s tiene demasiados canales registrados."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s ya esta cubierto por %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s añadido a tu lista de acceso."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s no es un tipo de ban valido."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s no es un bot valido o el canal no esta registrado."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s no es un e-mail valido."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s ya no esta siempre activo en el canal %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "El nick %s no esta en el canal %s actualmente."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s esta ahora siempre activo en el canal %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s no encontrado en la lista ignore."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -352,107 +318,72 @@ msgstr ""
 "%s coincide con una excepcion en %s y no puede ser baneado hasta que la "
 "excepcion haya sido removida."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s movido a %s en la lista AOP."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s movido a %s en la lista HOP."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s movido a %s en la lista SOP."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s movido a %s en la lista VOP."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s no encontrado en la lista AOP de %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s no encontrado en la lista HOP de %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s no encontrado en la lista SOP de %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s no encontrado en la lista VOP de %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s no encontrado en la lista de acceso de %s."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s no encontrado en la lista de kicks automaticos en el canal %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s no encontrada en la lista de bad words de %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s no encontrado en la lista de sesion."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s no encontrado en la lista de excepciones al limite de sesiones."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s no encontrado en la lista de AKILLs."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s no encontrado en la lista de SNLINEs."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s no encontrado en la lista de SQLINEs"
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s no encontrado en la lista de SZLINEs."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s no encontrado en tu lista de acceso."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s borrado de tu lista de acceso."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -461,33 +392,33 @@ msgstr ""
 "Lista de usuarios de %s:\n"
 "Nick                 Mascara"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s ya no sera ignorado."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s sera ignorado por %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s sera ignorado permanentemente."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Noticia: todos los comandos enviados a %S son monitoreados!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Noticia: Los Servicios estan en modo read-only; Los cambios no seran "
 "salvados!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -495,11 +426,11 @@ msgstr ""
 "Recordatorio: Las mascaras AKILL no pueden contener nicks; asegurate de no "
 "haber incluido el nick en tu mascara."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Recordatorio: Solo puedes añadir mascaras IP a la lista de SZLINEs."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -542,41 +473,38 @@ msgstr ""
 "usando el comando LEVELS; tipea /msg %S HELP LEVELS\n"
 "para mayor informacion."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Advertencia: haz sobrepasado el maximo numero de memos (%d). Te sera "
-"imposible recibir mas memos hasta que borres algunos de los existentes."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Advertencia: haz alcanzado el maximo numero de memos (%d). No podras recibir "
-"mas memos hasta que borres algunos de los existentes."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] El memo que enviaste ha sido leido."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] El memo que enviaste a %s ha sido leido."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER clave email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER clave email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP grupo clave"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -586,7 +514,7 @@ msgstr ""
 "u otra accion maliciosa. El Abuso de %S resultara en, a lo\n"
 "minimo, la perdida del nickname comprometido."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -599,7 +527,7 @@ msgstr ""
 "ver el acceso, AKICK, y seteos de las listas de niveles para\n"
 "cualquier canal."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -611,370 +539,386 @@ msgstr ""
 "ver la lista de acceso para cualquier nickname\n"
 "(/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "               Opciones : %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "                 vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Nick del bot : %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "           Nick del bot : Aun no asignado."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "              Opciones: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "  Kicker por mayusculas : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "  Kicker por mayusculas : %s (%d kick(s) para ban; minimo %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "            Caps kicker : %s (minimo %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "          Fundador: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Tipo de ban: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "    Kicker por negritas : %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker por negritas : %s (%d kick(s) para ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kicker por flood : %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Kicker por flood : %s (%d kick(s) para ban; %d lineas en %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kicker por flood : %s (%d lineas en %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Mascara : %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "     Kicker por colores : %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "     Kicker por colores : %s (%d kick(s) para ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expira en: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "       Tipo de ban: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "  Ultima vez usado: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "      Modo de lock: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "  Kicker por repeticion : %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "  Kicker por repeticion : %s (%d kick(s) para ban; %d veces)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "  Kicker por repeticion : %s (%d veces)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "           Sucesor: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspendido: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "  Kicker por mayusculas : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "    Kicker por negritas : %s (%d kick(s) para ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "         Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "         Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "      Ultimo topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "        Registrado: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (inhabilitado)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (solo el fundador)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifica la lista de direcciones autorizadas"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Modifica la lista de usuarios privilegiados"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "ACT                Makes the bot do the equivalent of a \"/me\" command"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Mantiene la lista de AutoKick"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Mantiene la lista de AutoKick"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Manipula la lista AKILL"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      List channels you have access on"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Modifica la lista de usuarios AOP"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Asigna un bot a un canal"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Mantiene lista de bad words"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bans a selected nick on a channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr ""
 "    BANTYPE       Setea como los Servicios ponen bans\n"
 "                  en el canal"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Mantiene la lista de bots de la red"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Lista bots disponibles"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Cancela el ultimo memo que enviaste"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL all users on a specific channel"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Lista todos los records de canal"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Checks if last memo to a nick was read"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Limpia los modos de un canal"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirm a nickserv auth code"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "    Creado : %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipulate the DefCon system"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Borra el vhost de otro usuario."
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Borra uno o mas memos"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Borra el vhost de todos los nicks en un grupo."
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deops a selected nick on a channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Setea la descripcion del canal"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoices a selected nick on a channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Setea el display de tu grupo con Servicios"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Cancela la registracion de un canal"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Cancela la registracion de un nickname"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "       Descripcion: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Asocia un E-mail con tu nickname"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Setea un mensaje a enviar a\n"
-"                  los usuarios cuando entren al canal"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Modifica la lista de limite de sesion"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Previene un canal a ser usado"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Previene un nickname a ser usado"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Setea el fundador de un canal"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -982,70 +926,75 @@ msgstr ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Returns the key of the given channel"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Recupera la clave para un nickname\n"
 "               (solo si encripcion esta desabilitada)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lists all nicknames in your group"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Envia un mensaje a todos los usuarios"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Asocia un saludo con tu nickname"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP\tSincroniza vhost en todos los nicks del grupo."
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Ingresa a un grupo"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr " Mensaje de bienvenida: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Halfops a selected nick on a channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Esconde algunas partes de tu informacion"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Para identificarte con tu clave"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE\tIgnora a un usuario"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE\tIgnora a un usuario"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1053,49 +1002,49 @@ msgstr ""
 "INFO               Allows you to see BotServ information about a channel or "
 "a bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Displays information about a given nickname"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Lists information about the named registered channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Displays information about your memos"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        \"Jupiter\" un servidor"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 "    KEEPTOPIC     Retiene el topic cuando el canal no\n"
 "                  esta en uso"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Configura kickers"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Kickea un usuario de un canal"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicks a selected nick from a channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Enciende o apaga la proteccion"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1103,95 +1052,88 @@ msgstr ""
 "    LANGUAGE   Setea el lenguaje con el que Servicios te\n"
 "                   enviara mensajes"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Redefine el significado de niveles de acceso"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Muestra uno o mas vhosts."
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       List all registered nicknames that match a given pattern"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lists all registered channels matching the given pattern"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Lista tus memos"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   Define mensajes para ser mostrados a usuarios\n"
 "                al conectarse"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Fija los modos de canal on u off"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Cambia los modos de un canal"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Limpia los modos de un canal"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Info about a loaded module"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     List loaded modules"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Un-Load a module"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr ""
 "    MSG        Cambia el metodo de comunicacion con\n"
 "                    Servicios"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1199,94 +1141,85 @@ msgstr ""
 "    NOOP        Temporalmente remueve todas las lineas O: de\n"
 "                un servidor remotamente"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Desactiva tu vhost asignado."
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE\tOtorga privilegios IRCOP temporarios"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Activa tu vhost asignado."
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Gives Op status to a selected nick on a channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 "    OPERNEWS    Define mensajes a ser mostrados a usuarios al\n"
 "                transformarse en operadores"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Envia una noticia cuando los comandos\n"
 "                  OP/DEOP son usados"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gives you owner status on channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "    Opciones : %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Setea la clave de tu nickname"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Regula el uso de comandos criticos"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Esconde el canal del comando LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Previene tu nickname de aparecer en un\n"
-"                   /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protects a selected nick on a channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr ""
 "    QUIT        Termina el programa de servicios sin guardar\n"
 "                los cambios"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1294,246 +1227,249 @@ msgstr ""
 "    RANDOMNEWS  Define mensajes para ser mostrados al azar a\n"
 "                usuarios al conectarse"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Lee uno o mas memos"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER    Killea otro usuario que este usando tu nickname"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Registra un nickname"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Registra un nickname"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr "    RELEASE    Retoma custodia de tu nick luego de RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Recarga la configuracion de los Servicios"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Resend a nickserv auth code"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords."
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr ""
 "    RESTART     Guarda la base de datos de los Servicios y\n"
 "                recarga los Servicios"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Restrinje el acceso al canal"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Sends a memo and requests a read receipt"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Kicker por inversos : %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker por inversos : %s (%d kick(s) para ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "SAY                Makes the bot say the given text on the given channel"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Activa las opciones de seguridad de %S"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Enciende o apaga la seguridad de nickname"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr ""
 "    SECUREFOUNDER Estricto control del estatus de fundador\n"
 "                  de canal"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Estricto control del estatus de chanop"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Envia un memo a un nick o canal"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Envia un memo a todos los usuarios registrados"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Olvidaste tu clave? Intenta esto"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Muestra la lista de sesiones de host"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Configura opciones de bots"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Setea el vhost de otro usuario."
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Setea varias opciones globales de los Servicios"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Setea opciones e informacion de un canal"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Setea protecciones, incluyendo kills"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Setea opciones relacionadas a memos"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Setea el vhost de todos los nicks en un grupo."
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr ""
 "    SHUTDOWN    Termina el programa de Servicios guardando los\n"
 "                cambios"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Firma kicks hechos con el comando KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Manipula la lista SNLINE"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Modifica la lista de usuarios SOP"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Manipula la lista SQLINE"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF\tMuestra la lista del staff y su status"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF    Envia un memo a todos los opers/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Muestra estatus de los Servicios y la red"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Retorna el nivel de acceso actual de un\n"
 "               usuario en un canal"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Returns the owner status of the given nickname"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Setea el sucesor de un canal"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Previene un canal a ser usado preservando \n"
 "               toda su informacion."
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend a given nick"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Forcefully change a user's nickname"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Manipula la lista SZLINE"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr ""
 "    TOPICLOCK     El topic solo puede ser cambiado con\n"
 "                  TOPIC"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE\tOtorga cambios de modos de usuario"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Unassigns a bot from a channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Libera la suspencion del canal."
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend a given nick"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1541,86 +1477,86 @@ msgstr ""
 "    UPDATE      Fuerza a la base de datos de los Servicios a\n"
 "                ser updateada a disco inmediatamente"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Lista todos los records de usuarios"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    Usado en : %d canal(es)"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Voices a selected nick on a channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr ""
 "    XOP           Cambia el sistema de privilegios de\n"
 "                  usuario"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Kicker por Bad words : %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Kicker por Bad words : %s (%d kick(s) para ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "      Direccion E-mail: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "   Esta en linea desde: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "      Ultima vez visto: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr " Topic seteado por: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1629,17 +1565,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1648,98 +1584,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "Mensaje de entrada: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "  Nombre real : %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "     Tiempo registrado: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  Kicker por subrayados : %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  Kicker por subrayados : %s (%d kick(s) para ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Num  De                Fecha/Hora"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1748,7 +1688,7 @@ msgstr ""
 "%3d  %s (por %s en %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1757,25 +1697,16 @@ msgstr ""
 "%3d %s (por %s en %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (pegado) (por %s en %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (by %s on %s; %s)\n"
 "   Limite: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1784,255 +1715,261 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Comandos para %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s no es notificado por memos nuevos."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modulos cargados."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bots disponibles."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d dias"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (por %s en %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d horas"
+msgid "%d Modules loaded."
+msgstr "%d Modulos cargados."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minutos"
+msgid "%d bots available."
+msgstr "%d bots disponibles."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicknames en el grupo."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "La lista AOP de %s esta vacia."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "La lista HOP de %s esta vacia."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "La lista SOP de %s esta vacia."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "La lista VOP de %s esta vacia."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "La lista de acceso de %s esta vacia."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "La lista de kicks automaticos del canal %s esta vacia."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "La lista de bad words de %s esta vacia."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s no puede ser el sucesor en el canal %s ya que el es el fundador."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s no puede recibir memos."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Comandos para %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr ""
 "%s La covertura es muy amplia; Por favor usa una mascara mas especifica."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr ""
 "%s actualmente tienes %d memos, de los cuales %d aun no han sido leidos."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s actualmente tiene %d memos, de los cuales 1 aun no ha sido leido."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s actualmente tiene %d memos."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s actualmente tienes %d memos, de los cuales ninguno ha sido leido ."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s actualmente tiene 1 memo y aun no ha sido leido."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s tiene 1 memo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s no tiene memos."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s actualmente tiene muchos memos y no puede recibir mas."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s no tiene limite para memos."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s no tiene memos."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s no tiene memos nuevos."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s es %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s esta momentaneamente offline."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s Esta actualmente en linea. "
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s esta deshabilitado"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s esta habilitado"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s ya no es un Super-Admin."
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s no es notificado por memos nuevos."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s es notificado por memos nuevos cuando se conecta y cuando le son enviados."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s es notificado de nuevos memos cuando se conecta."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s es notificado cuando nuevos memos le son enviados."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s es ahora un Super-Admin."
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Lista AOP para %s:\n"
+"  Num  Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s no encontrado en la lista de kicks automaticos en el canal %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s borrado de la lista de kicks automaticos del canal %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s no te enviara ninguna notificacion acerca de tus memos."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s ahora te notificara de tus memos cuando te sean enviados."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2041,94 +1978,78 @@ msgstr ""
 "%s ahora te notificara de tus memos cuando te conectes y cuando te sean "
 "enviados."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s ahora te notificara de tus memos cuando te conectes o saques tu /AWAY."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) añadido a la lista de bots."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "El limite de memos para %s es %d, y no puede ser cambiado."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "El limite de memos para %s es %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL cualquier nuevo cliente que se conecte"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Fuerza Modos de Canal (%s) para ser seteado en todos los canales"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignora a cualquier no-operador notificando"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill a cualquier NUEVO cliente que se conecte"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* No cambios en MLOCK"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* No nuevos registros de canales"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* No hay nuevos memos enviados"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* No nuevos registros de nicks"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Ignora a los no-operadores sin notificar"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Usa el reducido limite de sesion de %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 dia"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 hora"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minuto"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 segundo"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Un massmemo ha sido enviado a todos los usuarios registrados."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2136,133 +2057,135 @@ msgid ""
 msgstr ""
 "Una notificacion ha sido enviada a %s informando que has leido su memo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "El password ha sido enviado a %s, tipea /msg %s confirm <password> para "
 "completar el registro."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "Un vhost ident debe tener el formato de un ident valido"
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Error! Un vhost solo puede contener A-Z, a-z, 0-9, '.' y '-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|VIEW|CLEAR} [nick [nivel] | lista]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT canal texto"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK canal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-o-mascara] [razon]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE en %s completa; %d usuarios afectados."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "La lista de AKILLS esta vacia."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista} "
 "[razon]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instancia]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista AOP para %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Acceso denegado."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Nivel de acceso para %s en %s cambiada a %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Nivel de acceso para %s en %s no cambiada de %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "El nivel de acceso debe ser entre %d y %d inclusive."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "El nivel de acceso no puede ser cero."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Opciones del nivel de acceso para el canal %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Niveles de acceso para %s resetados a los valores originales."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "La lista de acceso para %s esta vacia."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lista de acceso para %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Lista de acceso para %s:\n"
 "  Num   Niv  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista de acceso:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2271,22 +2194,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s añadido a la lista de kicks automaticos en el canal %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Nueva noticia de entrada anadida (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Nueva noticia de oper anadida (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Nueva noticia al azar anadida (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2294,239 +2222,232 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Todas las lineas O de %s han sido removidas."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Todas las lineas O de %s han sido reseteadas."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Todos los bans en el canal %s han sido removidos."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Todas las excepciones en el canal %s han sido removidas."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Todos los invites en el canal %s han sido removidos."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Todas las noticias de entrada borradas."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Todos los memos para el canal %s han sido borrados."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Todos los modos limpiados del canal %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Todos los modos en el canal %s han sido reseteados."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Todos tus memos han sido borrados."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Todas las noticias de oper borradas."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Todas las noticias al azar borradas."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Todos los usuarios han sido kickeados del canal %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Autorizado para halfop/dehalfop a si mismo"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Autorizado para op/deop a si mismo"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Autorizado para protect/deprotect a si mismo"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Autorizado para voice/devoice a si mismo"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Habilitado para asignar/deasignar un bot"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Permitido banearse a si mismo"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Autorizado para kickearse a si mismo"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Habilitado para listar/leer memos del canal"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Habilitado para modificar la lista de acceso"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Habilitado para usar el comando AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Habilitado para usar el comando BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Permitido usar el comando BAN"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Habilitado para usar el comando CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Habilitado para usar el comando GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Habilitado para usar el comando HALFOP/DEHALFOP"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr ""
 "Permitido usar el comando INFO con\n"
 "la opcion ALL"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Habilitado para usar el comando INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Habilitado para usar el comando KICK"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Habilitado para usar el comando OP/DEOP"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Habilitado para usar el comando PROTECT/DEPROTECT"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Habilitado para usar el comando SAY y ACT"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Habilitado para usar el comando SET (no FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Permitido usar el comando TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Habilitado para usar el comando UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Habilitado para usar el comando VOICE/DEVOICE"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Habilitado para utilizar comandos de fantasia"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Habilitado para ver la lista de acceso"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista de kicks automaticos para el canal %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Status automatico de operador de canal"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Modo automatico +a"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Modo automatico +h"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Modo automatico +v"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [palabra | lista] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2536,7 +2457,7 @@ msgstr ""
 "BOT CHANGE nick-antiguo nick-nuevo [usuario [host [nombre-real]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2545,111 +2466,109 @@ msgstr ""
 "Lista de Bad words para %s:\n"
 "  Num   Palabra                        Tipo"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "La lista de bad words esta ahora vacia."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Tipo de ban para el canal %s es ahora #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Modos binarios y bans limpiados del canal %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "El bot %s ya existe."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "El bot %s no existe."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "El bot %s ha sido asignado al canal %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "El bot %s ha sido cambiado a %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "El bot %s ha sido borrado."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s ya esta asignado al canal %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot kickeara ops en el canal %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot kickeara voices en el canal %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot no kickeara ops en el canal %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot no kickeara voices en el canal %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Los Hosts de bots pueden tener solo %d caracteres."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Los hosts de bots pueden contener solo caracteres de hosts validos."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Los Idents de bots pueden tener solo %d caracteres."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Los idents de bots pueden contener solo caracteres validos."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Los nicks de bots pueden solo contener caracteres de nicks validos."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "El bot no esta en el canal %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Lista de bots:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"El bot entrara a un canal cuando quiera que hayan\n"
-"%d usuario(s) en el."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2660,7 +2579,7 @@ msgstr ""
 "%d kicks al mismo usuario. Usa el comando BADWORDS\n"
 "para añadir o remover palabras."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2668,20 +2587,20 @@ msgstr ""
 "El bot ahora kickeara bad words. Usa el comando BADWORDS\n"
 "para añadir o remover palabras."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "El bot ahora kickeara negritas, y baneara despues de \n"
 "%d kicks al mismo usuario."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "El bot ahora kickeara negritas."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2692,7 +2611,7 @@ msgstr ""
 "%d caracteres y %d%% del mensaje entero), y baneara\n"
 "despues de %d kicks al mismo usuario."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2701,47 +2620,47 @@ msgstr ""
 "El bot ahora kickeara mayusculas (deben ser al menos\n"
 "%d caracteres y %d%% del mensaje entero)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "El bot ahora kickeara colores, y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "El bot ahora kickeara colores."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "El bot ahora kickeara flood (%d lineas in %d segundos), y \n"
 "baneara despues de %d kicks al mismo usuario."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "El bot ahora kickeara flood (%d lineas en %d segundos)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2752,7 +2671,7 @@ msgstr ""
 "lo mismo), y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2761,137 +2680,153 @@ msgstr ""
 "El bot ahora kickeara repeats (usuarios que repitan %d veces\n"
 "lo mismo)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "El bot ahora kickeara reversos, y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "El bot ahora kickeara reversos."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "El bot ahora kickeara subrayados, y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "El bot ahora kickeara subrayados."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "El bot ahora kickeara colores."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "El bot ya no kickeara bad words. "
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "El bot ya no kickeara negritas."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "El bot ya no kickeara mayusculas."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "El bot ya no kickeara colores."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "El bot ya no kickeara flood."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "El bot ya no kickeara repeats."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "El bot ya no kickeara reversos."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "El bot ya no kickeara subrayados."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "El bot ya no kickeara mayusculas."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ      : %6d records, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots reservados a operadores de IRC:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes leidos   : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes escritos : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR canal modos-a-limpiar"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "No puedo desconectar a  %s porque es un administrador de servicios."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR canal modos-a-limpiar"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Imposible enviar el e-mail ahora; por favor intenta mas tarde."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ     : %6d records, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Cambiados los modos de usuario de %s."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "El Canal %s no existe."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "El canal %s ha sido botado."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2900,143 +2835,102 @@ msgstr ""
 "El Canal %s ha sido prohibido por %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "El canal %s ya esta registrado!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Canal %s ahora prohibido."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Canal %s ahora liberado."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Canal %s ahora prohibido."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "El Canal %s no esta registrado."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "El Canal %s no puede ser registrado o usado."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "El canal %s no puede ser registrado."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "El canal %s esta registrado bajo tu nickname: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canal        : %6d records, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "El canal %s expirara."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "El canal %s no expirara."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "La lista AOP de canales %s ha sido limpiada."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "La lista HOP de canales %s ha sido limpiada."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "La lista HOP de canales %s ha sido limpiada."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "La lista HOP de canales %s ha sido limpiada."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La lista de acceso para el canal %s ha sido limpiada."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La lista de kicks automaticos del canal %s ha sido limpiada."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Canal %s ahora liberado."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr ""
-"La lista de AOP de canales solo puede contener nicks\n"
-"registrados."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Listas HOP de canales solo pueden tener nicks registrados."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Listas SOP de canales solo pueden tener nicks registrados."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINEs de canal no estan soportadas por tu IRCd, asi que no las puedes usar."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Listas VOP de canales solo pueden tener nicks registrados."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Las listas de acceso a canales solo pueden contener nicks registrados."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3044,11 +2938,7 @@ msgstr ""
 "Lista de canal:\n"
 "Nombre               Modos de Usr. Topico"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Status de operador de canal deshabilitado."
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3057,7 +2947,7 @@ msgstr ""
 "Canales en los que %s tiene acceso:\n"
 "  Num  Canal                Nivel    Descripcion "
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3065,31 +2955,16 @@ msgstr ""
 "Canales en los que tienes acceso:\n"
 "  Num  Canal                Nivel    Descripcion "
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Imposible prohibir el canal %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "La prohibicion de %s no fue posible!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Imposible liberar el canal %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Imposible suspender el canal %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Lista actual de AKILLs:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3097,15 +2972,15 @@ msgstr ""
 "Lista actual de AKILLs:\n"
 "  Num   Mascara                           Razon"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Lista actual de modulos:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Lista actual de SNLINEs:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3113,11 +2988,11 @@ msgstr ""
 "Lista actual de SNLINEs:\n"
 "  Num   Mascara                           Razon"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Lista actual de SQLINEs:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3125,11 +3000,11 @@ msgstr ""
 "Lista actual de SQLINEs:\n"
 "  Num   Mascara                           Razon"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Lista actual de SZLINEs:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3137,725 +3012,612 @@ msgstr ""
 "Lista actual de SZLINEs:\n"
 "  Num   Mascara                            Razon"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Lista de excepciones al limite de sesiones actual:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Numero actual de AKILLs: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Numero actual de SNLINEs: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Numero actual de SQLINEs: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Numero actual de SZLINEs: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Actuales usuarios: %d (%d ops)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {numero | lista | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP canal"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Tiempo de expiracion por defecto de AKILL: %d dias"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Tiempo de expiracion por defecto de AKILL: %d horas"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Tiempo de expiracion por defecto de AKILL: %d minutos"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Tiempo de expiracion por defecto de AKILL: 1 dia"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Tiempo de expiracion por defecto de AKILL: 1 hora"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Tiempo de expiracion por defecto de AKILL: 1 minuto"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Tiempo de expiracion por defecto de AKILL: Sin expiracion"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Tiempo de expiracion por defecto de SNLINE: %d dias"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Tiempo de expiracion por defecto de SNLINE: %d horas"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Tiempo de expiracion por defecto de SNLINE: %d minutos"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Tiempo de expiracion por defecto de SNLINE: 1 dia"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Tiempo de expiracion por defecto de SNLINE: 1 hora"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Tiempo de expiracion por defecto de SNLINE: 1 minuto"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Tiempo de expiracion por defecto de SNLINE: Sin expiracion"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Tiempo de expiracion por defecto de SQLINE: %d dias"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Tiempo de expiracion por defecto de SQLINE: %d horas"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Tiempo de expiracion por defecto de SQLINE: %d minutos"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Tiempo de expiracion por defecto de SQLINE: 1 dia"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Tiempo de expiracion por defecto de SQLINE: 1 hora"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Tiempo de expiracion por defecto de SQLINE: 1 minuto"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Tiempo de expiracion por defecto de SQLINE: Sin expiracion"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Tiempo de expiracion por defecto de SZLINE: %d dias"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Tiempo de expiracion por defecto de SZLINE: %d horas"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Tiempo de expiracion por defecto de SZLINE: %d minutos"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Tiempo de expiracion por defecto de SZLINE: 1 dia"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Tiempo de expiracion por defecto de SZLINE: 1 hora"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Tiempo de expiracion por defecto de SZLINE: 1 minuto"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Tiempo de expiracion por defecto de SZLINE: Sin expiracion"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "%d instancias borradas de la lista AOP de %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "%d instancias borradas de la lista HOP de %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "%d instancias borradas de la lista SOP de %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "%d instancias borradas de la lista VOP de %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "%d instancias borradas de la lista de acceso de %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d instancias borradas de la lista de kicks automaticos del canal %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "%d palabras borradas de la lista de bad words de %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr ""
 "%d instancias borradas de la lista de excepciones al limite de sesiones."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "%d instancias borradas de la lista de AKILLs."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "%d instancias borradas de la lista de SNLINEs."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "%d instancias borradas de la lista de SQLINEs."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "%d instancias borradas de la lista de SZLINEs."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "1 instancia borrada de la lista AOP de %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "1 instancia borrada de la lista HOP de %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "1 instancia borrada de la lista SOP de %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "1 instancia borrada de la lista VOP de %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 instancia borrada de la lista de acceso de %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 instancia borrada de la lista de kicks automaticos del canal %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "1 palabra borrada de la lista de bad words de %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "1 instancia borrada de la lista de excepciones al limite de sesiones."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "1 instancia borrada de la lista de AKILLs."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "1 instancia borrada de la lista de SNLINEs."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "1 instancia borrada de la lista de SQLINEs."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "1 instancia borrada de la lista de SZLINEs."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "1 instancia borrada de la lista AOP de %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La descripcion de %s cambiada a%s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "Desactivada"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Todos los registros mostrados (Cuenta: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Todos los registros mostrados de %d a %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr ""
 "Todos los registro mostrados que coinciden con la clave %s (Cuenta: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "No uses negritas en este canal!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "No uses colores en este canal!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "No uses reversos en este canal!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "No uses la palabra %s en este canal!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "No uses subrayados en este canal!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Direccion E-mail no seteada."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "El e-mail para %s es invalido."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametros]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Coinciden %s a %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "Activada"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Fin de la lista de %s."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Fin de la lista de acceso."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Fin de la lista de canales."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fin de la lista - %d/%d resultado(s) mostrado(s)."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fin de la lista - %d/%d resultado(s) mostrado(s)."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Fin de la lista de usuarios."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Español"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Mensage de entrada para %s cambiado."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Mensaje de entrada para %s no seteado."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr "Error! El Ident es muy largo. Usa un ident con menos de %d caracteres."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr "Error! El vhost es muy largo. Usa un host con menos de %d caracteres."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Excepcion para %s (#%d) movido a la posicion %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expira en: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Tiempo de expiracion para %s cambiado."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID canal razon"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [razon]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nickname razon"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nickname [razon]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Modo fantasia ahora Activado en el canal %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Modo fantasia ahora Desactivado en el canal %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Modo fantasia ahora Activado en el canal %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s ya no sera ignorado."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "El Fundador de %s cambiado a %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Sin comodines (WildCards)!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY canal"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "El comando GETPASS no esta disponible por el uso de encriptacion."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [clave]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL mensaje"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP grupo clave"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "El ghost con tu nick ha sido killeado."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Saludo"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Mensaje de bienvenida mostrado"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Modo saludo ahora Desactivado en el canal %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Modo saludo ahora Activado en el canal %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista HOP para %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts con al menos %d sesiones:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY clave"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instancia]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tiempo] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Si no cambias tu nick en 20 segundos, Lo cambiare yo."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Si no cambias tu nick en un minuto, Lo cambiare yo."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Codigo ignore sera usado."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Codigo ignore no sera usado."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "La lista ignore ha sido vaciada."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "La lista ignore esta vacia."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Lista de bots:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3871,29 +3633,25 @@ msgstr ""
 "Tipea /msg %S HELP SET opcion para mayor\n"
 "informacion acerca de una opcion especifica."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informacion para el bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informacion para el canal %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Error Interno - Imposible procesar peticion."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Tiempo de expiracion invalido."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3901,12 +3659,12 @@ msgstr ""
 "Mascara invalida. Solo mascaras reales son validas ya que excepciones no son "
 "comparadas a nicks o usernames."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr "Password invalido. Chequea el e-mail e intenta nuevamente."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3915,295 +3673,309 @@ msgstr ""
 "Limite de sesion invalido. Debe ser un entero valido mayor o igual a cero y "
 "menor a %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Valor de umbral invalido. debe ser un entero valido mayor a 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE nombre-del-servidor [razon]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal opcion {ON|OFF} [seteos]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK canal usuario razon"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [item [nivel]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST patron"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST patron [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [lista | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Lenguage cambiado a Español."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ultimo memo enviado a %s fue cancelado."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Ultimo mensaje quit: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ultima direccion vista: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Nivel para %s en el canal %s cambiado a %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "El nivel debe ser entre %d a %d inclusive."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Este comando es inservible en este modo."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista de resultados concordando %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista de nicknames en el grupo de %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Lista de nicknames en tu grupo:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Canales locales no pueden ser registrados."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Noticia de entrada #%d borrada."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Noticia de entrada #%d no encontrada!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Noticias de entrada:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE canal modos"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO NombreArchivo"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD NombreArchivo"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD NombreArchivo"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD NombreArchivo"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "La mascara %s ya esta presente en tu lista de acceso."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "La mascara debe ser en la forma usuario@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Maximo  numero de usuarios: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Memo %d de %s (%s). Para borrarlo tipea: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Memo %d de %s (%s). Para borrarlo tipea: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d ha sido borrado."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limite de memos para %s deshabilitado."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limite de memos para %s seteado a %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de memos para %s seteado a 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Limite de memos muy alto; limitandolo a %d en vez."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviado a %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Memos para %s. Para leerlos tipea: /msg %s READ numero"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Memos para %s. Para leerlos tipea: /msg %s READ %s numero"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Memos para %s. Para leerlos tipea: /msg %s READ numero"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Memos para %s. Para leerlos tipea: /msg %s READ %s numero"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Modo de mensaje"
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Modo %c ignorado porque no puedes lockearlo."
-
-#: language.cpp:1314
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Modo +o ha sido removido del canal %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Modo de lock en el canal %s cambiado a %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "      Modo de lock: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modulo %s cargado "
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modulo %s cargado "
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modulo %s descargado"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modulo: %s Version: %s  Autor: %s cargado: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modulo: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} servidor"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliases NS   : %6d records, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grupos NS    : %6d records, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Jamas expulsado por los kicks del bot"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Nuevo memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Nuevos memos para %s. Para leerlos tipea: /msg %s READ numero"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Nuevos memos para %s. Para leerlos tipea: /msg %s READ %s numero"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "La lista de noticias esta llena!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4212,146 +3984,132 @@ msgstr ""
 "El nick %s ha sido prohibido por %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "El nick %ses un nickname ilegal, y no puede ser usado. "
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "El nick %s esta actualmente en uso."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "El nick %s es ahora prohibido."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "El nick %s no esta siendo ocupado."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "El nick %s no esta en uso."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "El nick %s no esta registrado."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "El nick %s no puede ser registrado o usado."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s no encontrado en la lista ignore."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "El nick %s fue reducido a %d caracteres."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "El nick %s no ha recibido ningun memo tuyo."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "El nick %s ha sido desconectado."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is currently suspended."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NO registrado. Intentalo nuevamente."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nick %s confirmado."
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "El nickname %s ha sido botado."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "El nickname %s ya esta registrado!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "El nickname %s no puede ser registrado."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "El nickname %s esta registrado bajo tu cuenta: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s registrado."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Registro de Nick (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Clave para el Nickname (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4362,165 +4120,120 @@ msgstr ""
 "automatica, en otras palabras, seran borrados despues\n"
 "de %d dias."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "No se ha encontrado # en frente del nombre del canal."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Modo no bot ahora Desactivado en el canal %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Modo no bot ahora Activado en el canal %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No hay e-mails listados para %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Sin bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "No existe ayuda para %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No hay informacion disponible para el modulo %s"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "No hay noticias de entrada para borrar!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "No existen instancias concordantes en la lista AOP de %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "No existen instancias concordantes en la lista HOP de %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "No existen instancias concordantes en la lista SOP de %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "No existen instancias concordantes en la lista VOP de %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "No hay instancias que concuerden en la lista de acceso de %s ."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr ""
 "No existen instancias que concuerden en la lista de kicks automaticos en el "
 "canal %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "No existen palabras que concuerden en la lista de bad words de %s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "No existen instancias similares en la lista de excepciones al limite de "
 "sesiones."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "No existen instancias similares en la lista de AKILLs."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "No existen instancias similares en la lista de SNLINEs."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "No existen instancias similares en la lista de SQLINEs."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "No existen instancias similares en la lista de SZLINEs."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Ningun memo pudo ser cancelado."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Actualmente no hay modulos cargados"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "No hay noticias de oper para borrar!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "No hay noticias al azar para borrar!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Sin razon."
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Sin firma de kick cuando SIGNKICK LEVEL es usado"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "No existe la instancia (#%d) en la lista AOP de %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "No existe la instancia (#%d) en la lista HOP de %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "No existe la instancia (#%d) en la lista SOP de %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "No existe la instancia (#%d) en la lista VOP de %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Ninguno"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "No es posible entrar a un canal si esta RESTRINGIDO"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4532,95 +4245,93 @@ msgstr ""
 "del canal entre en ese periodo de tiempo) sera\n"
 "automaticamente botado."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Num  Limite Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick opciones"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "Noticia de OP"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "La informacion antigua es igual a la nueva."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Opcion OP-notice para %s Desactivada."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Opcion OP-notice para %s Activada."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Noticia de oper #%d borrada."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Noticia de oper #%d no encontrada!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Noticias de oper:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ     : %6d records, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Una O:Line con las opciones %s ha sido agregada para %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Proteccion de Ops"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opcion %s no puede ser seteada en esta red."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "El password para %s es %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Clave aceptada - Has sido reconocido."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4628,61 +4339,57 @@ msgstr ""
 "Autentificacion por clave requerida para ese comando.\n"
 "Intenta nuevamente despues de tipear /msg %s IDENTIFY clave."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "La clave para %s es %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Clave incorrecta."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "La clave de %s ha sido enviada."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Paz"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Opcion de paz para %s Desactivada."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Opcion de paz para %s Activada."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr ""
 "Por favor contactar a un Operador para que asigne un vhost a este nick."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4691,173 +4398,134 @@ msgstr ""
 "ser algo facil de adivinar (ej. Nombre real o Nick),\n"
 "y no pueden contener el caracter de espacio o tabulacion."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Por favor usa un nombre de servidor valido cuando use JUPE"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Por favor usar el simbolo # cuando intentes registrar un canal."
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Por favor espera %d segundos e intente nuevamente."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Por favor espera %d segundos antes de usar el comando GROUP nuevamente."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Por favor espera %d segundos antes de usar el comando REGISTER nuevamente."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr ""
 "Por favor espera %d segundos antes de usar el comando RSEND nuevamente."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Por favor espera %d segundos antes de utilizar el comando SEND nuevamente."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Privado"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Modo privado del bot %s esta ahora Desactivado."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Modo privado del bot %s esta ahora Activado."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Opcion de privacidad para %s Desactivada."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Opcion de privacidad para %s Activada."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Proteccion"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "La protection esta Activada, sin demora."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Comandos entregados: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {lista | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [clave]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER canal descripcion"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER clave email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER clave [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [clave]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | canal} texto-memo"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Noticia al azar #%d borrada."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Noticia al azar #%d no encontrada!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Noticias al Azar:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4865,296 +4533,307 @@ msgstr ""
 "El paso de registro 1 puede haber expirado. Usa \"/msg %s register "
 "<password> <email>\" primero."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Acceso Restringido"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Acceso restringido para %s Desactivado."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Acceso restringido para %s Activado."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY canal texto"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | canal} texto"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "El comando SENDPASS no esta disponible por el uso de encriptacion."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal opcion seteos"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET canal opcion parametros"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET canal OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET opcion parametros"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET opcion seteo"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numero"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] limite"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [usuario | canal] {limite | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "La lista de SNLINEs esta vacia."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5162,342 +4841,327 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista}[:"
 "razon]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista SOP para %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "La lista de SQLINEs esta vacia."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista} "
 "[razon]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR El canal %s no esta registrado"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR El nick %s no esta online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND canal razon"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND canal [razon]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND canal razon"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nuevonick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "La lista de SZLINEs esta vacia."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista} "
 "[razon]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Seguro"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Fundador Seguro"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Ops Seguros"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Seguridad de fundador para %s Desactivada."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Seguridad de fundador para %s Activada."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Seguridad de OPs para %s Desactivada."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Seguridad de OPs para %s Activada."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Opcion de seguridad para %s Desactivada."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Opcion de seguridad para %s Activada."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Seguro"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Los servicios estan deshabilitados temporalmente, por favor intenta mas "
 "tarde "
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Servicios estan ahora en DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Servicios ahora en modo expire."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Servicios ahora en modo no expire."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Servicios ahora en modo read-only."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Servicios ahora en modo de read-write."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Servicios ahora en modo debug (nivel %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Servicios ahora en modo debug."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Servicios ahora en modo no-debug."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Los servicios han sido configurados para no enviar e-mail"
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Lista ignore de Servicios:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Los Servicios no han podido cambiar modos. Estan bien configurados tus "
-"servidores?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Los Servicios no han podido cambiar modos. Estan las lineas U: de tus "
 "servidores configuradas correctamente?"
 
-#: language.cpp:1939
+#: modules/core/os_stats.cpp:137
 #, c-format
-msgid "Services up %d day, %02d:%02d"
+msgid "Services up %d days, %02d:%02d"
 msgstr "Servicios arriba %d dias, %02d:%02d"
 
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Servicios arriba %d dias, %02d:%02d"
+msgid "Services up %d hours, %d minutes"
+msgstr "Servicios arriba %d horas, %d minutos"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Servicios arriba %d hora, %d minuto"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Servicios arriba %d minutos, %d segundos"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Servicios arriba %d hora, %d minutos"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Servicios arriba %d horas, %d minuto"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Servicios arriba %d horas, %d minutos"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Servicios arriba %d minuto, %d segundo"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Servicios arriba %d minuto, %d segundos"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Servicios arriba %d minutos, %d segundo"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Servicios arriba %d minutos, %d segundos"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "El archivo de configuracion de Servicios ha sido cargado nuevamente."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Tu nick ha sido liberado por los Servicios."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Limite de sesion para %s seteado a %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Limites de sesion no disponibles."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sesiones     : %6d records, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sesiones  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Opcion %s no conocida. Tipea /msg %s HELP LEVELS DESC para una lista de "
 "opciones validas."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "El seteo para DEBUG debe ser ON, OFF, o un numero positivo."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "El seteo para IGNORE debe ser ON u OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Seteo para NOEXPIRE debe ser ON u OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "El seteo para READONLY debe ser ON u OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr "Opciones para SuperAdmin deben ser ON u OFF."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Opcion de kick firmado para %s Desactivada."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Opcion de kick firmado para %s Activada."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5506,236 +5170,201 @@ msgstr ""
 "Opcion de kick firmado para %s Activada, pero depende\n"
 "del nivel del usuario que use el comando."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Opcion de kick firmado para %s Activada."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Kicks Firmados"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Lo siento, RSEND ha sido deshabilitado en esta red."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Lo siento, el asignamiento de bots esta temporalmente inhabilitado."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Lo siento, la creacion de bot ha fallado"
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Lo siento, la modificacion de bots esta temporalmente inabilitada."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Lo siento, el seteo de opciones para bot esta temporalmente inhabilitado"
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la modificacion de la lista AOP de canales esta\n"
 "temporalmente deshabilitada."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr ""
-"Lo siento, la modificacion de listas HOP de canales esta\n"
-"temporalmente deshabilitada."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr ""
-"Lo siento, la modificacion de la lista SOP de canales esta\n"
-"temporalmente deshabilitada."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr ""
-"Lo siento, la modificacion de la lista VOP de canales esta\n"
-"temporalmente deshabilitada."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la modificacion de acceso a canales esta temporalmete "
 "deshabilitada."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la modificacion de kicks automaticos en canales esta "
 "temporalmente deshabilitada."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la lista de  bad words para canales esta temporalmente "
 "inabilitada."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 "Lo siento, la de-registracion de canales esta temporalmente desabilitada."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr ""
 "Lo siento, el seteo de opciones de canales esta temporalmente deshabilitado."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Lo siento, el registro de canales esta temporalmente deshabilitado."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Lo siento, La agrupacion de nicks ha fallado."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Lo siento, la identificacion ha fallado."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Lo siento, la configuracion de kicker esta temporalmente inabilitada."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 "Lo siento, el seteo de opciones para memos esta temporalmente inhabilitado."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Lo siento, el envio de memos esta temporalmente inhabilitado."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 "Lo siento, la de-registracion de nicknames esta temporalmente inabilitada."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Lo siento, La agrupacion de nicks esta temporalmente deshabilitada."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr ""
 "Lo siento, el seteo de opciones para nicknames esta temporalmente "
 "deshabilitado."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Lo siento, el registro de nicknames esta temporalmente deshabilitado."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Lo siento, fallo en el registro."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
 msgstr ""
-"Lo siento, solo puedes tener %d instancias de AOP/SOP/VOP\n"
-"en un canal."
+"Lo siento, solo puedes tener %d instancias de acceso en un determinado canal."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr ""
 "Lo siento, solo puedes tener %d instancias en tu lista de acceso por "
 "nickname."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Lo siento, solo puedes tener %d instancias de acceso en un determinado canal."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
 "Lo siento, solo puedes tener %d mascaras para kicks automaticos en un canal."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Lo siento, solo puedes tener %d bad words en un canal."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Lo siento, has sobrepasado tu limite de %d canales."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Lo siento, has alcanzado tu limite de %d canales."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Estadisticas reseteadas."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Estado actualizado (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Para de floodear!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Para de repetir!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Sucesor de %s eliminado."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Sucesor de %s cambiado a %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Simbiosis"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Modo Simbiosis ahora Desactivado en el canal %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Modo Simbiosis ahora Activado en el canal %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintaxis: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5763,7 +5392,7 @@ msgstr ""
 "2: ban en la forma *!*@host\n"
 "3: ban en la forma *!*usuario@*.dominio"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5776,27 +5405,12 @@ msgstr ""
 "Setea la descripcion para el canal, la que es mostrada\n"
 "con los comandos LIST y INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Sintaxis: %s canal ENTRYMSG [mensaje]\n"
-"\n"
-"Setea el mensaje que sera enviado via /notice a los\n"
-"usuarios cuando ingresen al canal. Si ningun parametro\n"
-"es dado, ningun mensaje sera enviado al entrar al canal."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Sintaxis: %s canal FOUNDER nick\n"
@@ -5804,7 +5418,7 @@ msgstr ""
 "Cambia el fundador de un canal. El nuevo nickname debe\n"
 "ser uno registrado."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5824,80 +5438,7 @@ msgstr ""
 "salga del canal, y sera restorado la proxima vez que\n"
 "el canal sea creado."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Sintaxis: %s canal MLOCK modos\n"
-"\n"
-"Setea el parametro de fijacion de modos para el canal.\n"
-"%S te permite definir ciertos modos de canal para estar\n"
-"siempre encendidos o apagados o libres de estar uno de los\n"
-"anteriores.\n"
-"\n"
-"El parametro modos es construido de la misma forma\n"
-"que el comando /MODE; esto significa, modos seguidos\n"
-"por un + estan fijados encendidos, y modos seguidos por\n"
-"un - estan fijados apagados. Tener en cuenta que, a\n"
-"diferencia del comando MODE, cada uso de SET MLOCK\n"
-"removera todos los modos fijados previamente antes de\n"
-"setear los nuevos!\n"
-"\n"
-"Advertencia: Si seteas una key con fijacion de modo, como\n"
-"en el segundo ejemplo mas abajo, deberas tambien setear la\n"
-"opcion RESTRICTED para el canal (ver HELP SET RESTRICTED),\n"
-"o quien quiera que entre al canal cuando este vacio podra ver la\n"
-"key!\n"
-"\n"
-"Ejemplos:\n"
-"\n"
-"    SET #canal MLOCK +nt-iklps\n"
-"        Fuerza los modos n y t encendidos, y los modos i, k,\n"
-"        l, p y s apagados. El modo m es dejado libre para\n"
-"        estar encendido o apagado.\n"
-"\n"
-"    SET #canal MLOCK +knst-ilmp mi-key\n"
-"        Fuerza los modos k, n, s, y t encendidos, y los modos\n"
-"        i, l, m, y p apagados. Tambien fuerza la key del canal\n"
-"        a ser \"mi-key\".\n"
-"\n"
-"    SET #canal MLOCK +\n"
-"        Remueve la fijacion de modos; todos los modos del canal\n"
-"        son libres de estar encendidos o apagados."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5914,7 +5455,7 @@ msgstr ""
 "al usuario del canal cuando los comandos OP o DEOP sean\n"
 "usados para un usuario en el canal."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5932,7 +5473,7 @@ msgstr ""
 "de un usuario con nivel igual o superior a el via\n"
 "comandos de %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5977,7 +5518,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5991,13 +5532,13 @@ msgstr ""
 "Cuando privacidad esta seteada, un /msg %S LIST no\n"
 "incluira el canal en ninguna lista."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Sintaxis: %s canal RESTRICTED {ON | OFF}\n"
@@ -6006,7 +5547,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -6026,7 +5567,7 @@ msgstr ""
 "otorgados acceso al canal controlado por la lista de\n"
 "acceso."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6045,52 +5586,12 @@ msgstr ""
 "su fundador y su sucesor, y no aquellos que esten identificados\n"
 "con %S."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Sintaxis: %s canal SECUREOPS {ON | OFF}\n"
-"\n"
-"Habilita o deshabilita la opcion seguridad de ops para un\n"
-"canal.  Cuando seguridad de ops esta seteada, usuarios\n"
-"que no estab en la lista de usuarios no seran permitidos a\n"
-"obtener el status de operador de canal."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Sintaxis: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Habilita o deshabilita los kicks firmados para un\n"
-"canal. Cuando SIGNKICK esta seteado, kicks\n"
-"hechos con el comando %S KICK tendran el\n"
-"nick que uso el comando en la razon.\n"
-"\n"
-"Si usas LEVEL, aquellos que tienen nivel superior o\n"
-"igual al nivel SIGNKICK en el canal no tendran sus kicks \n"
-"firmados. Ver /msg %S HELP LEVELS para mayor informacion."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6108,24 +5609,7 @@ msgstr ""
 "si no hubiese un sucesor. El nuevo nickname debe ser uno\n"
 "registrado."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintaxis: %s canal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Abilita o desabilita la opcion de fijacion de topic\n"
-"para un canal. Cuando la fijacion de topic esta\n"
-"seteada, %S no permitira que el topico del canal\n"
-"sea cambiado excepto con el comando TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6170,10 +5654,11 @@ msgstr ""
 "Cambiar de listas xOP al sistema de listas de acceso no causa\n"
 "problema alguno."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6186,18 +5671,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6256,7 +5745,7 @@ msgstr ""
 "El comando ACCESS CLEAR limpia todas las instancias\n"
 "de la lista de acceso."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6305,7 +5794,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Muestra la lista de acceso actual."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6317,12 +5806,18 @@ msgstr ""
 "Hace al bot hacer el equivalente del comando \"/me\"\n"
 "en el canal dado usando el texto dado."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6343,15 +5838,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6422,7 +5908,8 @@ msgstr ""
 "El comando AKICK CLEAR limpia todas las instancias\n"
 "de ka lista de akicks."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6430,21 +5917,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6516,7 +6003,7 @@ msgstr ""
 "\n"
 "Limitado a Operadores de Servicios."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6556,7 +6043,7 @@ msgstr ""
 "Canales que tengan la opcion NOEXPIRE seteada seran precedidos\n"
 "por un signo de exclamacion."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6574,10 +6061,11 @@ msgstr ""
 "acceso igual o mayor a level.\n"
 "Su uso esta limitado a administradores de Servicios."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6658,7 +6146,7 @@ msgstr ""
 "de acceso y /msg %S HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6672,7 +6160,8 @@ msgstr ""
 "Luego de esto puedes configurar al bot para acomodarlo\n"
 "a tus necesidades."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6704,7 +6193,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6745,7 +6234,7 @@ msgstr ""
 "El comando BADWORDS CLEAR limpia todas las instancias\n"
 "de la lista de bad words."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6761,7 +6250,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6803,7 +6292,7 @@ msgstr ""
 "este registrado. Si un usuario no registrado esta usando \n"
 "el nick, sera killeado.\t"
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6813,7 +6302,7 @@ msgstr ""
 "\n"
 "Lista todos los bots disponibles en esta red."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6826,7 +6315,7 @@ msgstr ""
 "siempre y cuando no haya sido leido al momento en el que\n"
 "usaste el comando."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6838,7 +6327,7 @@ msgstr ""
 "usa el entero, completo y real ident@host para cada nick,\n"
 "entonces ejecuta el AKILL. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6861,7 +6350,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6872,72 +6361,32 @@ msgstr ""
 "Verifica que el _ultimo_ memo que enviaste a nick haya sido leido.\n"
 " Nota que esto solo funciona para nicknames, no para canales."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Sintaxis: CLEAR canal que\n"
-"\n"
-"Le dice a %S que limpie ciertos seteos en el canal.\n"
-"que puede ser uno de los siguientes:\n"
+"Sintaxis: DEOWNER #canal\n"
 "\n"
-"     MODES    Resetea todos los modos en el canal (osea,\n"
-"                  limpia los modos i,k,l,m,n,p,s,t).\n"
-"     BANS     Limpia todos los bans en el canal.\n"
-"     EXCEPTS  Limpia todos los excepts en el canal.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Remueve estatus de operador de canal (modo +o)\n"
-"                  de todos los operadores de canal. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Remueve el estatus \"voice\" (modo +v) de quien\n"
-"                  tenga ese modo seteado.\n"
-"     USERS    Remueve (kickea) todos los usuarios del canal.\n"
+"Remueve tu estatus de dueño en canal.\n"
 "\n"
-"Por defecto, tu nivel de acceso en el canal debe ser de\n"
-"fundador."
+"Limitado a aquellos con nivel de fundador en el canal."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Sintaxis: CLEARMODES canal [ALL]\n"
-"\n"
-"Limpia todos los modos binarios (i,k,l,m,n,p,s,t) y\n"
-"bans del canal. Si ALL es dado, tambien limpia\n"
-"todos los ops y voices (modos +o y +v) del canal.\n"
-"\n"
-"Limitado a operadores de Servicios."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6963,7 +6412,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6975,12 +6424,14 @@ msgstr ""
 "pre-definido de restricciones que son muy utiles en un eventual\n"
 "ataque a la red."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6995,7 +6446,7 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a HOPs o aquellos con\n"
 "nivel 4 y mayor para quitarse halfop a si mismos."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -7005,11 +6456,12 @@ msgstr ""
 "Borra el vhost asignado al nick dado de la base de datos.\n"
 "Limitado a Operadores de Servicios."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7041,10 +6493,11 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Borra los memos enumerados 2 a 5 y 7 a 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Sintaxis: DELALL <nick>.\n"
@@ -7052,12 +6505,14 @@ msgstr ""
 "nick dado.\n"
 "Limitado a Host Removers."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7070,29 +6525,35 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintaxis: DEOWNER #canal\n"
+"Sintaxis: DEOP #canal [nick]\n"
 "\n"
-"Remueve tu estatus de dueño en canal.\n"
+"Deopea al nick seleccionado en un canal. Si nick no es\n"
+"dado, te deopeara a ti.\n"
 "\n"
-"Limitado a aquellos con nivel de fundador en el canal."
+"Por defecto, limitado a AOPs o aquellos con nivel de\n"
+"acceso 5 y mayor en el canal."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Sintaxis: DEPROTECT #canal [nick]\n"
 "\n"
@@ -7103,12 +6564,14 @@ msgstr ""
 "con nivel 10 y mayor en el canal para desprotejerse a\n"
 "si mismos."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7123,7 +6586,7 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a VOPs o aquellos con\n"
 "nivel 3 y mayor para darse voice a si mismos."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7135,7 +6598,7 @@ msgstr ""
 "Desregistra el canal dado. Solo puede ser usado por el\n"
 "fundador del canal."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7148,9 +6611,10 @@ msgstr ""
 "administradores de Servicios pueden botar un\n"
 "canal por el cual no se hayan identificado."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7158,6 +6622,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7174,7 +6642,7 @@ msgstr ""
 "Antes de usar este comando debes identificarte con tu\n"
 "clave (/msg %S HELP IDENTIFY para mayor informacion)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7197,8 +6665,8 @@ msgstr ""
 "privilegios especiales. Botar cualquier nick esta\n"
 "limitado a administradores de Servicios."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7209,7 +6677,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7231,7 +6699,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7282,7 +6750,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7300,7 +6768,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7318,7 +6786,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7332,7 +6800,7 @@ msgstr ""
 "sea que el comando se use, un mensaje incluyendo la persona que uso\n"
 "el comando y el email sera logeado."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7342,16 +6810,15 @@ msgstr ""
 "\n"
 "Retorna la key del canal dado."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Sintaxis: GETPASS nickname\n"
 "\n"
@@ -7364,14 +6831,14 @@ msgstr ""
 "\n"
 "Este comando no esta disponible si encripcion esta habilitada."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7396,7 +6863,7 @@ msgstr ""
 "grupo de ese nick, o debes proveer la clave correcta\n"
 "para ese nickname."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7406,7 +6873,7 @@ msgstr ""
 "\n"
 "Lista todos los nicks en tu grupo."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7426,7 +6893,7 @@ msgstr ""
 "en el grupo del nick dado.\n"
 "Su uso esta limitado a administradores de Servicios."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7439,7 +6906,7 @@ msgstr ""
 "Permite a los Administrators a enviar mensajes a los usuarios\n"
 "en la red. El mensaje sera enviado desde el nick %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7453,7 +6920,7 @@ msgstr ""
 "nick actual para ser el vhost para todos los nicks en el\n"
 "mismo grupo."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7517,16 +6984,17 @@ msgstr ""
 "Ten en cuenta: todos los nicks en un grupo comparten la\n"
 "misma clave."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Sintaxis: HALFOP #canal [nick]\n"
 "\n"
@@ -7537,10 +7005,11 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a HOPs o aquellos con nivel\n"
 "4 y mayor para darse halfop a si mismos."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7616,7 +7085,7 @@ msgstr ""
 "de acceso y /msg %S HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7634,9 +7103,20 @@ msgstr ""
 "comando antes de usarlos. La clave deberia ser la misma\n"
 "que enviaste con el comando REGISTER."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7666,7 +7146,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7687,7 +7167,7 @@ msgstr ""
 "Por defecto, la opcion ALL esta limitada a aquellos\n"
 "con acceso de fundador en el canal."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7704,7 +7184,7 @@ msgstr ""
 "ALL, podras ver toda la informacion; independiente de\n"
 "si esta oculta o no."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7720,7 +7200,7 @@ msgstr ""
 "puedes recibir. Con un parametro, muestra la misma\n"
 "informacion para el canal dado."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7747,7 +7227,7 @@ msgstr ""
 "informacion para el nickname dado. Este uso esta\n"
 "limitado a administradores de Servicios."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7766,12 +7246,12 @@ msgstr ""
 "recibiras informacion acerca de un bot, tal como tiempo\n"
 "de creacion o numero de canales en los que este."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7783,14 +7263,15 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel 5\n"
 "y mayor en el canal."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7810,7 +7291,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7826,7 +7307,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7853,7 +7334,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7875,12 +7356,14 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7920,14 +7403,14 @@ msgstr ""
 "Notese: acceso a este comando es controlado por el\n"
 "nivel SET."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7943,7 +7426,25 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7961,7 +7462,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7990,7 +7491,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -8009,7 +7510,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -8032,7 +7533,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8048,7 +7549,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8067,7 +7568,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8086,8 +7587,8 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8097,17 +7598,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8138,7 +7639,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8163,7 +7664,7 @@ msgstr ""
 "de items a mostrar al operador 1 vez.\n"
 "Limitado a Operadores de Servicios."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8178,7 +7679,7 @@ msgstr ""
 "dado (Canales con la opcion PRIVATE seteada no son\n"
 "listados.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8218,7 +7719,8 @@ msgstr ""
 "        Lista todos los nicks registrados por usuarios en el\n"
 "        dominio bar.org."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8246,7 +7748,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Sintaxis: LIST patron [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8276,13 +7777,14 @@ msgstr ""
 "        Lista todos los nicks registrados que hayan sido seteados\n"
 "        a no expiracion."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8298,11 +7800,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Lista memos enumerados 2 a 5 y 7 a 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Sintaxis: LOGONNEWS ADD texto"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8331,11 +7833,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Sintaxis: LOGONNEWS DEL {numero | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8351,7 +7853,7 @@ msgstr ""
 "Ten en cuenta que no te sera requerido identificarte\n"
 "nuevamente."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8375,12 +7877,13 @@ msgstr ""
 "dado nick a reidentificarse. Este uso esta limitado a\n"
 "administradores de Servicios."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Sintaxis: MODE canal modos\n"
@@ -8391,7 +7894,34 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8400,7 +7930,7 @@ msgstr ""
 "Sintaxis: MODINFO NombreArchivo\n"
 "Este comando lista informacion sobre el modulo cargado pedido "
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8409,7 +7939,7 @@ msgstr ""
 "Sintaxis: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Lista todos los modulos actualmente cargados."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8420,7 +7950,7 @@ msgstr ""
 "Este comando carga el modulo llamado NombreArchivo del directorio de \n"
 "modulos."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8431,7 +7961,7 @@ msgstr ""
 "Este comando carga el modulo llamado NombreArchivo del directorio de \n"
 "modulos."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8442,10 +7972,12 @@ msgstr ""
 "Este comando descarga el modulo llamado NombreArchivo del directorio \n"
 "de modulos."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8471,7 +8003,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8483,7 +8015,7 @@ msgstr ""
 "Cuando uses este comando cualquier usuario que haga un /whois\n"
 "a ti vera tu IP real."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8499,7 +8031,7 @@ msgstr ""
 "opciones simplemente tipear un \"-\" en vez de cualquier\n"
 "opcion."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8511,12 +8043,14 @@ msgstr ""
 "Cuando uses este comando cualquier usuario que haga un /whois\n"
 "a ti vera el vhost asignado en vez de tu IP real."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8529,11 +8063,11 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Sintaxis: OPERNEWS ADD texto"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8562,30 +8096,37 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Sintaxis: OPERNEWS DEL {numero | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintaxis: OWNER #canal\n"
+"Sintaxis: OP #canal [nick]\n"
 "\n"
-"Te da el estatus de dueño en canal.\n"
+"Opea al nick seleccionado en un canal. Si nick no es\n"
+"dado, te opeara a ti.\n"
 "\n"
-"Limitado a aquellos con nivel de fundador en el canal."
+"Por defecto, limitado a AOPs o aquellos con nivel de\n"
+"acceso 5 y mayor en el canal."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8599,10 +8140,11 @@ msgstr ""
 "con nivel 10 y mayor en el canal para protejerse a si\n"
 "mismos."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8675,7 +8217,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8695,11 +8237,11 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Sintaxis: RANDOMNEWS ADD texto"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8721,18 +8263,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Sintaxis: RANDOMNEWS DEL {numero | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8749,7 +8292,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Muestra los memos enumerados 2 a 5 y 7 a 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8797,7 +8340,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8808,7 +8352,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8838,24 +8382,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8904,15 +8449,15 @@ msgstr ""
 "informacion acerca de esta caracteristica, tipea /msg %S\n"
 "HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8933,7 +8478,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8951,7 +8496,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8963,7 +8508,7 @@ msgstr ""
 "Este comando envia el codigo de autorizacion (conocido como passcode)\n"
 "a la direccion e-mail del usuario que lo esta ejecutando."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8974,7 +8519,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8990,13 +8535,14 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -9010,23 +8556,25 @@ msgstr ""
 "Una vez que el memo ha sido leido, quien envio el memo recibira una \n"
 "notificacion automatica informando que el memo ha sido leido.\t"
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -9034,7 +8582,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9046,7 +8594,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9056,7 +8604,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9072,7 +8620,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9095,22 +8643,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9128,7 +8676,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9145,7 +8693,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9159,7 +8707,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9171,17 +8719,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9200,16 +8749,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9223,7 +8772,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9233,13 +8782,14 @@ msgstr ""
 "\n"
 "Hace al bot decir el texto dado en el canal dado."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sintaxis: SEND {nick | canal} texto-del-memo\n"
@@ -9249,15 +8799,17 @@ msgstr ""
 "recibira noticia de que el/ella tiene un nuevo memo. El nick\n"
 "o canal recipientes deben estar registrados."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Sintaxis: SENDALL texto-memo\n"
 "Envia a todos los usuarios registrados un memo conteniendo texto-memo."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9276,7 +8828,7 @@ msgstr ""
 "Puede ser limitado a operadores de IRC en ciertas\n"
 "redes."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9312,7 +8864,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9326,7 +8878,66 @@ msgstr ""
 "setea idents para usuarios ademas de vhosts.\n"
 "Limitado a operadores de Servicios."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Sintaxis: %s canal SECUREOPS {ON | OFF}\n"
+"\n"
+"Habilita o deshabilita la opcion seguridad de ops para un\n"
+"canal.  Cuando seguridad de ops esta seteada, usuarios\n"
+"que no estab en la lista de usuarios no seran permitidos a\n"
+"obtener el status de operador de canal."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Sintaxis: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Habilita o deshabilita los kicks firmados para un\n"
+"canal. Cuando SIGNKICK esta seteado, kicks\n"
+"hechos con el comando %S KICK tendran el\n"
+"nick que uso el comando en la razon.\n"
+"\n"
+"Si usas LEVEL, aquellos que tienen nivel superior o\n"
+"igual al nivel SIGNKICK en el canal no tendran sus kicks \n"
+"firmados. Ver /msg %S HELP LEVELS para mayor informacion."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintaxis: %s canal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Abilita o desabilita la opcion de fijacion de topic\n"
+"para un canal. Cuando la fijacion de topic esta\n"
+"seteada, %S no permitira que el topico del canal\n"
+"sea cambiado excepto con el comando TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9337,6 +8948,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9359,7 +8971,7 @@ msgstr ""
 "Notese: el acceso a este comando esta controlado por\n"
 "el nivel SET."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9373,7 +8985,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9389,7 +9001,7 @@ msgstr ""
 "\n"
 "Opciones disponibles:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9404,7 +9016,7 @@ msgstr ""
 "kickeados por el bot, incluso si no concuerdan con\n"
 "el nivel NOKICK."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9419,7 +9031,7 @@ msgstr ""
 "kickeados por el bot, incluso si no concuerdan con\n"
 "el nivel NOKICK."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9452,7 +9064,7 @@ msgstr ""
 "usar !op, el usuario debe tener suficiente\n"
 "acceso para el nivel OPDEOP)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9469,7 +9081,22 @@ msgstr ""
 "siempre y cuando tengan el suficiente acceso\n"
 "al canal."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9485,7 +9112,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9499,7 +9126,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9517,26 +9144,17 @@ msgstr ""
 "canales, tal como MODOS, KICKS e incluso los\n"
 "mensajes de entrada."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Sintaxis: SET opcion parametros\n"
-"\n"
-"Setea varias opciones para nicknames. opcion puede ser\n"
-"una de:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9553,7 +9171,18 @@ msgstr ""
 "Tipea /msg %S HELP SET opcion para mas informacion\n"
 "acerca de una opcion especifica."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Sintaxis: SET opcion parametros\n"
+"\n"
+"Setea varias opciones para nicknames. opcion puede ser\n"
+"una de:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9563,7 +9192,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Sintaxis: SET opcion seteo\n"
@@ -9580,7 +9208,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9592,30 +9220,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Sintaxis: SET DEBUG {ON | OFF | numero}\n"
-"\n"
-"Setea el modo debug a encendido o apagado. En modo debug,\n"
-"toda la informacion enviada de y hacia los Servicios,\n"
-"ademas de un numero de mensajes son escritos al archivo\n"
-"de log.  Si numero es dado, el modo debug es\n"
-"activado, con el nivel de debug setead a numero.\n"
-"\n"
-"Esta opcion es equivalente a la opcion -debug en\n"
-"la linea de comando."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9628,7 +9233,7 @@ msgstr ""
 "nicks en Servicios. El nuevo display DEBE ser un nick\n"
 "de tu grupo."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9642,7 +9247,7 @@ msgstr ""
 "sera mostrada cuando alguien requiera informacion \n"
 "sobre el canal con el comando INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9658,7 +9263,7 @@ msgstr ""
 "opcion GREET abilitada, siempre y cuando tengas en el\n"
 "el acceso necesario."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9681,18 +9286,8 @@ msgstr ""
 "El segundo parametro especifica si la informacion debe ser\n"
 "escondida (OFF) o mostrada (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9706,7 +9301,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sintaxis: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9724,7 +9319,7 @@ msgstr ""
 "necesario. Ademas, los administradores de la red pueden haber\n"
 "deshabilitado esta opcion."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9741,7 +9336,7 @@ msgstr ""
 "numero debe ser elejido de la lista de lenguajes\n"
 "soportados:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9758,7 +9353,7 @@ msgstr ""
 "enviarte memos. Ademas, no puedes setear el limite mas\n"
 "alto que %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9800,7 +9395,7 @@ msgstr ""
 "limite, no pueden setear el limite mas alla de %d, y no\n"
 "pueden setear un limite hard."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9809,7 +9404,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %S settings"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9823,10 +9418,11 @@ msgstr ""
 "comunicaran contigo. Con MSG seteado, los Servicios\n"
 "usaran msgs, de otra forma usaran notices. "
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9841,7 +9437,7 @@ msgstr ""
 "Esta opcion es equivalente a la opcion -noexpire\n"
 "en la linea de comando."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9878,7 +9474,7 @@ msgstr ""
 "\n"
 "ON es escencialmente LOGON y NEW combinados."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9890,7 +9486,7 @@ msgstr ""
 "Cambia la clave usada para identificarte como el\n"
 "dueño del nick."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9909,7 +9505,7 @@ msgstr ""
 "(Sin embargo, cualquier persona que sepa tu nick podra chequear\n"
 "tu informacion usando el comando INFO.)"
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9940,16 +9536,16 @@ msgstr ""
 "Esta opcion es equivalente a la opcion -readonly en\n"
 "la linea de comando."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9962,7 +9558,7 @@ msgstr ""
 "acceso, %S no te auto-killeara no importando el seteo de la opcion\n"
 "KILL."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9976,14 +9572,15 @@ msgstr ""
 "Esta opcion no es persistente y debe ser usada solo de ser\n"
 "necesario."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Sintaxis: SETALL <nick> <host>.\n"
@@ -9995,7 +9592,7 @@ msgstr ""
 "agregado al grupo despues que este comando haya sido usado.\n"
 "Limitado a Operadores de Servicios."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -10008,10 +9605,11 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10047,7 +9645,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10106,10 +9704,11 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10187,7 +9786,8 @@ msgstr ""
 "de acceso y /msg %S HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10203,31 +9803,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10287,21 +9887,7 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10311,15 +9897,17 @@ msgstr ""
 "Muestra todos los nicks de Services Staff, junto con su nivel\n"
 "y estado on-line."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Sintaxis: STAFF texto-memo\n"
 "Envia a todo el staff de services un memo conteniendo texto-memo."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10363,7 +9951,7 @@ msgstr ""
 "La opcion RESET resetea la cuenta maxima de usuarios\n"
 "al numero de usuarios actualmente presentes en la red."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10389,12 +9977,13 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10433,7 +10022,7 @@ msgstr ""
 "resto seran ingnorados. Si no se entrega un nickname, se mostrara\n"
 "tu estado."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10453,7 +10042,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10463,7 +10052,8 @@ msgstr ""
 "\n"
 "Cambia, a la fuerza, el nick del usuario from nick a nuevonick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10476,31 +10066,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10558,7 +10148,7 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10582,7 +10172,7 @@ msgstr ""
 "Por defecto, limitado a aquellos con nivel de fundador\n"
 "en el canal."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10596,7 +10186,7 @@ msgstr ""
 "usuarios para cualquier usuario. Los parametros son los\n"
 "mismos que para el comando /MODE."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10614,7 +10204,7 @@ msgstr ""
 "reasignar un bot luego sin tener que configurarlo\n"
 "completamente."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10633,7 +10223,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel 5\n"
 "y mayor en el canal."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10650,7 +10240,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10664,7 +10254,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10678,7 +10268,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10703,12 +10293,14 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10724,10 +10316,11 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a VOPs o aquellos\n"
 "con nivel 3 y mayor para darse voice a si mismos."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10804,7 +10397,7 @@ msgstr ""
 "de acceso y /msg %S HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10820,7 +10413,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10828,7 +10421,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10836,7 +10429,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10848,54 +10441,55 @@ msgstr ""
 "setea, si es necesario, los modos de canales (ModeonID)\n"
 "y actualiza tu vhost y tus userflags (lastseentime, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [topico]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "La opcion IMMED no esta disponible en esta red."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "La lista de AKILLs ha sido limpiada."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "El Nivel de Defcon esta ahora a Nivel: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "La lista de SNLINEs ha sido limpiada."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "La lista de SQLINEs ha sido limpiada."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "La lista de SZLINEs ha sido limpiada."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "El canal %s no tiene clave."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Los siguientes nombres de decaracteristicas/funciones son\n"
@@ -10903,89 +10497,89 @@ msgstr ""
 "y NOJOIN son niveles maximos, mientras todos los otros\n"
 "son niveles minimos."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "El host %s actualmente tiene %d sesiones con un limite de %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "El ultimo memo que enviaste a %s (enviado el %s) ha sido leido."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "El ultimo memo que enviaste a %s (enviado el %s) aun no ha sido leido."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "El limite de memos para %s no puede ser cambiado."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "El nuevo display es ahora %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "El nick %s esta siendo cambiado a %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Hay %d memos en el canal %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10993,7 +10587,7 @@ msgstr ""
 "No hay bots disponibles en este momento.\n"
 "Pidele a un administrador de servicios que cree uno!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -11003,12 +10597,12 @@ msgstr ""
 "Tipea /msg %s HELP GLIST y /msg %s HELP DROP\n"
 "para mayor informacion."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Hay %d memo en el canal %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -11016,28 +10610,28 @@ msgstr ""
 "Hay un memo nuevo en el canal %s.\n"
 "Tipea /msg %s READ %s %d para leerlo."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Ya no hay un bot asignado a %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "No hay Noticias de entrada."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "No hay noticias de oper."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "No hay Noticias al azar."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Tu nick no tiene una direccion de e-mail."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -11055,38 +10649,34 @@ msgstr ""
 "                        por alguien mas que un operador\n"
 "                        de IRC"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Este canal ha sido prohibido."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Este canal ha sido registrado con %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Este canal ha sido suspendido."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Este canal esta prohibido."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Este canal no expirara."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 msgstr "Este nick ya ha sido pedido, chequea tu e-mail para el password."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -11094,7 +10684,7 @@ msgstr ""
 "Este nick esta esperando una verificacion por e-mail antes de poder "
 "completar el registro."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11102,20 +10692,20 @@ msgstr ""
 "Este nick pertenece a otra persona. Por favor elige otro nick.\n"
 "(Si este es tu nick, tipea /msg %s IDENTIFY clave.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Este nick ha sido registrado; No puedes usarlo."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11125,15 +10715,15 @@ msgstr ""
 "nick, tipea /msg %s IDENTIFY clave. Si no,\n"
 "por favor elige un nick diferente."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Este nickname no puede ser usado. Por favor elige otro."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Este nickname no expirara."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11141,44 +10731,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Lock de topic"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Retencion de Topic"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Lock de topic para %s Desactivado."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Lock de topic para %s Activado."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Retencion de topic para %s Desactivada."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Retencion de topic para %s Activada."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Apaga las mayusculas!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Tipea /msg %S HELP comando para ayuda de cualquiera\n"
@@ -11187,7 +10768,7 @@ msgstr ""
 "    de acceso en el canal puede leer los memos del canal. Esto\n"
 "    puede ser cambiado con el comando %s LEVELS."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11197,7 +10778,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11205,7 +10786,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11213,7 +10794,7 @@ msgstr ""
 "Tipea /msg %S HELP opcion para mayor informacion\n"
 "acerca de una opcion en particular."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11223,127 +10804,108 @@ msgstr ""
 "Respetamos tu privacidad; este e-mail no sera entregado\n"
 "a ninguna persona."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Tipea /msg %s LIST NEW para listar tus memos."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Tipea /msg %s READ %d para leerlo."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Tipea /msg %s READ LAST para leer tu ultimo memo."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modos"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canal"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Imposible cargar modulo %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Imposible quitar modulo %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Opcion SET desconocida %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opcion STATS %s desconocida."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Comando no conocido %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Comando no conocido %s. \"/msg %s HELP\" para ayuda."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Caracter de modo %c desconocido e ignorado."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opcion %s desconocida."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Opcion %s desconocida.\n"
-"Tipea /msg %S HELP KICK para mayor informacion"
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Opcion %s desconocida.\n"
 "Tipea /msg %S HELP SET para mayor informacion."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Updateando las bases de datos."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "Usuario %s no encontrado en la base de datos de nickserv."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Usuario      : %6d records, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11351,11 +10913,11 @@ msgstr ""
 "El usuario que ocupaba tu nick ha sido killeado.\n"
 "/msg %s RELEASE %s para recuperarlo antes de %s."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "Usuario coincide con el except del canal."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11363,66 +10925,76 @@ msgstr ""
 "Lista de usuarios:\n"
 "Nick                 Mascara"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Proteccion de Voices"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Lista VOP para %s:\n"
-"  Num  Nick"
+"Advertencia: haz sobrepasado el maximo numero de memos (%d). Te sera "
+"imposible recibir mas memos hasta que borres algunos de los existentes."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Proteccion de Voices"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Advertencia: haz alcanzado el maximo numero de memos (%d). No podras recibir "
+"mas memos hasta que borres algunos de los existentes."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Cuida tu lenguaje!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Ya eres miembro del grupo de %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Ya estas identificado."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Ya no eres un SuperAdmin."
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "No estas autorizado a estar en este canal."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "No estas autorizado a cambiar tu limite de memos."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Ahora eres un SuperAdmin."
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Eres ahora un operador de IRC."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11430,36 +11002,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Ahora eres miembro en el grupo de %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "No puedes pedir una notificacion cuando te envias el memo a ti mismo."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "No puedes ghostearte a ti mismo!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "No puedo desconectar a  %s porque es un administrador de servicios."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "No puedes recuperarte a ti mismo!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11469,7 +11046,7 @@ msgstr ""
 "Usa los comandos AOP, SOP y VOP en vez.\n"
 "Tipea /msg %s HELP comando para mayor informacion."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11479,7 +11056,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11487,66 +11064,66 @@ msgstr ""
 "No puedes usar este comando. Usa el comando ACCESS en su lugar.\n"
 "Tipea /msg %s HELP ACCESS para mayor informacion."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "No puedes setear el limite de memos para %s mayor a %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "No puedes setear tu limite de memos mayor a %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "No puedes no setear tu direccion e-mail en esta red."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Tienes %d memos, de los cuales %d aun no han sido leidos."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Tienes %d memos, de los cuales 1 aun no ha sido leido."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Tienes %d memos."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Tienes %d memos, ninguno de ellos leido."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Tienes 1 memo y aun no ha sido leido."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Tienes 1 memo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "No tienes memos."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Tienes %d memos nuevos."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Tienes 1 memo nuevo."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11554,33 +11131,37 @@ msgstr ""
 "Tienes un nuevo memo de %s.\n"
 "Tipea /msg %s READ %d para leerlo."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Has sido desbaneado de %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "No tienes limite en el numero de memos que puedes mantener."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "No tienes memos."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "No tienes memos nuevos."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Debes ingresar un numero valido como tiempo."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11588,28 +11169,16 @@ msgstr ""
 "Debes asignar un bot al canal antes de poder usar este comando.\n"
 "Tipea /msg %S HELP ASSIGN para mayor informacion."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Debes ser un operador de canal para registrar el canal."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "Debes estar conectado mas de %d segundos para registrar tu nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr ""
-"Debes usar modo de lock +i tambien para el modo\n"
-"de lock +K."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr ""
-"Debes usar modo de lock +l tambien para el modo\n"
-"de lock +L."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11619,41 +11188,41 @@ msgstr ""
 "Este e-mail te permitira recuperar tu clave en\n"
 "caso que la olvides."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Seras notificado por nuevos memos cuando te conectes y en cuanto te sean "
 "enviados."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Seras notificado por memos nuevos en cuanto te conectes."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Seras notificado cuando los memos nuevos te sean enviados."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "No te sera posible recibir mas memos."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "No seras informado de nuevos memos via email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "No seras notificado por memos nuevos."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "Seras informado de nuevos memos via email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11661,34 +11230,54 @@ msgstr ""
 "Tu IRCD no soporta vIdent's. Si esto es incorrecto, por favor reportalo como "
 "un posible bug."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Tu lista de acceso esta vacia."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "La lista de kicks automaticos del canal %s esta vacia."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "La lista ignore esta vacia."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Tu limite de memos ha sido deshabilitado."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Tu limite de memos ha sido seteado a %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Tu limite de memos es %d y no puede ser cambiado."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Tu limite de memos es %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Tu limite de memos es 0; No recibiras nuevos memos."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11696,178 +11285,738 @@ msgstr ""
 "Tu limite de memos es 0; No recibiras nuevos memos. No puedes cambiar este "
 "limite."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Tu nick ha sido desconectado."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Tu nick ya esta registrado; tipea /msg %s DROP primero."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Tu nick no esta registrado."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Tu nickname ha sido botado."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Tu nickname esta siendo cambiado a %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Tu password ha sido enviado nuevamente a %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Tu clave es %s - Recuerdala para uso futuro."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Your password is too long. Please try again with a shorter password."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Tu vhost %s ha sido activado."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Tu vhost %s@%s ha sido activado."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Noticias de Logon - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Noticias de Oper - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Noticias al Azar - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "Desactivada"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "no expira"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "Activada"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "expira con el proximo update de la base de datos"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "expira en %d dia"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "expira en %d dias"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expira en %d hora, %d minuto"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expira en %d hora, %d minutos"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expira en %d horas, %d minuto"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expira en %d horas, %d minutos"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "expira en %d minutos"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expira en %d minutos"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost para %s removido."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost para %s seteado a %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost para %s seteado a %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost para el grupo %s seteado a %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost para el grupo %s seteado a %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "El vhost para el group %s ha sido removido."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "Sistema de listas xOP"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "El sistema de listas xOP  para %s esta ahora Apagado."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "El sistema de listas xOP para %s esta ahora Encendido."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "El sistema xOP no esta disponible."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | canal} texto"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s añadido a la lista AOP de %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s añadido a la lista HOP de %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s añadido a la lista SOP de %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s añadido a la lista VOP de %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s borrado de la lista HOP de %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s borrado de la lista SOP de %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s borrado de la lista VOP de %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s movido a %s en la lista HOP."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s movido a %s en la lista SOP."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s movido a %s en la lista VOP."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s no encontrado en la lista HOP de %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s no encontrado en la lista SOP de %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s no encontrado en la lista VOP de %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Previene tu nickname de aparecer en un\n"
+#~ "                   /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d dias"
+
+#~ msgid "%d hours"
+#~ msgstr "%d horas"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minutos"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d segundos"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "La lista HOP de %s esta vacia."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "La lista SOP de %s esta vacia."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "La lista VOP de %s esta vacia."
+
+#~ msgid "1 day"
+#~ msgstr "1 dia"
+
+#~ msgid "1 hour"
+#~ msgstr "1 hora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuto"
+
+#~ msgid "1 second"
+#~ msgstr "1 segundo"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Habilitado para usar el comando CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Habilitado para usar el comando HALFOP/DEHALFOP"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "La lista HOP de canales %s ha sido limpiada."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "La lista HOP de canales %s ha sido limpiada."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "La lista HOP de canales %s ha sido limpiada."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "%d instancias borradas de la lista HOP de %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "%d instancias borradas de la lista SOP de %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "%d instancias borradas de la lista VOP de %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "1 instancia borrada de la lista HOP de %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "1 instancia borrada de la lista SOP de %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "1 instancia borrada de la lista VOP de %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Direccion E-mail no seteada."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Fin de la lista de usuarios."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Mensaje de entrada para %s no seteado."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "El bot no esta en el canal %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "Mensaje de entrada: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "La lista de acceso para %s esta vacia."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Lista de acceso para %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Mensage de entrada para %s cambiado."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Modo fantasia ahora Desactivado en el canal %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Modo saludo ahora Desactivado en el canal %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista HOP para %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Error Interno - Imposible procesar peticion."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Noticia de entrada #%d borrada."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Registro de Nick (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Clave para el Nickname (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "No se ha encontrado # en frente del nombre del canal."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Modo no bot ahora Desactivado en el canal %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "No existen instancias concordantes en la lista HOP de %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "No existen instancias concordantes en la lista SOP de %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "No existen instancias concordantes en la lista VOP de %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "No existe la instancia (#%d) en la lista AOP de %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "No existe la instancia (#%d) en la lista HOP de %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "No existe la instancia (#%d) en la lista SOP de %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "No existe la instancia (#%d) en la lista VOP de %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Opcion OP-notice para %s Desactivada."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Opcion de paz para %s Desactivada."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Por favor espera %d segundos antes de utilizar el comando SEND nuevamente."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Modo privado del bot %s esta ahora Desactivado."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Opcion de privacidad para %s Desactivada."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "La protection esta Activada, sin demora."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER clave [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Acceso restringido para %s Desactivado."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista SOP para %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR El canal %s no esta registrado"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND canal [razon]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Seguridad de fundador para %s Desactivada."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Seguridad de OPs para %s Desactivada."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Opcion de seguridad para %s Desactivada."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Los Servicios no han podido cambiar modos. Estan bien configurados tus "
+#~ "servidores?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Servicios arriba %d dias, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Servicios arriba %d hora, %d minuto"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Servicios arriba %d hora, %d minutos"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Servicios arriba %d horas, %d minuto"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Servicios arriba %d minuto, %d segundo"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Servicios arriba %d minuto, %d segundos"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Servicios arriba %d minutos, %d segundo"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Opcion de kick firmado para %s Desactivada."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Lo siento, la modificacion de listas HOP de canales esta\n"
+#~ "temporalmente deshabilitada."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Lo siento, la modificacion de la lista SOP de canales esta\n"
+#~ "temporalmente deshabilitada."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Lo siento, la modificacion de la lista VOP de canales esta\n"
+#~ "temporalmente deshabilitada."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr ""
+#~ "Lo siento, solo puedes tener %d instancias de AOP/SOP/VOP\n"
+#~ "en un canal."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Modo Simbiosis ahora Desactivado en el canal %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Sintaxis: RANDOMNEWS ADD texto"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR canal modos-a-limpiar"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Sintaxis: OPERNEWS ADD texto"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Sintaxis: SET DEBUG {ON | OFF | numero}\n"
+#~ "\n"
+#~ "Setea el modo debug a encendido o apagado. En modo debug,\n"
+#~ "toda la informacion enviada de y hacia los Servicios,\n"
+#~ "ademas de un numero de mensajes son escritos al archivo\n"
+#~ "de log.  Si numero es dado, el modo debug es\n"
+#~ "activado, con el nivel de debug setead a numero.\n"
+#~ "\n"
+#~ "Esta opcion es equivalente a la opcion -debug en\n"
+#~ "la linea de comando."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Sintaxis: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Lock de topic para %s Desactivado."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Retencion de topic para %s Desactivada."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Comando no conocido %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Opcion %s desconocida.\n"
+#~ "Tipea /msg %S HELP KICK para mayor informacion"
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "Usuario %s no encontrado en la base de datos de nickserv."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista VOP para %s:\n"
+#~ "  Num  Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "El bot %s ha sido borrado."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] El memo que enviaste a %s ha sido leido."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] El memo que enviaste a %s ha sido leido."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Ultimo memo enviado a %s fue cancelado."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Tu vhost %s ha sido activado."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "El bot %s ha sido borrado."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "El sistema de listas xOP  para %s esta ahora Apagado."
diff --git a/lang/anope.fr_FR.po b/language/anope.fr_FR.po
index 3e30fa1c8..9272b6500 100644
--- a/lang/anope.fr_FR.po
+++ b/language/anope.fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:27-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: French\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "Tapez /msg %s HELP %s pour plus d'informations."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "d'informations sur une certaine commande, tapez\n"
 "/msg %S HELP commande."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -55,14 +55,15 @@ msgstr ""
 "/msg %S command. Pour plus d'information sur\n"
 "une commande spécifique, tapez /msg %S HELP command."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S vous permet d'enregistrer et de contrôler divers\n"
@@ -75,12 +76,12 @@ msgstr ""
 "/msg %S HELP commande.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -94,122 +95,106 @@ msgstr ""
 "\n"
 "Les commandes de %S sont:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s a changé le niveau de DEFCON en %d."
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s ajouté à la liste des AOPs de %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s ajouté à la liste des HOPs de %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s ajouté à la liste des SOPs de %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s ajouté à la liste des VOPs de %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s ajouté à la liste d'accès de %s au level %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s ajouté à la liste de kicks automatiques de %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s ajouté à la liste des mots interdits de %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s ajouté à la liste d'AKILL."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s ajouté à la liste de SNLINEs."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s ajouté à la liste de SQLINEs."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s ajouté à la liste de SZLINEs."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s ajouté à votre liste d'accès."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s ajouté à votre liste d'accès."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s existe déjà dans la liste des mots interdits de %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s existe déjà sur la liste de kicks automatiques de %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s existe déjà sur la liste d'AKILL."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s existe déjà dans la liste des exceptions."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s existe déjà sur la liste de SNLINEs."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s existe déjà sur la liste de SQLINEs."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s existe déjà sur la liste de SZLINEs."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s ne peut être pris comme nombre de fois pour un ban."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s a changé vos modes."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -218,132 +203,113 @@ msgstr ""
 "Liste des channels de %s:\n"
 "Nom                  Users Modes   Topic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s supprimé de la liste des AOPs de %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s supprimé de la liste des HOPs de %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s supprimé de la liste des SOPs de %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s supprimé de la liste des VOPs de %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s supprimé de la liste d'accès de %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s supprimé de la liste de kicks automatiques de %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s supprimé de la liste des mots interdits de %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s supprimé de la liste des exceptions à la limitation de sessions."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s supprimé de la liste d'AKILL."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s supprimé de la liste de SNLINEs."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s supprimé de la liste de SQLINEs."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s supprimé de la liste de SZLINEs."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s supprimé de votre liste d'accès."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "Le niveau %s est maintenant désactivé sur le canal %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s a trop de canaux enregistrés."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s est déjà couvert par %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s ajouté à votre liste d'accès."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s n'est pas un type de ban valide."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s n'est pas un bot ou canal enregistré valide."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s n'est pas une adresse e-mail valide."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s n'est plus maintenu en permanence sur le canal %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s n'est actuellement pas sur %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s est désormais maintenu en permanence sur le canal %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s n'a pas été trouvé dans la liste des ignorés."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -352,107 +318,72 @@ msgstr ""
 "%s a trouvé une exception sur %s et ne peut le bannir tant que l'exception "
 "n'a pas été retirée."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s a été déplacé dans la liste des AOPs de %s."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s a été déplacé dans la liste des HOPs de %s."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s a été déplacé dans la liste des SOPs de %s."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s a été déplacé dans la liste des VOPs de %s."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s introuvable sur la liste des AOPs de %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s introuvable sur la liste des HOPs de %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s introuvable sur la liste des SOPs de %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s introuvable sur la liste des VOPs de %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s introuvable sur la liste d'accès de %s."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s introuvable sur la liste de kicks automatiques de %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s introuvable sur la liste des mots interdits de %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s introuvable sur la liste des sessions."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s non trouvé sur la liste des exceptions à la limitation de sessions."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s introuvable sur la liste d'AKILL."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s introuvable sur la liste de SNLINEs."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s introuvable sur la liste de SQLINEs."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s introuvable sur la liste de SZLINEs."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s introuvable dans votre liste d'accès."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s supprimé de votre liste d'accès."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -461,33 +392,33 @@ msgstr ""
 "Liste des utilisateurs de %s:\n"
 "Nick                 Masque"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s n'est plus ignoré"
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s est ignoré pour %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s est ignoré en permanence."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Remarque: Toutes les commandes envoyées à %S sont enregistrées!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Note: les Services sont en mode lecture-seule; les changements ne seront pas "
 "sauvegardés!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -495,12 +426,12 @@ msgstr ""
 "Rappel: les masques AKILL ne peuvent contenir de pseudo, assurez vous que "
 "vous n'avez pas mis de partie pseudo dans le masque."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr ""
 "Rappel: vous ne pouvez ajouter que des masques d'IP à la liste de SZLINEs."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -542,43 +473,38 @@ msgstr ""
 "en utilisant la commande LEVELS; tapez /msg %S HELP LEVELS\n"
 "pour plus d'informations."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Attention: Vous avez dépassé votre nombre maximum de mémos (%d).  Vous ne "
-"pourrez plus recevoir de nouveaux mémos sauf si vous supprimez quelques-uns "
-"de vos mémos actuels. "
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Attention: Vous avez atteint votre nombre maximum de mémos (%d).  Vous ne "
-"pourrez plus recevoir de nouveaux mémos sauf si vous supprimez quelques-uns "
-"de vos mémos actuels. "
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] Le mémo que vous avez envoyé a été vu."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Le mémo que vous avez envoyé a %s a été vu."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER motdepasse email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER motdepasse email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP cible motdepasse"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -589,7 +515,7 @@ msgstr ""
 "au minimum, la perte du(des) pseudo(s) faisant l'objet de \n"
 "l'abus."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -601,7 +527,7 @@ msgstr ""
 "avoir besoin de s'identifier avec un mot de passe, et peuvent\n"
 "voir l'access, AKICK, et level lists de tout canal."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -614,380 +540,396 @@ msgstr ""
 "peuvent voir l'access list pour n'importe quel pseudo\n"
 "(/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "                 Options : %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "              vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "              vhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "             Pseudo du bot : %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "             Pseudo du bot : non attribué."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "            Options: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "    Kicker de majuscules : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr ""
 "    Kicker de majuscules : %s (%d kick(s) pour un ban; minimum %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "    Kicker de majuscules : %s (minimum %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "        Propriétaire: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "         Type de ban: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "     Kicker de car. gras : %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "     Kicker de car. gras : %s (%d kick(s) pour un ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "         Kicker de flood : %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr ""
 "         Kicker de flood : %s (%d kick(s) pour un ban, %d lignes en %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "         Kicker de flood : %s (%d lignes en %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "      Masque : %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Kicker de couleurs : %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Kicker de couleurs : %s (%d kick(s) pour un ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "         Type de ban: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "Dernière utilisation: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "     Modes maintenus: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "    Kicker de répétition : %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "    Kicker de répétition : %s (%d kick(s) pour un ban, %d fois)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "    Kicker de répétition : %s (%d fois)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "          Successeur: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspendu: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "    Kicker de majuscules : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "     Kicker de car. gras : %s (%d kick(s) pour un ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "          Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "          Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "       Dernier sujet: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "          Enregistré: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (désactivé)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (propriétaire uniquement)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifie la liste des adresses autorisées"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Modifie la liste des utilisateurs privilégiés"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr "ACT                Fait faire au bot l'équivalent de la commande /me"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Gère la liste des kicks automatiques"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Gère la liste des kicks automatiques"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Contrôle la liste des AKILLs"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      Liste tous les canaux auquels vous êtes connecté"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Modifie la liste des utilisateurs AOPs"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Attribue un bot à un canal"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr ""
 "    AUTOOP     Demande à Services de vous rendre automatiquement OP.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Gère la liste des mots interdits"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Ban un pseudo spécifié dans un canal"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr ""
 "    BANTYPE       Définit comment les services mettent les bans\n"
 "                      sur le canal"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Gère la liste des bots du réseau"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Liste les bots disponibles"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Annule le dernier mémo que vous avez envoyé"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL tout les utilisateurs d'un canal spécifique"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Liste tous les canaux"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr ""
 "    CHECK  Vérifie si le dernier mémo envoyé à un pseudo a été\n"
 "           lu"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr ""
 "    CLEAR      Ordonne à ChanServ de nettoyer certains paramètres\n"
 "               sur un canal"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Supprime tous les modes d'un canal"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirme une inscription à NickServ"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "        Créé : %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Active/Désactive DefCon"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfop le pseudo spécifié sur un canal"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Supprime le vhost d'un pseudo"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Efface un ou des mémos"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Supprime le vhost pour tous les pseudos d'un groupe"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deop le pseudo spécifié sur un canal"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Retire votre statut de propriétaire d'un canal"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Déprotège le pseudo donné sur un canal"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Définit la description du canal"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoice le pseudo spécifié sur un canal"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Affiche les pseudos du groupe du pseudo donné"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr ""
 "    DISPLAY    Change l'affichage de votre groupe\n"
 "                   dans les services"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Annule l'enregistrement d'un canal"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Annule l'enregistrement d'un pseudo"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "         Description: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associe une email au pseudo donné"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Associe une e-mail à votre pseudo"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Définit un message envoyé aux utilisateurs\n"
-"                      qui entrent sur le canal"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr ""
 "    EXCEPTION   Modifie la liste d'exceptions à la limite de\n"
 "                sessions"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Empêche un canal d'être utilisé"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Empêche l'utilisation d'un pseudo"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Définit le propriétaire d'un canal"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -995,70 +937,75 @@ msgstr ""
 "    GETEMAIL   Cherche et retourne la liste des pseudos enregistrés\n"
 "    avec un certain email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Retourne la clé du canal specifié"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Retrouve le mot de passe pour un pseudo\n"
 "               (uniquement si le cryptage est désactivé)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Deconnecte un \"ghost irc\" utilisant votre pseudo"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Liste tous les pseudos de votre groupe"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Envoie un message à tous les utilisateurs"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associe un message d'accueil au pseudo donné"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Associe un message d'accueil à votre pseudo"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Synchronise tous les vhosts d'un groupe"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Joint un groupe"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "  Message d'accueil: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Donne le statut d'HalfOP au pseudo donné sur un canal"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Cache certaines parties des informations du pseudo"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Configure la liste de HOP d'un canal (HalfOP)"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Vous identifie avec votre mot de passe"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Modifier la liste d'ignore des services"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Modifier la liste d'ignore des services"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1067,49 +1014,49 @@ msgstr ""
 "sur\n"
 "                   un canal ou un bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Affiche des informations sur un pseudo"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Liste les informations sur un canal enregistré"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Affiche des informations à propos de vos mémos"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Commande à ChanServ de vous inviter dans un canal"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        \"Jupiter\" un serveur"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 "    KEEPTOPIC     Maintient le topic quand le canal n'est\n"
 "                      pas utilisé"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Configure les kickers"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Expulse un utilisateur d'un canal"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kick le pseudo spécifié d'un canal"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Active ou désactive la protection"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1117,92 +1064,85 @@ msgstr ""
 "    LANGUAGE   Change la langue dans laquelle les Services\n"
 "                   vous envoient leurs messages"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Défini la langue que Services utilisera dans les messages\n"
-"               qu'il vous envoie."
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Redéfinit la signification des niveaux d'accès"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Recherche un vhost"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr "    LIST       Liste tous les pseudos en rapport avec la recherche"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Liste tous les canaux enregistrés en rapport avec la recherche"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Liste vos mémos"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   Définit les messages affichés aux utilisateurs\n"
 "                à la connexion"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Inverse la commande LOGIN"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Oblige ou interdit des modes de canal"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Change les modes d'un canal"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Supprime tous les modes d'un canal"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Liste les informations sur un module chargé"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Liste les modules chargés"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Charge un module"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Charge un module"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Décharge un module"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Change le mode de communication des Services"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Empêche le pseudo d'expirer"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1210,90 +1150,81 @@ msgstr ""
 "    NOOP        Supprime temporairement toutes les O:lines\n"
 "                d'un serveur"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Désactive un vhost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Donne les flags d'un Oper à un utilisateur"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Active un vhost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Donne l'Op au pseudo spécifié sur un canal"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 "    OPERNEWS    Définit les messages affichés aux utilisateurs\n"
 "                qui deviennent IRCops"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr "    OPNOTICE      Envoie une notice quand OP/DEOP sont utilisés"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Vous donne votre accès propriétaire pour un canal"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "     Options : %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Change le mot de passe du pseudo donné"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Change le mot de passe de votre pseudo"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Régule l'utilisation de commandes sensibles"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Cacher le canal de la commande LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Empêche le pseudo d'apparaître dans un\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Empêche votre pseudo d'être affiché par\n"
-"                   /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protège le pseudo spécifié sur un canal"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Arrête les Services sans sauvegarde"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1301,251 +1232,254 @@ msgstr ""
 "    RANDOMNEWS  Définit les messages affichés aléatoirement\n"
 "                aux utilisateurs à la connexion"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Lit un ou des mémos"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr ""
 "    RECOVER    Change le pseudo d'un utilisateur qui a pris \n"
 "               votre pseudo"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Enregistre un pseudo"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Enregistre un pseudo"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 "    RELEASE    Reprendre la tutelle de votre pseudo\n"
 "               après un RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Recharge le fichier de configuration des Services"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr ""
 "    RESEND     Renvoie le code de confirmation de \n"
 "               l'inscription à NickServ"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords"
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr ""
 "    RESTART     Sauvegarde les bases de données et relance les\n"
 "                Services."
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Restreindre l'accès au canal"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Envoie un memo et demande un accusé de reception"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "      Kicker de reverses : %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "      Kicker de reverses : %s (%d kick(s) pour un ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Configure des options sur d'autres pseudos"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr "SAY                Fait dire au bot le texte donné sur un canal"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Active les fonctions de sécurité de %S"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Active ou désactive la sécurité du pseudo"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr ""
 "    SECUREFOUNDER Contrôle plus strict du statut de propriétaire \n"
 "                      du canal"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Contrôle plus strict du statut d'OP"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Envoie un mémo à un pseudo ou un canal"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Envoie un mémo à tous les pseudos enregistrés"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   A utiliser en cas de perte de mot de passe"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Affiche la liste des sessions par hôte"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Configure les options du bot"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Configure le vhost d'un pseudo"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Configure des options globales des Services"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr ""
 "    SET        Configure les options et informations du \n"
 "               canal"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Configure les options, protection comprise"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Définit des options relatives aux mémos"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Configure le vhost pour tous les pseudos d'un groupe"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Arrête les Services avec sauvegarde"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Signe les kicks générés par la commande KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Contrôle la liste des SNLINEs"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Modifie la liste des utilisateurs SOPs"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Contrôle la liste des SQLINEs"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Affiche le staff des services et leurs statuts "
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF  Envoie un mémo à tous les OPERs/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Affiche le statut des Services et du réseau"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Retourne le niveau d'accès courant d'un\n"
 "               utilisateur sur un canal"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Renvoie le statut de propriétaire du pseudo donné"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Définit le successeur d'un canal"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Suspend un canal pour ne pas qu'il soit utilisé\n"
 "               tout en conservant les données et configurations."
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend un pseudo"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Force le changement de pseudo d'un utilisateur"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Contrôle la liste des SZLINEs"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Change le sujet sur un canal spécifié"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr ""
 "    TOPICLOCK     Le sujet peut uniquement être changé avec\n"
 "                      TOPIC"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Change un mode d'un utilisateur"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Retire le bot d'un canal"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Libère un canal suspendu"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend un pseudo"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1553,84 +1487,84 @@ msgstr ""
 "    UPDATE      Oblige les bases de données des Services\n"
 "                à être sauvegardées immédiatement."
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Met à jour votre statut, ex : vérification de nouveaux mémos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Liste tous les utilisateurs"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr " Utilisé sur : %d channel(s)"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Donne un voice au pseudo spécifié sur un canal"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Configure la liste des VOP pour un canal (VOicePeople)"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Change le système de privilèges utilisateurs"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expire le %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "Kicker de mots interdits : %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "Kicker de mots interdits : %s (%d kick(s) pour un ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "     Adresse e-mail: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "        Connecté de: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "  Dernière connexion: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "    Sujet changé par: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1639,17 +1573,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1658,66 +1592,61 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "    Message d'entrée: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "    Vrai nom : %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "      Enregistré le: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Kicker de car. soulignés : %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Kicker de car. soulignés : %s (%d kick(s) pour un ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Num  Expéditeur        Date/Heure"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1725,32 +1654,41 @@ msgstr ""
 "\"/msg %s\" n'est plus supporté.  Utilisez \"/msg %s@%s\" ou \"/%s\" à la "
 "place."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Pseudo:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Pseudo:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d    %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1759,7 +1697,7 @@ msgstr ""
 "%3d  %s (par %s le %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1768,25 +1706,16 @@ msgstr ""
 "%3d %s (par %s le %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (maintenu) (par %s le %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (par %s le %s; %s)\n"
 "    Limite: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1795,253 +1724,259 @@ msgstr ""
 "%5d (%s par %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Commandes %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s n'est pas notifié pour les nouveaux mémos."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modules changés."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bots disponibles."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d jours"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (par %s le %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d heures"
+msgid "%d Modules loaded."
+msgstr "%d Modules changés."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minutes"
+msgid "%d bots available."
+msgstr "%d bots disponibles."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d pseudos dans le groupe."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondes"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "La liste des AOPs de %s est vide."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "La liste des HOPs de %s est vide."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "La liste des SOPs de %s est vide."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "La liste des VOPs de %s est vide."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "La liste d'accès de %s est vide."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "la liste de kicks automatiques de %s est vide."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "La liste des mots interdits de %s est vide."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s ne peut être successeur et propriétaire du canal %s."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s ne peut recevoir de mémos."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Commandes %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "La couverture de %s est trop grande, utilisez un masque plus précis."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s a actuellement %d mémos, desquels %d n'ont pas été lus."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s a actuellement %d mémos, desquels 1 n'a pas été lu."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s a actuellement %d mémos."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s a actuellement %d mémos; aucun n'a été lu."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s a actuellement 1 mémo, qui n'a pas encore été lu."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s a actuellement 1 mémo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s n'a actuellement aucun mémo."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s a trop de mémos et ne peut en recevoir plus."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s n'a aucune limitation de mémos."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s n'a pas de mémos."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s n'a pas de nouveaux mémos."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s est %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s est un opérateur services du type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s n'est pas connecté(e) actuellement."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s est actuellement connecté."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s est désactivé"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s est activé"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s n'est plus SuperAdmin"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s n'est pas notifié pour les nouveaux mémos."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s est notifié pour les nouveaux mémos quand ils arrivent et à la connexion."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s est notifié pour les nouveaux mémos à la connexion."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s est notifié quand de nouveaux mémos arrivent."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s est maintenant SuperAdmin"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Liste des AOPs de %s:\n"
+"  Num  Pseudo"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s introuvable sur la liste de kicks automatiques de %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s supprimé de la liste de kicks automatiques de %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s ne vous enverra aucune notification de mémo."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s vous notifiera maintenant des mémos quand ils vous seront envoyés."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2050,95 +1985,79 @@ msgstr ""
 "%s vous notifiera maintenant des mémos quand vous vous connecterez et quand "
 "ils vous seront envoyés."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s vous notifiera maintenant des mémos quand vous vous connecterez ou "
 "enleverez /AWAY."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) ajouté à la liste des bots."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "La limite de mémos de %s est de %d, elle ne peut pas être changée."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "La limite de mémos de %s est de %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL toutes les nouvelles connexions"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Application des modes %s sur tous les canaux."
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore tous les non OPERs pour les messages"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Refuse toute nouvelle connexion client"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Changement des MLOCK bloqué"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Enregistrement de nouveaux canaux bloqué"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Aucun(s) nouveau(x) mémo(s) envoyé(s)"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Enregistrement de nouveaux pseudos bloqué"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Ignore silencieusement les non-OPERs"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Réduction du nombre maxi de sessions à %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 jour"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 heure"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minute"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 seconde"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Un mémo de masse a été envoyé à tous les pseudos enregistrés."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2148,138 +2067,140 @@ msgstr ""
 "son\n"
 "mémo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "Un passcode a été envoyé à %s, merci de taper /msg %s confirm <passcode> une "
 "fois que vous l'aurez reçu pour compléter l'enregistrement."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "L'identd du vhost dois être dans un format d'identd valide"
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr ""
 "Erreur! Un vhost peut seulement contenir les caratères A-Z, a-z, 0-9, '.' et "
 "'-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT canal texte"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mask]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK canal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[pseudo-ou-usermask]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 "L'application des entrées de la liste de kicks automatiques \n"
 "pour %s est terminée, %d utilisateurs étaient concernés."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "La liste d'AKILL est vide."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées} [raison]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Liste des AOPs de %s:\n"
-"  Num  Pseudo"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal pseudo"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Accès refusé."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Le niveau d'accès de %s sur %s est maintenant de %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Le niveau d'accès de %s sur %s est inchangé de %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Le niveau d'accès doit être compris entre %d et %d inclus."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Le niveau d'accès doit être différent de zéro."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Options de niveaux d'accès du canal %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr ""
 "Les niveaux d'accès de %s ont été réinitialisés à leur valeur par défaut."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "La liste d'accès de %s est vide."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Liste d'accès de %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Liste d'accès de %s:\n"
 "  Num   Lev  Pseudo"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Liste d'accès:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2288,22 +2209,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s ajouté à la liste de kicks automatiques de %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Ajouté un nouvel article de logon news (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Ajouter un nouvel article d'OPER news (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Nouvelle aléatoire ajoutée (n°%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2311,238 +2237,231 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Toutes les O:lines de %s ont été supprimées."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Toutes les O:lines de %s ont été réinitialisées."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Tous les bans du canal %s ont été supprimés."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Toutes les exceptions du canal %s ont été supprimées."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Toutes les invites du canal %s ont été enlevées."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Tous les articles de logon news supprimés."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Tous les mémos du canal %s ont été supprimés."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Tous les modes supprimés du canal %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Tous les modes du canal %s ont été réinitialisés."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Tous vos mémos ont été supprimés."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Tous les articles OPER news supprimés."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Toutes les nouvelles aléatoires ont été supprimées."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Tous les utilisateurs du canal %s ont été kickés."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Autorisé à se (de)halfop"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Autorisé à se (de)op"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Autorisé à se (dé)protéger"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Autorisé à se (de)voicer"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Autorisé à attribuer/retirer un bot"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Autorisé à se bannir"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Autorisé à se kicker"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Autorisé à lister/lire les mémos"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Autorisé à modifier la liste d'accès"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Autorisé à utiliser la commande AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Autorisé à utiliser la commande BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Autorisé à utiliser la commande BAN"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Autorisé à utiliser la commande CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Autorisé à utiliser la commande GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Autorisé à utiliser les commandes HALFOP/DEHALFOP"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Autorisé à utiliser la commande INFO avec l'option ALL"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Autorisé à utiliser la commande INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Autorisé à utiliser la commande KICK"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Autorisé à utiliser les commandes OP/DEOP"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Autorisé à utiliser les commandes PROTECT/DEPROTECT"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Autorisé à utiliser les commandes ACT et SAY"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Autorisé à utiliser la commande SET (mais pas FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Autorisé à utiliser la commande TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Autorisé à utiliser la commande UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Autorisé à utiliser les commandes VOICE/DEVOICE"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Autorisé à utiliser les commandes fantaisistes"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Autorisé à voir la liste d'accès"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Liste de kicks automatiques de %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Statut automatique d'opérateur du canal"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Mode +a automatique"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Mode +h automatique"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Mode +v automatique"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [mot | liste-d'entrées] [SINGLE|START|"
 "END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2552,7 +2471,7 @@ msgstr ""
 "BOT CHANGE ancien-pseudo nouveau-pseudo [user [host [real]]]\n"
 "BOT DEL pseudo"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2561,111 +2480,109 @@ msgstr ""
 "Liste des mots interdits de %s:\n"
 "  Num   Mot                            Type"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "La liste des mots interdits est maintenant vide."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Le type de ban du canal %s est maintenant le numéro %d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Les modes binaires et les bans sont supprimés de %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Le bot %s existe déjà."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Le bot %s n'existe pas."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Le bot %s a été attribué à %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Le bot %s a été changé en %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Le bot %s a été supprimé."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Le bot %s est déja assigné au canal %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Le bot kickera les OPs du canal %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Le bot kickera les voices du canal %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Le bot ne kickera pas les OPs du canal %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Le bot ne kickera pas les voices du canal %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Les hôtes des bots ne doivent contenir que %d caractères."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Les hôtes des bots ne doivent contenir que des caractères valides."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Les identités des bots ne doivent contenir que %d caractères."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Les identités des bots ne doivent contenir que des caractères valides."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Les pseudos des bots ne peuvent contenir que des caractères valides."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Le bot n'est pas sur le canal %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Liste des bots:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Le bot joindra un canal dès qu'il y aura au moins\n"
-"%d utilisateur(s) dessus."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2676,7 +2593,7 @@ msgstr ""
 "un ban après %d kicks pour le même utilisateur. Utilisez\n"
 "la commande BADWORDS pour ajouter ou supprimer un mot."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2684,20 +2601,20 @@ msgstr ""
 "Le bot kickera maintenant les mots interdits. Utilisez\n"
 "la commande BADWORDS pour ajouter ou supprimer un mot."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Le bot kickera maintenant les caractères gras, et mettra\n"
 "un ban après %d kicks pour le même utilisateur."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Le bot kickera maintenant les caractères gras."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2709,7 +2626,7 @@ msgstr ""
 "entier), et mettra un ban après %d kicks pour le même \n"
 "utilisateur."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2719,50 +2636,50 @@ msgstr ""
 "constituer au moins %d caractères et %d%% du message \n"
 "entier)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Le bot kickera maintenant les couleurs, et mettra\n"
 "un ban après %d kicks pour le même utilisateur."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Le bot kickera maintenant les couleurs."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Le bot kickera maintenant le flood (%d lignes en %d \n"
 "secondes), et mettra un ban après %d kicks pour le \n"
 "même utilisateur."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr ""
 "Le bot kickera maintenant le flood (%d lignes en %d \n"
 "secondes)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2773,7 +2690,7 @@ msgstr ""
 "utilisateurs qui disent %d fois la même chose), et \n"
 "mettra un ban après %d kicks pour le  même utilisateur."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2782,142 +2699,156 @@ msgstr ""
 "Le bot kickera maintenant les répétitions (les \n"
 "utilisateurs qui disent %d fois la même chose)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Le bot kickera maintenant les reverses, et mettra\n"
 "un ban après %d kicks pour le même utilisateur."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Le bot kickera maintenant les reverses."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Le bot kickera maintenant les caractères soulignés, \n"
 "et mettra un ban après %d kicks pour le même \n"
 "utilisateur."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Le bot kickera maintenant les caractères soulignés."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Le bot kickera maintenant les couleurs."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Le bot ne kickera plus les mots interdits."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Le bot ne kickera plus les caractères gras."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Le bot ne kickera plus les majuscules."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Le bot ne kickera plus les couleurs."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Le bot ne kickera plus le flood."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Le bot ne kickera plus les répétitions."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Le bot ne kickera plus les reverses."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Le bot ne kickera plus les caractères soulignés."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Le bot ne kickera plus les majuscules."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d enregistrements, %5d ko"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots réservés aux opérateurs IRC:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Octets lus    : %5d ko"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Octets écrits : %5d ko"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {pseudo | canal}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#canal} [raison]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK pseudo"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR canal raison"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr ""
-"Vous ne pouvez pas déconnecter %s parce que c'est un administrateur\n"
-"des services."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR canal raison"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Impossible d'envoyer un e-mail maintenant, veuillez réessayez un peu\n"
 "plus tard."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d enregistrements, %5d ko"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Mode de %s changés."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Le canal %s n'existe pas."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Le canal %s a été effacé."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2926,152 +2857,103 @@ msgstr ""
 "Le canal %s a été interdit par %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Le canal %s est déjà enregistré!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Le canal %s est maintenant interdit."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Le canal %s est maintenant liberé."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Le canal %s est maintenant suspendu."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Le canal %s n'est pas enregistré."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Le canal %s ne peut être ni enregistré ni utilisé."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Le canal %s ne peut pas être enregistré."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Le canal %s a été enregistré sous votre pseudo: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Channel       : %6d enregistrements, %5d ko"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Le canal %s expirera."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Le canal %s n'expirera pas."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "La liste des AOPs de %s est maintenant vide."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "La liste des HOPs de %s est maintenant vide."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "La liste des SOPs de %s est maintenant vide."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "La liste des VOPs de %s est maintenant vide."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La liste d'accès de %s est maintenant vide."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La liste de kicks automatiques de %s est maintenant vide."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Le canal %s est maintenant liberé."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Le canal %s n'est pas un canal valide."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr ""
-"Les listes des AOPs des canaux ne peuvent contenir que des pseudos "
-"enregistrés."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr ""
-"Les listes des HOPs des canaux ne peuvent contenir que des pseudos "
-"enregistrés."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr ""
-"Les listes des SOPs des canaux ne peuvent contenir que des pseudos "
-"enregistrés."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Les SQLINEs de canaux ne sont pas supportées par votre serveur, vous ne "
 "pouvez donc pas les utiliser."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr ""
-"Les listes des VOPs des canaux ne peuvent contenir que des pseudos "
-"enregistrés."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr ""
-"Les listes d'accès des canaux ne peuvent contenir que des pseudos "
-"enregistrés."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3079,11 +2961,7 @@ msgstr ""
 "Liste des channels:\n"
 "Nom                  Users Modes   Topic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Non autorisé à avoir le statut d'opérateur du canal"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3092,7 +2970,7 @@ msgstr ""
 "Liste des canaux auquels %s a accès:\n"
 "  Num  Canal                Level    Description "
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3100,31 +2978,16 @@ msgstr ""
 "Liste des canaux auquels vous avez accès:\n"
 "  Num  Canal                Level    Description "
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Impossible d'interdire le canal %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Impossible d'interdire le pseudo %s!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Impossible de libérer le canal %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Impossible de suspendre le canal %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Liste d'AKILL actuelle:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3132,15 +2995,15 @@ msgstr ""
 "Liste d'AKILL actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Liste des modules courant:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Liste de SNLINEs actuelle:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3148,11 +3011,11 @@ msgstr ""
 "Liste de SNLINEs actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Liste de SQLINEs actuelle:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3160,11 +3023,11 @@ msgstr ""
 "Liste de SQLINEs actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Liste de SZLINEs actuelle:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3172,725 +3035,612 @@ msgstr ""
 "Liste de SZLINEs actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Liste actuelle des exceptions à la limitation de sessions:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Nombre d'AKILLs actuel: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Nombre de SNLINEs actuel: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Nombre de SQLINEs actuel: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Nombre de SZLINEs actuel: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Utilisateurs actuels: %d (%d ops)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <pseudo>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {num | liste | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <pseudo>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP canal"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Temps d'échéance des AKILLs par défaut: %d jours"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Temps d'échéance des AKILLs par défaut: %d heures"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Temps d'échéance des AKILLs par défaut: %d minutes"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Temps d'échéance des AKILLs par défaut: 1 jour"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Temps d'échéance des AKILLs par défaut: 1 heure"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Temps d'échéance des AKILLs par défaut: 1 minute"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Temps d'échéance des AKILLs par défaut: Pas d'échéance"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Temps d'échéance des SNLINEs par défaut: %d jours"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Temps d'échéance des SNLINEs par défaut: %d heures"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Temps d'échéance des SNLINEs par défaut: %d minutes"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Temps d'échéance des SNLINEs par défaut: 1 jour"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Temps d'échéance des SNLINEs par défaut: 1 heure"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Temps d'échéance des SNLINEs par défaut: 1 minute"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Temps d'échéance des SNLINEs par défaut: Pas d'échéance"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Temps d'échéance des SQLINEs par défaut: %d jours"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Temps d'échéance des SQLINEs par défaut: %d heures"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Temps d'échéance des SQLINEs par défaut: %d minutes"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Temps d'échéance des SQLINEs par défaut: 1 jour"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Temps d'échéance des SQLINEs par défaut: 1 heure"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Temps d'échéance des SQLINEs par défaut: 1 minute"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Temps d'échéance des SQLINEs par défaut: Pas d'échéance"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Temps d'échéance des SZLINEs par défaut: %d jours"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Temps d'échéance des SZLINEs par défaut: %d heures"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Temps d'échéance des SZLINEs par défaut: %d minutes"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Temps d'échéance des SZLINEs par défaut: 1 jour"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Temps d'échéance des SZLINEs par défaut: 1 heure"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Temps d'échéance des SZLINEs par défaut: 1 minute"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Temps d'échéance des SZLINEs par défaut: Pas d'échéance"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "%d entrées supprimées de la liste des AOPs de %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "%d entrées supprimées de la liste des HOPs de %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "%d entrées supprimées de la liste des SOPs de %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "%d entrées supprimées de la liste des VOPs de %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "%d entrées supprimées de la liste d'accès de %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d entrées supprimées de la liste de kicks automatiques de %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "%d entrées supprimées de la liste des mots interdits de %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr ""
 "%d entrées supprimées de la liste des exceptions à la limitation de sessions."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "%d entrées supprimées de la liste d'AKILL."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "%d entrées supprimées de la liste de SNLINEs."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "%d entrées supprimées de la liste de SQLINEs."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "%d entrées supprimées de la liste de SZLINEs."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "1 entrée supprimée de la liste des AOPs de %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "1 entrée supprimée de la liste des HOPs de %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "1 entrée supprimée de la liste des SOPs de %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "1 entrée supprimée de la liste des VOPs de %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 entrée supprimée de la liste d'accès de %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 entrée supprimée de la liste de kicks automatiques de %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "1 entrée supprimée de la liste des mots interdits de %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr ""
 "1 entrée supprimée de la liste des exceptions à la limitation de sessions."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "1 entrée supprimée de la liste d'AKILL."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "1 entrée supprimée de la liste de SNLINEs."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "1 entrée supprimée de la liste de SQLINEs."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "1 entrée supprimée de la liste de SZLINEs."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "1 entrée supprimée de la liste des AOPs de %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La description de %s est maintenant %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "inactif"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Affiche tous les enregistrements (Nb: %d) "
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Affiche les enregistrements de %d à %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Affiche les enregistrements contenant %s (Nb: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "N'utilisez pas de caractères gras sur ce canal!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "N'utilisez pas de couleurs sur ce canal!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "N'utilisez pas de caractères inversés sur ce canal!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Ne dites pas %s sur ce canal!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "N'utilisez pas de caractères soulignés sur ce canal!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "L'adresse E-mail pour %s a été changée en %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "L'adresse E-mail pour %s a été effacée."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Votre adresse e-mail a été effacée."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "L'adresse e-mail de %s est invalide."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [paramètres]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "E-mails trouvés %s pour %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "actif"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Fin du %s list."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Fin de liste d'accès."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Fin de la liste des channels."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fin de la liste - %d/%d correspondances affichées."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fin de la liste - %d/%d correspondances affichées."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Fin de la liste des utilisateurs."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Français"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Le message d'entrée de %s a été changé."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Le message d'entrée de %s a été effacé."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr "Erreur! l'Ident est trop long, veuillez entrer moins de %d caratères."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr "Erreur! Le vhost est trop long, veuillez entrer moins de %d caratères."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "L'exception pour %s (#%d) a été déplacée à la position %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "L'exception pour %s a été changée en %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expire le: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "L'échéance de %s a été changée."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID canal raison"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [raison]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID pseudo raison"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID pseudo [raison]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantaisie"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "La fantaisie est maintenant activée sur le canal %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "La fantaisie est maintenant désactivée sur le canal %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "La fantaisie est maintenant activée sur le canal %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s n'est plus ignoré"
 
-#: language.cpp:846
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Le propriétaire de %s est maintenant %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Pas de jokers !!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY canal"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS pseudo"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "La commande GETPASS est indisponible car le cryptage est utilisé."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST pseudo [motdepasse]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL message"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP cible motdepasse"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "L'utilisateur fantôme utilisant votre pseudo a été déconnecté."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Message d'accueil"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Message d'accueil affiché"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Le message d'accueil pour %s a été changé en %s"
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Le message d'accueil de %s a été effacé."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Le message d'accueil est maintenant désactivé sur le canal %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Le message d'accueil est maintenant activé sur le canal %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Liste des HOPs de %s:\n"
-"  Num  Pseudo"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d enregistrements, %5d ko"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hôtes ayant au moins %d sessions:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY motdepasse"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [durée] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO pseudo"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | pseudo}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Si vous ne changez pas d'ici 20 secondes, je changerai votre pseudo."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Si vous ne changez pas d'ici 1 minute, je changerai votre pseudo."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Le code d'ignore sera utilisé."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Le code d'ignore ne sera pas utilisé."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "La liste des ignorés a été purgée."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "La liste des ignorés est vide."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Liste des bots:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3906,29 +3656,25 @@ msgstr ""
 "Tapez /msg %S HELP SET option pour plus d'informations\n"
 "sur une option spécifique."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Portée incorrecte spécifiée. La syntaxe correcte est #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Information pour le bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informations pour le canal %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Erreur interne - impossible d'effectuer la commande."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Echéance invalide."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3936,12 +3682,12 @@ msgstr ""
 "Masque d'hôte invalide. Seuls les masques d'hôtes réels sont valides puisque "
 "les exceptions ne sont pas comparées aux pseudos et utilisateurs."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr "Passcode invalide, merci de le vérifier."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3950,296 +3696,310 @@ msgstr ""
 "Limite de session invalide. Elle doit être un entier valide supérieur ou "
 "égal à zero et plus petit que %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Valeur minimale invalide. Elle doit être un entier valide supérieur à 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE nom-du-serveur [raison]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal option {ON|OFF} [paramètres]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK canal utilisateur raison"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "La clé du canal %s est %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [option [level]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST modèle"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST modèle [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [liste | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Votre langue est maintenant le Français."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Le dernier mémo envoyé à %s a été supprimé."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "       Dernier déconnexion: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "            Adresse: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Le niveau pour %s du channel %s est maintenant de %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Le niveau doit être compris entre %d et %d inclus."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Cette commande est inutile dans ce mode."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Liste des entrées correspondantes à %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Liste des pseudos dans le groupe de %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Liste des pseudos dans votre groupe:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Les canaux locaux ne peuvent être enregistrés."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Article de logon news #%d supprimé."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Article de logon news #%d non trouvé!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Articles des logon news:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE canal modes"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO Fichier"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD Fichier"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD Fichier"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD Fichier"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Le masque %s existe déjà dans votre liste d'accès."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Le masque doit avoir le format user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Record d'utilisateurs: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Mémo %d de %s (%s).  Pour supprimer, tapez: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Mémo %d de %s (%s).  Pour supprimer, tapez: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Le mémo %d a été supprimé."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limite de mémos de %s désactivée."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limite de mémos de %s définie à %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de mémos de %s définie à 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Limite de mémos trop grande, limitation à %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Mémo envoyé à %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ num"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ num"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Mode message"
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Mode %c ignoré car il ne peut être maintenu."
-
-#: language.cpp:1314
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Tous les OPs du canal %s ont été enlevés."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Les modes maintenus du canal %s sont maintenant %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "     Modes maintenus: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Le module %s a été chargé."
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Le module %s a été chargé."
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Le module %s a été déchargé."
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Auteur: %s chargé: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} serveur"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliases NS    : %6d enregistrements, %5d ko"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Groupes NS    : %6d enregistrements, %5d ko"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Jamais kické par les kickers du bot"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Nouveau mémo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Nouveaux mémos pour %s.  Pour lire, tapez: /msg %s READ num"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Nouveaux mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "La liste des News est pleine!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4248,146 +4008,132 @@ msgstr ""
 "Le pseudo %s a été interdit par %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Le pseudo %s est un pseudo illégal et ne peut pas etre utilisé."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Le pseudo %s est déja utilisé."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Le pseudo %s est désormais interdit."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Le pseudo %s fait partie des services du réseau."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Le pseudo %s n'est pas en tutelle."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Le pseudo %s n'est actuellement pas utilisé."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Le nick %s n'est pas enregistré."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Le pseudo %s ne peut être ni enregistré ni utilisé."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s n'a pas été trouvé dans la liste des ignorés."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Le pseudo %s a été tronqué de %d caractères."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Le pseudo %s expirera."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Le pseudo %s n'expirera pas."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Le pseudo %s n'a aucun mémo de votre part."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Le pseudo %s n'est plus identifié."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Le pseudo %s est actuellement suspendu."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Le pseudo %s est liberé."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Le pseudo %s est suspendu."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Pseudo non enregistré... Réessayez plus tard."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Pseudo %s confirmé"
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Le pseudo %s a été effacé."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Le pseudo %s est déjà enregistré!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Le pseudo %s ne peut être enregistré."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Le pseudo %s n'est pas enregistré."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Le pseudo %s est maintenant enregistré sous votre masque: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Le pseudo %s est enregistré."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Enregistrement d'un pseudo (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Mot de passe du pseudo %s"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4398,165 +4144,120 @@ msgstr ""
 "l'expiration automatique, c'est-à-dire qu'ils seront effacés\n"
 "après %d jours de non utilisation."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Aucun # trouvé devant le nom du canal."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Le mode sans bot est maintenant désactivé sur le canal %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Le mode sans bot est maintenant activé sur le canal %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Aucun E-mail listé pour %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Pas de bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Aucune aide disponible sur %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Aucune information sur le module %s n'est accessible."
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Aucun article de logon news à supprimer!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Aucune entrée correspondante sur la liste des AOPs de %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Aucune entrée correspondante sur la liste des HOPs de %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Aucune entrée correspondante sur la liste des SOPs de %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Aucune entrée correspondante sur la liste des VOPs de %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Aucune entrée correspondante sur la liste d'accès de %s."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Aucune entrée correspondante sur la liste de kicks automatiques de %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr ""
 "Aucune entrée correspondante sur la liste des mots interdits \n"
 "de %s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "Aucune entrée correspondante sur la liste des exceptions à la limitation de "
 "sessions."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Aucune entrée correspondante sur la liste d'AKILL."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Aucune entrée correspondante sur la liste de SNLINEs."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Aucune entrée correspondante sur la liste de SQLINEs."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Aucune entrée correspondante sur la liste de SZLINEs."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Aucun mémo n'était annulable."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Aucun module n'est chargé"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Pas d'article OPER news à supprimer!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Aucune nouvelle aléatoire à supprimer!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Aucune raison"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Pas de kick signé quand SIGNKICK LEVEL est utilisé"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Entrée inexistante (#%d) sur la liste des AOPs de %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Entrée inexistante (#%d) sur la liste des HOPs de %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Entrée inexistante (#%d) sur la liste des SOPs de %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Entrée inexistante (#%d) sur la liste des VOPs de %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Aucune"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Non autorisé à rejoindre le canal s'il est restreint"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4568,97 +4269,93 @@ msgstr ""
 "utilisateur figurant sur la liste d'accès du canal\n"
 "ne vient sur le canal) il sera automatiquement effacé."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Num  Limite  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE pseudo flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "Notice sur OP"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "L'ancienne information est égale à la nouvelle."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Pseudo"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr ""
-"L'option 'op-notice' est maintenant INACTIVE sur\n"
-"%s."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "L'option 'op-notice' est maintenant ACTIVE sur %s."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Article OPER news #%d supprimé."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Article OPER news #%d non trouvé!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Articles oper news:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d enregistrements, %5d ko"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Une O:LINE avec les flags %s a été ajoutée pour %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Protection des OPs"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "L'option %s ne peut être changée sur ce réseau."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Le passcode pour %s est %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Mot de passe accepté - vous êtes maintenant identifié."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4666,60 +4363,56 @@ msgstr ""
 "L'authentification par mot de passe est requise pour cette commande.\n"
 "Réessayez après avoir tapé /msg %s IDENTIFY motdepasse."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Le mot de passe pour %s a été changé en %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Mot de passe changé pour %s."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Le mot de passe de %s est %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Mot de passe incorrect."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Le mot de passe de %s a été envoyé."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Paix"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Le mode 'paix' est INACTIF pour %s."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Le mode 'paix' est ACTIF pour %s."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr "Contactez un opérateur afin d'avoir un vhost sous ce pseudo."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4728,174 +4421,135 @@ msgstr ""
 "facilement devinables (par exemple votre vrai nom ou votre pseudo), et ne "
 "doivent pas contenir d'espaces ou de tabulations."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Veuillez indiquer un nom de serveur valide pour JUPE."
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr ""
 "Veuillez utiliser les symbole # quand vous voulez enregistrer\n"
 "un canal."
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Attendez %d secondes et réessayez."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Attendez %d secondes avant d'utiliser la commande GROUP à nouveau."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Veuillez attendre %d secondes avant d'utiliser la commande REGISTER à "
 "nouveau."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Veuillez attendre %d secondes avant d'utiliser RSEND à nouveau."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Veuillez patienter %d secondes avant d'utiliser la commande SEND à nouveau."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Confidentialité"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Le mode privé du bot %s est maintenant désactivé."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Le mode privé du bot %s est maintenant activé."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "L'option 'privé' pour %s est maintenant INACTIVE."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "L'option 'privé' pour %s est maintenant ACTIVE."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "L'option 'privé' est maintenant INACTIVE pour %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "L'option 'privé' est maintenant ACTIVE pour %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Protection"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "La protection est maintenant INACTIVE pour %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "La protection est maintenant ACTIVE pour %s, avec un délai réduit."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "La protection est maintenant ACTIVE pour %s, sans aucun délai."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "La protection est maintenant ACTIVE pour %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "La protection est maintenant activée, sans délai."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Fournir la commande: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {liste | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER pseudo [motdepasse]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER canal motdepasse description"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER motdepasse email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER motdepasse [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE pseudo [motdepasse]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {pseudo | canal} memo-text"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Nouvelle aléatoire n°%d supprimée."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Nouvelle aléatoire n°%d non trouvée!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Nouvelles aléatoires:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4903,296 +4557,307 @@ msgstr ""
 "Aucune validation en attente... Tapez: \"/msg %s register <password> <email>"
 "\" pour l'enregistrer."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Accès restreint"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Les restrictions d'accès pour %s sont maintenant INACTIVES."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Les restrictions d'accès pour %s sont maintenant ACTIVES."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASET pseudo PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET pseudo option paramètres"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET pseudo HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET pseudo KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET pseudo KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET pseudo NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET pseudo PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET pseudo SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET pseudo HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY canal texte"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {pseudo | canal} texte-du-memo"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS pseudo"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "La commande SENDPASS est indisponible car le cryptage est utilisé."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <pseudo> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal option paramètres"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET canal option paramètres"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET canal OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET option paramètres"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET option valeur"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE nombre"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] limite"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [utilisateur | canal] {limite | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <pseudo> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "La liste de SNLINEs est vide."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5200,341 +4865,326 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées} [raison]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Liste des SOPs de %s:\n"
-"  Num  Pseudo"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "La liste de SQLINEs est vide."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées}[:raison]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUT %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "ERREUR : Le canal %s n'est pas enregistré."
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "ERREUR : Le pseudo %s n'est pas connecté."
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND canal raison"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND canal [raison]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND canal raison"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND pseudo raison"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK pseudo nouveau-pseudo "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "La liste de SZLINEs est vide."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées} [raison]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Sécurité"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Contrôle du propriétaire"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Contrôle des OPs"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "L'option de sécurité du propriétaire pour %s est INACTIVE."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "L'option de sécurité du propriétaire pour %s est ACTIVE."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "La sécurité des OPs sur %s est maintenant INACTIVE."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "La sécurité des OPs pour %s est maintenant ACTIVE."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "L'option de sécurité pour %s est INACTIVE."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "L'option de sécurité pour %s est ACTIVE."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "L'option de sécurité est maintenant INACTIVE pour %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "L'option de sécurité est maintenant ACTIVE pour %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Sécurité"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Serveurs trouvés: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Ce service est temporairement désactivé, veuillez réessayer ultérieurement."
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Les services sont maintenant sur DEFCON %d."
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Les Services sont maintenant en mode expiration."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Les Services sont maintenant en mode sans expiration."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Les Services sont maintenant en mode lecture-seule."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Les Services sont maintenant en mode lecture-écriture."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Les Services sont maintenant en mode debug (niveau %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Les Services sont maintenant en mode debug."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Les Services sont maintenant en mode normal ( non debug)."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Les services ont été configurés pour ne pas envoyer de mail."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Liste des ignores:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Les Services ne peuvent changer les modes. Vos serveurs sont-ils configurés "
-"correctement?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Les Services ne peuvent changer les modes. Les U:lines de vos serveurs sont-"
 "elles configurées correctement?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Les services tournent depuis %d jour, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Les services tournent depuis %d jours, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Les services tournent depuis %d heure, %d minute"
+msgid "Services up %d hours, %d minutes"
+msgstr "Les services tournent depuis %d heures, %d minutes"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Les services tournent depuis %d heure, %d minutes"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Les services tournent depuis %d minutes, %d secondes"
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Les services tournent depuis %d heures, %d minute"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Les services tournent depuis %d heures, %d minutes"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Les services tournent depuis %d minute, %d seconde"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Les services tournent depuis %d minute, %d secondes"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Les services tournent depuis %d minutes, %d seconde"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Les services tournent depuis %d minutes, %d secondes"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/os_stats.cpp:163
+#, c-format
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
+
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Le service ne rendra plus %s automatiquement OP dans les canaux."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Le service rendra %s automatiquement OP dans les canaux."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Les services repondront à %s par des messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Les services repondront à %s par des notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Le fichier de configuration des Services a été rechargé."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "La tutelle des Services sur votre pseudo a été enlevée."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "La limite de sessions de %s est maintenant de %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "La limitation de sessions est désactivée."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessions      : %6d enregistrements, %5d ko"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "L'option %s est inconnue.  Tapez /msg %s HELP LEVELS DESC pour une \n"
 "liste d'options valides."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "La valeur pour DEBUG doit être ON, OFF, ou un nombre positif."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "La valeur pour IGNORE doit être ON ou OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "La valeur de NOEXPIRE doit être ON ou OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "La valeur pour READONLY doit être ON ou OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr "Syntaxe incorrect, spécifiez ON ou OFF."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Les kicks ne seront plus signés sur %s."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Les kicks seront maintenant signés sur %s."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5543,236 +5193,201 @@ msgstr ""
 "Les kicks seront maintenant signés sur %s en fonction de \n"
 "l'accès de l'utilisateur sur le canal."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Les kicks seront maintenant signés sur %s."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Kicks signés"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Désolé, RSEND est désactivé sur ce réseau."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Désolé, l'attribution des bots est temporairement désactivée."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Désolé, la création du bot a échoué."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Désolé, la modification des bots est temporairement désactivée."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des options du bot est \n"
 "temporairement désactivée."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification des listes des AOPs des canaux est temporairement "
 "désactivée."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr ""
-"Désolé, la modification des listes des HOPs des canaux est temporairement "
-"désactivée."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr ""
-"Désolé, la modification des listes des SOPs des canaux est temporairement "
-"désactivée."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr ""
-"Désolé, la modification des listes des VOPs des canaux est temporairement "
-"désactivée."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification des listes d'accès des canaux est temporairement "
 "désactivée."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification de la liste de kicks automatiques du canal \n"
 "est temporairement désactivée."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification de la liste des mots interdits\n"
 "est temporairement désactivée."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Désolé, l'effacement de canaux est temporairement désactivé."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des options du canal est temporairement désactivée."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Désolé, l'enregistrement des canaux est temporairement désactivé."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Désolé, impossible de changer le mot de passe pour %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Désolé, le groupage de pseudos a échoué."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Désolé, l'identification a échoué."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des kickers est temporairement\n"
 "désactivée."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Désolé, la configuration des options est temporairement désactivée."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Désolé, l'envoi de mémos est temporairement désactivé."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Désolé, l'effacement de pseudo est temporairement désactivé."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Désolé, le groupage de pseudos est temporairement désactivé."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des options du pseudo est temporairement désactivée."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Désolé, l'enregistrement des pseudos est temporairement désactivé."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Désolé, l'enregistrement a échoué."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
 msgstr ""
-"Désolé, vous ne pouvez avoir que %d entrées sur les listes des AOPs/SOPs/"
-"VOPs d'un canal."
+"Désolé, vous ne pouvez avoir que %d entrées sur la liste d'accès d'un canal."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Vous ne pouvez avoir que %d entrées dans la liste d'accès d'un pseudo."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Désolé, vous ne pouvez avoir que %d entrées sur la liste d'accès d'un canal."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
 "Désolé, vous ne pouvez avoir plus de %d entrées de kicks automatiques \n"
 "sur un canal."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr ""
 "Désolé, vous ne pouvez avoir que %d entrées sur la\n"
 "liste des mots interdits."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Désolé, vous avez déjà dépassé votre limite de %d canaux."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Désolé, vous avez déjà atteint votre limite de %d canaux."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statistiques réinitialisées."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Statut mis à jour (memos, vhost, modes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Arrêtez d'envoyer autant de messages!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Arrêtez de vous répéter!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Il n'y a plus de successeur sur %s."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Le successeur de %s est maintenant %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "L'option Super-Admin n'est pas activée dans le services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Symbiose"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "La symbiose est maintenant désactivée sur le canal %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "La symbiose est maintenant activée sur le canal %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Syntaxe: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5799,7 +5414,7 @@ msgstr ""
 "2: ban de style *!*@host\n"
 "3: ban de style *!*user@*.domain"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5812,28 +5427,12 @@ msgstr ""
 "Définit la description du canal, qui apparait dans les\n"
 "commandes LIST et INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Syntaxe: %s canal ENTRYMSG [message]\n"
-"\n"
-"Définit le message qui sera envoyé en /notice aux \n"
-"utilisateurs quand ils entrent dans un canal. Si aucun\n"
-"paramètre n'est donné, aucun message n'est envoyé à\n"
-"l'entrée."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Syntaxe: %s canal FOUNDER pseudo\n"
@@ -5841,7 +5440,7 @@ msgstr ""
 "Change le propriétaire d'un canal. Le nouveau pseudo doit être\n"
 "enregistré."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5860,79 +5459,7 @@ msgstr ""
 "dernier utilisateur ait quitté le canal, et sera restauré\n"
 "la prochaine fois que le canal sera créé. "
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Syntaxe: %s canal MLOCK modes\n"
-"\n"
-"Configure les modes maintenus sur le canal. %S vous permet de\n"
-"toujours garder certains modes, d'empêcher l'utilisation d'autres\n"
-"modes et de laisser les modes restants en libre utilisation par\n"
-"les OPérateurs du canal.\n"
-"\n"
-"Le paramètre modes est construit de la même façon que dans la \n"
-"commande /MODE, les modes précédés d'un + étant toujours gardés, \n"
-"et ceux précédés d'un - ne pouvant être utilisés. Notez cependant\n"
-"que, contrairement à la commande /MODE, chaque utilisation de \n"
-"SET MLOCK réinitialisera les modes maintenus avant de mettre en \n"
-"place les nouveaux!\n"
-"\n"
-"Remarque: Si vous choisissez de toujours garder le mode +k, \n"
-"comme dans le second exemple ci-dessous, vous devez également \n"
-"activer l'option RESTRICTED du canal (HELP SET \n"
-"RESTRICTED pour plus d'informations), sinon toute personne \n"
-"entrant sur le canal lorsqu'il est vide verra la clef!  \n"
-"\n"
-"Exemples:\n"
-"\n"
-"    SET #canal MLOCK +nt-iklps\n"
-"      Garde toujours les modes n et t, et empêche l'utilisation \n"
-"      des modes i, k, l, p, et s. Le mode m est libre d'être \n"
-"      mis ou retiré.\n"
-"\n"
-"    SET #canal MLOCK +knst-ilmp ma-clef\n"
-"      Garde toujours les modes k, n, s, et t, et désactive \n"
-"      les modes i, l, m, et p. La clef du canal sera \n"
-"      \"ma-clef\".\n"
-"\n"
-"    SET #canal MLOCK +\n"
-"      Réinitialise tous les modes précédemment maintenus, qui\n"
-"      pourront désormais être librement utilisés."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5949,7 +5476,7 @@ msgstr ""
 "canal à chaque fois que les commandes OP ou DEOP sont\n"
 "utilisées par un utilisateur sur le canal."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5967,7 +5494,7 @@ msgstr ""
 "de canal d'un user qui a un niveau supérieur ou\n"
 "égal au sien via les commandes de %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -6012,7 +5539,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -6026,13 +5553,13 @@ msgstr ""
 "Si private est défini, un /msg %S LIST ne comprendra\n"
 "le canal dans aucune liste."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Syntaxe: %s canal RESTRICTED {ON | OFF}\n"
@@ -6041,7 +5568,7 @@ msgstr ""
 "Quand l'accès restreint est activé, les utilisateurs qui ne sont\n"
 "pas inscrits à la liste d'accès seront kickés et bannis du canal."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -6060,7 +5587,7 @@ msgstr ""
 "qui sont identifiés avec leur mot de passe auront accès\n"
 "au canal, sous contrôle de la liste d'accès."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6079,52 +5606,12 @@ msgstr ""
 "son propriétaire et son successeur, et non pas ceux qui sont identifiés \n"
 "avec %S."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Syntaxe: %s canal SECUREOPS {ON | OFF}\n"
-"\n"
-"Active ou désactive le contrôle des OPs sur un canal.\n"
-"Lorsque le contrôle des OPs est actif, les utilisateurs \n"
-"qui ne sont pas sur la liste d'accès ne pourront être OP."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Syntaxe: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Active ou désactive les kicks signés sur un canal.\n"
-"Quand cette option est utilisée, les kicks générés\n"
-"par la commande %S KICK contiendront dans la raison\n"
-"le pseudo qui a utilisé\tla commande.\n"
-"\n"
-"Si vous sélectionnez LEVEL, ceux qui ont un niveau qui est\n"
-"supérieur ou égal au niveau SIGNKICK sur le canal ne \n"
-"génèreront pas de kicks signés. Consultez /msg %S HELP LEVELS\n"
-"pour plus d'informations."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6142,24 +5629,7 @@ msgstr ""
 "si aucun successeur n'avait été nommé. Le nouveau pseudo\n"
 "doit être enregistré."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Syntaxe: %s canal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Active ou désactive l'option de verrouillage du sujet pour\n"
-"un canal. Lorsque le verrouillage du sujet est actif,\n"
-"%S ne permettra pas le changement du sujet du canal sauf\n"
-"avec la commande TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6206,10 +5676,11 @@ msgstr ""
 "Passer du système de listes de xOPs au système de liste\n"
 "d'accès ne pose aucun problème par contre."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6222,18 +5693,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6291,7 +5766,7 @@ msgstr ""
 "La commande ACCESS CLEAR supprime toutes les entrées\n"
 "de la liste d'accès."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6339,7 +5814,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Affiche votre liste d'accès."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6351,12 +5826,18 @@ msgstr ""
 "Fait faire au bot l'équivalent d'une commande \"/me\"\n"
 "sur le canal donné avec le texte donné."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6377,15 +5858,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6456,7 +5928,8 @@ msgstr ""
 "La commande AKICK CLEAR supprime toutes les entrées\n"
 "de la liste de kicks automatiques."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6464,21 +5937,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6548,7 +6021,7 @@ msgstr ""
 "\n"
 "Réservé aux opérateurs des Services."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6587,7 +6060,7 @@ msgstr ""
 "Les canaux ayant l'option NOEXPIRE active seront retournés avec un point \n"
 "d'exclamation devant."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6604,10 +6077,11 @@ msgstr ""
 "level liste les canaux auxquels le pseudo donné a un accès supérieur\n"
 "ou égal au niveau donné."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6687,7 +6161,7 @@ msgstr ""
 "d'accès, et /msg %S HELP SET XOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6701,7 +6175,8 @@ msgstr ""
 "pouvez ensuite configurer le bot pour qu'il convienne à\n"
 "vos besoins."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6733,7 +6208,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6773,7 +6248,7 @@ msgstr ""
 "La commande BADWORDS CLEAR supprime toutes les entrées\n"
 "de la liste des mots interdits."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6788,7 +6263,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6831,7 +6306,7 @@ msgstr ""
 "utilise le pseudo du bot lors de sa création ou modification,\n"
 "il sera déconnecté."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6841,7 +6316,7 @@ msgstr ""
 "\n"
 "Liste tous les bots disponibles sur ce réseau."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6854,7 +6329,7 @@ msgstr ""
 "canal donné, à condition qu'il n'ait pas été lu lorsque vous\n"
 "utilisez la commande."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6865,7 +6340,7 @@ msgstr ""
 "Inflige un AKILL à toutes les personnes qui sont sur le canal\n"
 "spécifié. Ceci utilise le réel identd@host de tous les pseudos. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6887,7 +6362,7 @@ msgstr ""
 "canaux \n"
 "correspondants à modèle qui ont le mode +s ou +p."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6901,70 +6376,33 @@ msgstr ""
 "Note: Cela fonctionne uniquement avec un pseudo et non pas avec un\n"
 "canal."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Syntaxe: CLEAR canal quoi\n"
-"\n"
-"Demande à %S d'enlever certains aspects d'un canal. \n"
-"quoi peut être l'une des options suivantes:\n"
+"Syntaxe: DEOWNER #canal\n"
 "\n"
-"     MODES   Réinitialise tous les modes d'un canal\n"
-"     BANS    Enlève tous les bans d'un canal.\n"
-"     EXCEPTS Enlève toutes les exceptions d'un canal.\n"
-"     INVITES Annule toutes les invitations au canal.\n"
-"     OPS     Enlève le statut d'OPérateur du canal à\n"
-"             tous les OPérateurs. Si possible, enlève aussi les\n"
-"             channel-admin (mode +a) et channel-owner (mode +q)\n"
-"     HOPS    Enlève le statut d'HalfOP (mode +h) à tous les HalfOP\n"
-"             du canal.\n"
-"     VOICES  Enlève le statut \"voice\" (mode +v) à toute\n"
-"             personne ayant ce mode.\n"
-"     USERS   Kicke tous les utilisateurs d'un canal.\n"
+"Vous supprime le statut de propriétaire du canal \n"
+"donné.\n"
 "\n"
-"Par défault, limité à ceux ayant un accès de propriétaire\n"
-"sur le canal."
+"Limité à ceux ayant un accès de propriétaire sur le canal."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Syntaxe: CLEARMODES canal [ALL]\n"
-"\n"
-"Enlève tous les modes binaires (i,k,l,m,n,p,s,t) et les bans\n"
-"d'un canal. Si ALL est donné, enlève également tous les\n"
-"OPs et Voices (modes +o et +v) du canal.\n"
-"\n"
-"Réservé aux Services operators."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6991,7 +6429,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -7002,12 +6440,14 @@ msgstr ""
 "Le système defcon utilise et applique des configurations\n"
 "pré-definies pour protéger durant une attaque sur le réseau."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -7021,7 +6461,7 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux HOPs ou à ceux ayant un \n"
 "niveau d'accès de 4 ou plus en cas de DeHalfOP sur soi-même."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -7031,11 +6471,12 @@ msgstr ""
 "Supprime le vhost pour le pseudo indiqué.\n"
 "Limité aux Services Opérateurs."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7068,10 +6509,11 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Supprime les mémos compris entre 2 et 5 et entre 7 et 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntaxe: DELALL <pseudo>.\n"
@@ -7079,12 +6521,14 @@ msgstr ""
 "groupe que le pseudo donné.\n"
 "Limité aux Services Opérateurs."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7096,30 +6540,34 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Syntaxe: DEOWNER #canal\n"
-"\n"
-"Vous supprime le statut de propriétaire du canal \n"
-"donné.\n"
+"Syntaxe: DEOP #canal [pseudo]\n"
 "\n"
-"Limité à ceux ayant un accès de propriétaire sur le canal."
+"DeOP le pseudo sélectionné sur un canal. Si pseudo n'est pas\n"
+"donné, votre propre pseudo fera l'objet de la commande.\n"
+"Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
+"d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Syntaxe: DEPROTECT #canal [pseudo]\n"
 "\n"
@@ -7130,12 +6578,14 @@ msgstr ""
 "ou à ceux ayant un niveau d'accès de 10 ou plus en cas de \n"
 "suppression de protection pour soi-même."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7149,7 +6599,7 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux VOPs ou à ceux ayant un \n"
 "niveau d'accès de 3 ou plus en cas de devoice sur soi-même."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7161,7 +6611,7 @@ msgstr ""
 "Efface le canal donné. Peut uniquement être utilisé par\n"
 "le propriétaire du canal."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7174,9 +6624,10 @@ msgstr ""
 "peuvent effacer un canal pour lequel ils n'ont\n"
 "pas été identifiés."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7184,6 +6635,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7201,7 +6656,7 @@ msgstr ""
 "identifier avec votre mot de passe (/msg %S HELP \n"
 "IDENTIFY pour plus d'informations)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7225,8 +6680,8 @@ msgstr ""
 "d'effacer n'importe quel pseudo est cependant réservée aux \n"
 "Services Operators."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7237,7 +6692,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7259,7 +6714,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7309,7 +6764,7 @@ msgstr ""
 "excessivement les jokers entrainent une dégradation des\n"
 "performances des Services."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7325,7 +6780,7 @@ msgstr ""
 "\n"
 "Une raison peut être requise sur certains réseaux."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7341,7 +6796,7 @@ msgstr ""
 "\n"
 "Sur certains réseaux, une raison est requise."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7358,7 +6813,7 @@ msgstr ""
 "\tpour quelle E-mail a été formulée la commande est ajouté\n"
 "\tdans les logs."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7368,16 +6823,15 @@ msgstr ""
 "\n"
 "Retourne la clef du canal donné."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Syntaxe: GETPASS nick\n"
 "\n"
@@ -7388,14 +6842,14 @@ msgstr ""
 "\n"
 "Cette commande est indisponible quand le cryptafe est activé."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7419,7 +6873,7 @@ msgstr ""
 "liste d'accès du pseudo, ou vous devez fournir le mot de passe\n"
 "correct pour le pseudo."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7429,7 +6883,7 @@ msgstr ""
 "\n"
 "Liste tous les pseudos dans votre groupe."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7450,7 +6904,7 @@ msgstr ""
 "Cette utilisation est limitée aux administrateurs des \n"
 "Services."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7464,7 +6918,7 @@ msgstr ""
 "les utilisateurs du réseau. Le message sera envoyé avec\n"
 "le pseudo %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7476,7 +6930,7 @@ msgstr ""
 "Permet d'enregistrer le vHost du pseudo actuellement\n"
 "utilisé pour tous les pseudos du groupe. "
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7535,16 +6989,17 @@ msgstr ""
 "\n"
 "Note: tous les pseudos du groupe ont le même mot de passe."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Syntaxe: HALFOP #canal [pseudo]\n"
 "\n"
@@ -7555,10 +7010,11 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux HOPs ou à ceux ayant un \n"
 "niveau d'accès de 4 ou plus en cas de HalfOP sur soi-même."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7633,7 +7089,7 @@ msgstr ""
 "d'accès, et /msg %S HELP SET XOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7652,9 +7108,20 @@ msgstr ""
 "mot de passe est celui que vous avez donné avec la commande \n"
 "REGISTER."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7685,7 +7152,7 @@ msgstr ""
 "\n"
 "L'ignorance ne fonctionnera pas sur les OPERateurs IRC."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7706,7 +7173,7 @@ msgstr ""
 "Par défaut, l'option ALL est limitée à ceux ayant un accès \n"
 "de propriétaire sur le canal."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7724,7 +7191,7 @@ msgstr ""
 "les informations seront affichées, qu'elles soient cachées\n"
 "ou non."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7740,7 +7207,7 @@ msgstr ""
 "recevoir au total. Avec un paramètre, affiche la même\n"
 "information pour le canal donné."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7767,7 +7234,7 @@ msgstr ""
 "pour le pseudo donné. Cette utilisation réservée aux Services\n"
 "admins."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7788,12 +7255,12 @@ msgstr ""
 "création ou le nombre de canaux auxquels il a été\n"
 "attribué."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7805,14 +7272,15 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7829,7 +7297,7 @@ msgstr ""
 "texte \"Juped by <pseudo>\", laissant apparaître le pseudo\n"
 "de la personne qui a \"jupé\" le serveur."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7844,7 +7312,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7870,7 +7338,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7891,12 +7359,14 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7935,14 +7405,14 @@ msgstr ""
 "Tapez /msg %S HELP KICK option pour plus d'informations\n"
 "sur une option en particulier."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7958,7 +7428,25 @@ msgstr ""
 "\n"
 "Réservé aux Services operators."
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7977,7 +7465,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -8007,7 +7495,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -8026,7 +7514,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -8051,7 +7539,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8067,7 +7555,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8086,7 +7574,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8105,8 +7593,8 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8116,17 +7604,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8156,7 +7644,7 @@ msgstr ""
 "Pour une liste de caractéristiques et fonctions pour lesquels\n"
 "des niveaux peuvent être définis, consultez HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8182,7 +7670,7 @@ msgstr ""
 "du nombre de résultats affichés en une fois.\n"
 "Limité aux Services opérateurs."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8197,7 +7685,7 @@ msgstr ""
 "modèle donné. (Les canaux avec l'option PRIVATE ne\n"
 "sont pas listés.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8239,7 +7727,8 @@ msgstr ""
 "        domaine bar.org.\n"
 "        "
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8267,7 +7756,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Syntaxe: LIST modèle [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8296,13 +7784,14 @@ msgstr ""
 "    LIST * NOEXPIRE\n"
 "        Liste tous les pseudos qui n'expireront pas."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8317,11 +7806,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Liste les mémos 2 à 5 et 7 à 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Syntaxe: LOGONNEWS ADD texte"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8350,11 +7839,11 @@ msgstr ""
 "\n"
 "LOGONNEWS ne peut être utilisé que pas les Opérateurs Services."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Syntaxe: LOGONNEWS DEL {num | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8370,7 +7859,7 @@ msgstr ""
 "reconnu en tant que propriétaire réel du pseudo. Notez\n"
 "cependant que l'on ne vous demandera pas de vous réidentifier."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8395,12 +7884,13 @@ msgstr ""
 "au pseudo donné de se ré-identifier. Cette utilisation est \n"
 "réservée aux Services Operators."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Syntaxe: MODE canal modes\n"
@@ -8411,7 +7901,34 @@ msgstr ""
 "\n"
 "Réservé aux Services operateurs."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8420,7 +7937,7 @@ msgstr ""
 "Syntaxe: MODINFO Fichier\n"
 "Cette commande donne des informations sur un module chargé."
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8429,7 +7946,7 @@ msgstr ""
 "Syntaxe: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Liste les modules actuellement chargés."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8440,7 +7957,7 @@ msgstr ""
 "Cette commande charge le module depuis le fichier situé dans le répertoire\n"
 "des modules."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8451,7 +7968,7 @@ msgstr ""
 "Cette commande charge le module depuis le fichier situé dans le répertoire\n"
 "des modules."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8463,10 +7980,12 @@ msgstr ""
 "répertoire\n"
 "des modules."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8491,7 +8010,7 @@ msgstr ""
 "vérifié par les Services.\n"
 "Réservé aux administrateurs des Services."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8502,7 +8021,7 @@ msgstr ""
 "Désactive le vhost que vous utilisez actuellement. L'utilisation\n"
 "de cette commande rendra visible votre IP."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8515,7 +8034,7 @@ msgstr ""
 "Permet de mettre un OperFlag à un utilisateur.\n"
 "Préfixes: \"+\" et \"-\". Pour tout supprimer, spécifiez \"-\""
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8527,12 +8046,14 @@ msgstr ""
 "Vous verrez ce vhost dans votre /whois à la place de\n"
 "votre host actuel."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8545,11 +8066,11 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau\n"
 "d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Syntaxe: OPERNEWS ADD texte"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8578,30 +8099,37 @@ msgstr ""
 "\n"
 "OPERNEWS ne peut être utilisé que pas les Opérateurs Services."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Syntaxe: OPERNEWS DEL {num | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Syntaxe: OWNER #canal\n"
+"Syntaxe: OP #canal [pseudo]\n"
 "\n"
-"Vous donne le statut de propriétaire sur le canal donné. \n"
+"OP le pseudo sélectionné sur un canal. Si pseudo n'est pas\n"
+"donné, votre propre pseudo fera l'objet de la commande.\n"
 "\n"
-"Limité à ceux ayant un accès de propriétaire sur le canal."
+"Par défaut, limité aux AOPs ou à ceux ayant un niveau\n"
+"d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8615,10 +8143,11 @@ msgstr ""
 "ou à ceux ayant un niveau d'accès de 10 ou plus en cas de \n"
 "protection de soi-même."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8691,7 +8220,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8709,11 +8238,11 @@ msgstr ""
 "bases de données ne soient soupçonnés. Pour des arrêts normaux,\n"
 "utilisez la commande SHUTDOWN."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Syntaxe: RANDOMNEWS ADD texte"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8735,18 +8264,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS ne peut être utilisé que pas les Opérateurs Services."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Syntaxe: RANDOMNEWS DEL {num | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8763,7 +8293,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Affiche les mémos 2 à 5 et 7 à 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8811,7 +8341,8 @@ msgstr ""
 "le groupe du pseudo, ou vous devez fournir le mot de passe\n"
 "correct du pseudo."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8822,7 +8353,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8853,24 +8384,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8922,15 +8454,15 @@ msgstr ""
 "canaux. Pour plus d'informations sur cette fonction, \n"
 "tapez /msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8951,7 +8483,7 @@ msgstr ""
 "le groupe du pseudo, ou vous devez fournir le mot de passe\n"
 "correct du pseudo."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8967,7 +8499,7 @@ msgstr ""
 "(comme le nom des services, l'activation de la limite\n"
 "de sessions, etc.)"
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8980,7 +8512,7 @@ msgstr ""
 "( aussi appelé passcode) à l'adresse E-mail de l'utilisateur\n"
 "qui l'exécute."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8991,7 +8523,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -9004,13 +8536,14 @@ msgstr ""
 "le redémarrage des Services (c'est à dire qu'elle stoppe\n"
 "le programme et le relance immédiatement)."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -9025,24 +8558,26 @@ msgstr ""
 "Une fois le mémo lu, un accusé de réception vous est automatiquement\n"
 "envoyé afin de vous prévenir que le mémo a été lu."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntaxe: SASET pseudo option parametres.\n"
 "\n"
 "Configure plusieurs options sur un pseudo.  option doit être l'une ci-"
 "dessous:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -9050,7 +8585,7 @@ msgstr ""
 "Positionnez sur ON pour\tpermettre à ChanServ de le faire quand\n"
 "vous il entre dans un canal."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9063,7 +8598,7 @@ msgstr ""
 "pseudo dans les Services. Le nouvel affichage DOIT être un\n"
 "pseudo de votre groupe."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9073,7 +8608,7 @@ msgstr ""
 "\n"
 "Associe l'E-mail donnée au pseudo."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9089,7 +8624,7 @@ msgstr ""
 "GREET active, à condition d'avoir un niveau d'accès\n"
 "suffisant."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9111,22 +8646,22 @@ msgstr ""
 "raison de /QUIT (QUIT). Le second paramètre indique si\n"
 "l'option doit être affichée (OFF) ou cachée (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntaxe: SASET pseudo KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9143,7 +8678,7 @@ msgstr ""
 "pour changer son pseudo, n'utilisez cette option que si nécessaire.\n"
 "Les administrateurs de votre réseau peuvent avoir désactivé cette option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9161,7 +8696,7 @@ msgstr ""
 "number doit être choisi dans la liste des langues supportées que\n"
 "vous pouvez obtenir en tapant /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9175,7 +8710,7 @@ msgstr ""
 "le pseudo donné. Si cette option est activée, ils utiliseront des\n"
 "messages, sinon ils utiliseront des notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9188,18 +8723,19 @@ msgstr ""
 "Configurez ce paramètre sur ON pour que le \n"
 "pseudo n'expire pas."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntaxe: SASET pseudo PASSWORD nouveau-mot-de-passe\n"
 "\n"
 "Change le mot de passe utilisé pour s'identifier comme propiétaire\n"
 "du pseudo."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9219,16 +8755,16 @@ msgstr ""
 "tout de même avoir des informations en utilisant\n"
 "la commande INFO)."
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9241,7 +8777,7 @@ msgstr ""
 "ou non. Cependant, si vous êtes sur la liste d'accès, %S ignorera\n"
 "la configuration de la protection offerte par SET KILL."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9251,13 +8787,14 @@ msgstr ""
 "\n"
 "Fait dire au bot le texte donné sur le canal donné."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Syntaxe: SEND {pseudo | canal} texte du memo\n"
@@ -9267,15 +8804,17 @@ msgstr ""
 "sera informé qu'il/elle a reçu un nouveau mémo. Le pseudo/canal\n"
 "destinataire doit être enregistré."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Syntaxe: SENDALL texte\n"
 "Envoie un mémo à tous les pseudos enregistrés contenant le texte."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9294,7 +8833,7 @@ msgstr ""
 "Peut être limité aux Opérateurs IRC sur certains\n"
 "réseaux."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9329,7 +8868,7 @@ msgstr ""
 "concernant la limitation et comment définir les limites de\n"
 "sessions pour certains hôtes et groupes."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9343,7 +8882,66 @@ msgstr ""
 "SET <nick> <ident>@<hostmask>\n"
 "Limité aux Services Opérateurs."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Syntaxe: %s canal SECUREOPS {ON | OFF}\n"
+"\n"
+"Active ou désactive le contrôle des OPs sur un canal.\n"
+"Lorsque le contrôle des OPs est actif, les utilisateurs \n"
+"qui ne sont pas sur la liste d'accès ne pourront être OP."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Syntaxe: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Active ou désactive les kicks signés sur un canal.\n"
+"Quand cette option est utilisée, les kicks générés\n"
+"par la commande %S KICK contiendront dans la raison\n"
+"le pseudo qui a utilisé\tla commande.\n"
+"\n"
+"Si vous sélectionnez LEVEL, ceux qui ont un niveau qui est\n"
+"supérieur ou égal au niveau SIGNKICK sur le canal ne \n"
+"génèreront pas de kicks signés. Consultez /msg %S HELP LEVELS\n"
+"pour plus d'informations."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Syntaxe: %s canal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Active ou désactive l'option de verrouillage du sujet pour\n"
+"un canal. Lorsque le verrouillage du sujet est actif,\n"
+"%S ne permettra pas le changement du sujet du canal sauf\n"
+"avec la commande TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9354,6 +8952,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9373,7 +8972,7 @@ msgstr ""
 "Tapez /msg %S HELP SET option pour plus d'infos\n"
 "sur une option spécifique."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9387,7 +8986,7 @@ msgstr ""
 "\n"
 "Réservé aux administrateurs des services."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9403,7 +9002,7 @@ msgstr ""
 "\n"
 "Options disponibles:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9418,7 +9017,7 @@ msgstr ""
 "le bot de kicker les OPs même s'ils sont en-deçà\n"
 "du niveau NOKICK."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9433,7 +9032,7 @@ msgstr ""
 "le bot de kicker les Voices même s'ils sont en-deçà\n"
 "du niveau NOKICK."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9468,7 +9067,7 @@ msgstr ""
 "doit avoir suffisamment de permissions pour le\n"
 "niveau OP/DEOP)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9484,7 +9083,22 @@ msgstr ""
 "fait afficher au bot le message d'accueil de chaque\n"
 "utilisateur qui a un accès suffisant au canal."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9500,7 +9114,7 @@ msgstr ""
 "\n"
 "Réservé aux administrateurs des services."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9512,7 +9126,7 @@ msgstr ""
 "Définit si le canal donné expirera. Mettre ceci sur ON\n"
 "empêche le canal d'expirer."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9530,25 +9144,17 @@ msgstr ""
 "par %s sur les canaux, tels que les MODEs,\n"
 "les KICKs, et même le message d'entrée."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Syntaxe: SET option paramètres\n"
-"\n"
-"Configure diverses options du pseudo. option peut être:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9566,7 +9172,17 @@ msgstr ""
 "Tapez /msg %S HELP SET option pour plus \n"
 "d'informations sur une option spécifique."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Syntaxe: SET option paramètres\n"
+"\n"
+"Configure diverses options du pseudo. option peut être:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9576,7 +9192,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Syntaxe: SET option valeur\n"
@@ -9592,7 +9207,7 @@ msgstr ""
 "    IGNORE     Active ou désactive le mode ignore\n"
 "    LIST       Liste les options"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9605,30 +9220,7 @@ msgstr ""
 "Positionnez sur ON pour\tpermettre à ChanServ de le faire quand\n"
 "vous entrez dans un canal."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Syntaxe: SET DEBUG {ON | OFF | nombre}\n"
-"\n"
-"Active ou désactive le mode debug. Dans le mode debug toutes\n"
-"les données envoyées vers et par les Services ainsi qu'un bon\n"
-"nombre d'autres messages de déboguage sont écrits dans le \n"
-"fichier de log. Si nombre est donné, le mode debug est activé,\n"
-"avec le niveau de déboguage équivalent à nombre.\n"
-"\n"
-"Cette option est équivalente à l'option de la ligne de commande\n"
-"-debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9641,7 +9233,7 @@ msgstr ""
 "pseudos dans les Services. Le nouvel affichage DOIT être un\n"
 "pseudo de votre groupe."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9655,7 +9247,7 @@ msgstr ""
 "sera affichée lorsque quelqu'un demandera des informations \n"
 "sur votre pseudo avec la commande INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9671,7 +9263,7 @@ msgstr ""
 "GREET active, à condition d'avoir un niveau d'accès\n"
 "suffisant."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9693,17 +9285,8 @@ msgstr ""
 "raison de /QUIT (QUIT). Le second paramètre indique si \n"
 "l'option doit être affichée (OFF) ou cachée (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntaxe: SET IGNORE {ON | OFF}\n"
-"Activer ou désactiver cette option pour l'utilisation de l'ignore."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9717,7 +9300,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntaxe: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9735,7 +9318,7 @@ msgstr ""
 "pour changer son pseudo, n'utilisez cette option que si nécessaire.\n"
 "Les administrateurs de votre réseau peuvent avoir désactivé cette option."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9752,7 +9335,7 @@ msgstr ""
 "commande que vous avez envoyé). nombre doit être choisi\n"
 "dans la liste suivante des langues supportées:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9769,7 +9352,7 @@ msgstr ""
 "personne ne pourra vous envoyer de mémo. Cependant, vous\n"
 "ne pouvez pas définir la limite à plus de %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9811,7 +9394,7 @@ msgstr ""
 "ont les privilèges requis, ne peuvent supprimer %d limite, et\n"
 "ne peuvent définir de limite stricte."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9820,7 +9403,7 @@ msgstr ""
 "Syntaxe: SET LIST\n"
 "Afficher diverses options à propos de %S"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9834,10 +9417,11 @@ msgstr ""
 "avec vous. Si cette option est activée, ils utiliseront des\n"
 "messages, sinon ils utiliseront des notices."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9852,7 +9436,7 @@ msgstr ""
 "Cette option est équivalente à l'option de la ligne de commande\n"
 "-noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9891,7 +9475,7 @@ msgstr ""
 "\n"
 "ON est la combinaison de LOGON et NEW."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9903,7 +9487,7 @@ msgstr ""
 "Change le mot de passe utilisé pour vous identifier en tant\n"
 "que propriétaire du pseudo."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9923,7 +9507,7 @@ msgstr ""
 "tout de même avoir des informations en utilisant\n"
 "la commande INFO)."
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9955,16 +9539,16 @@ msgstr ""
 "Cette option est équivalente à l'option de la ligne de commande\n"
 "-readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9977,7 +9561,7 @@ msgstr ""
 "ou non. Cependant, si vous êtes sur la liste d'accès, %S ignorera\n"
 "la configuration de la protection offerte par SET KILL."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9990,14 +9574,15 @@ msgstr ""
 "\"founder\" de tous les canaux...\n"
 "Utilisation temporaire."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Syntaxe: SETALL <pseudo> <hostmask>.\n"
@@ -10006,7 +9591,7 @@ msgstr ""
 "SET <pseudo> <ident>@<hostmask>\n"
 "Limité aux Services Opérateurs."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -10017,10 +9602,11 @@ msgstr ""
 "Provoque la sauvegarde de toutes les bases de données puis\n"
 "l'arrêt des Services."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10056,7 +9642,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10110,10 +9696,11 @@ msgstr ""
 "\n"
 "Réservé aux OPérateurs des Services."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10192,7 +9779,8 @@ msgstr ""
 "d'accès, et /msg %S HELP SET AOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10208,31 +9796,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10287,21 +9875,7 @@ msgstr ""
 "\n"
 "Réservé aux OPérateurs des services."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10311,16 +9885,18 @@ msgstr ""
 "Affiche tous les pseudos du staff des services avec leur\n"
 "niveau d'accès et leur statut (online/offline)."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Syntaxe: STAFF texte\n"
 "Envoie un mémo à tout le staff des services contenant le\n"
 "texte."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10371,7 +9947,7 @@ msgstr ""
 "L'option UPLINK affiche les informations sur le serveur qui est\n"
 "utilisé pour linker Anope au réseau."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10395,12 +9971,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR error-message"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10440,7 +10017,7 @@ msgstr ""
 "le reste sera ignoré. Si aucun pseudo n'est donné, votre propre\n"
 "statut sera retourné."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10458,7 +10035,7 @@ msgstr ""
 "\n"
 "Une raison peut être demandée sur certain réseaux."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10468,7 +10045,8 @@ msgstr ""
 "\n"
 "Force le changement de pseudo d'un utilisateur."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10481,31 +10059,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10558,7 +10136,7 @@ msgstr ""
 "\n"
 "Réservé aux OPérateurs des Services."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10582,7 +10160,7 @@ msgstr ""
 "Par défault, limité à ceux ayant un statut de propriétaire\n"
 "du canal."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10594,7 +10172,7 @@ msgstr ""
 "\n"
 "Permet aux Services Operators de changer un mode d'un utilisateur."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10612,7 +10190,7 @@ msgstr ""
 "de réattribuer un bot plus tard sans avoir à le reconfigurer\n"
 "entièrement."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10631,7 +10209,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10648,7 +10226,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10661,7 +10239,7 @@ msgstr ""
 "et configurations seront restaurées tel qu'elles étaient\n"
 "avant la suspension."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10673,7 +10251,7 @@ msgstr ""
 "Provoque la mise à jour de toutes les bases de données dès\n"
 "que vous le demandez."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10695,12 +10273,14 @@ msgstr ""
 "utilisateurs du canal seront listés. +i INVISIBLE est spécifié,\n"
 "seuls les utilisateurs avec le mode +i seront listés."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10715,10 +10295,11 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux VOPs ou à ceux ayant un \n"
 "niveau d'accès de 3 ou plus en cas de voice sur soi-même."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10794,7 +10375,7 @@ msgstr ""
 "d'accès, et /msg %S HELP SET AOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10810,7 +10391,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10818,7 +10399,7 @@ msgstr ""
 "Syntaxe: SUSPEND pseudo raison / UNSUSPEND pseudo\n"
 "Suspend / libère le pseudo spécifié."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10826,7 +10407,7 @@ msgstr ""
 "Syntaxe: UNSUSPEND pseudo\n"
 "Libère un pseudo suspendu."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10839,91 +10420,92 @@ msgstr ""
 "(ModeonID), met\tà jour votre vhost et vos flags\n"
 "(dernière fois vu, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [topic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "L'option IMMED n'est pas disponible sur ce réseau."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "La liste d'AKILL a été vidée."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Le niveau de DEFCON est maintenant: %d."
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "L'adresse E-mail de %s sera cachée dans la commande INFO de %s."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr ""
 "L'adresse email de %s sera maintenant affichée dans la commande INFO de %s."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "La liste de SNLINEs a été vidée."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "La liste de SQLINEs a été vidée."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "La liste de SZLINEs a été vidée."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Le canal %s n'a pas de clé."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Les noms de caractéristiques/fonctions suivants sont utilisés.\n"
 "Notez que les niveaux pour AUTODEOP et NOJOIN sont des niveaux\n"
 "maximum, alors que tous les autres sont des niveaux minimum."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "L'hôte %s a actuellement %d sessions avec une limite de %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "Le dernier mémo que vous avez envoyé à %s (le %s) a été lu."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Le dernier mémo que vous avez envoyé à %s (le %s) n'a pas encore été lu."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Le dernier message de quit de %s ne sera plus affiché dans la commande INFO "
 "de %s."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 "Le dernier message de quit de %s sera affiché dans la commande INFO de %s."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
@@ -10932,7 +10514,7 @@ msgstr ""
 "INFO\n"
 "de %s."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
@@ -10941,32 +10523,32 @@ msgstr ""
 "INFO\n"
 "de %s."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "La limite de mémos pour %s ne peut être changée."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "Le nouvel affichage pour %s DOIT être un pseudo de son groupe!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Le nouvel affichage est maintenant %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Le pseudo de %s a été changé en %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
@@ -10974,19 +10556,19 @@ msgstr ""
 "Le statut sur les services de %s sera maintenant caché dans la commande INFO "
 "de %s."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Le statut sur les services de %s sera maintenant affiché dans la commande "
 "INFO de %s."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Il y a %d mémos sur le canal %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10994,7 +10576,7 @@ msgstr ""
 "Il n'y a aucun bot disponible actuellement.\n"
 "Demandez à un administrateur des services d'en créer un!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -11005,12 +10587,12 @@ msgstr ""
 "Tapez /msg %s HELP GLIST et /msg %s HELP DROP pour\n"
 "plus d'informations."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Il y a %d mémo sur le canal %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -11018,28 +10600,28 @@ msgstr ""
 "Il y a un nouveau mémo dans le canal %s.\n"
 "Tapez /msg %s READ %s %d pour le lire."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Il n'y a plus de bot attribué à %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Il n'y a pas de logon news."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Il n'y a pas d'OPER news."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Il n'y a pas de nouvelles aléatoires."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Vous n'avez configuré aucune adresse email pour votre pseudo."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -11055,32 +10637,28 @@ msgstr ""
 "    PRIVATE          Empêche un bot d'être attribué par\n"
 "                         des non-opérateurs IRC"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Ce canal a été interdit."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ce canal a été enregistré avec %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Ce canal est suspendu."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Ce canal ne peut être utilisé."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Ce canal n'expirera pas."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "Ce module ne peut pas être déchargé."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -11088,7 +10666,7 @@ msgstr ""
 "Une demande d'enregistrement pour ce pseudo est en cours. Merci de patienter "
 "24 heures."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -11096,7 +10674,7 @@ msgstr ""
 "Une demande d'enregistrement pour ce pseudo est en cours. La confirmation "
 "n'a pas été effectuée."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11104,20 +10682,20 @@ msgstr ""
 "Ce pseudo appartient à quelqu'un d'autre. Veuillez en changer.\n"
 "(Si c'est votre pseudo, tapez /msg %s IDENTIFY motdepasse.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Ce pseudo a été enregistré, vous ne pouvez pas l'utiliser."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Ce pseudo est actuellement suspendu."
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Ce pseudo est actuellement suspendu, raison: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11127,15 +10705,15 @@ msgstr ""
 "tapez /msg %s IDENTIFY motdepasse. \n"
 "Sinon veuillez choisir un pseudo différent."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Ce pseudo ne peut être utilisé.  Veuillez en choisir un autre."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Ce pseudo n'expirera pas."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11143,44 +10721,35 @@ msgstr ""
 "Pour rechercher des canaux commençant par #, cherchez des des\n"
 "noms de canaux sans le signe # (anope au lieu de #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Verrouillage du topic"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Maintien du topic"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Le verrouillage du sujet pour %s est maintenant INACTIF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Le verrouillage du sujet pour %s est maintenant ACTIF."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Le maintient du topic est maintenant INACTIF sur %s."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Le maintient du topic est maintenant ACTIF sur %s."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Cessez d'utiliser tant de majuscules!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Tapez /msg %S HELP commande pour de l'aide sur\n"
@@ -11189,7 +10758,7 @@ msgstr ""
 "    de 10 sur un canal peut lire ces mémos du canal. Ceci\n"
 "    peut être changé avec la commande LEVELS de %s."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11199,7 +10768,7 @@ msgstr ""
 "sur une option spécifique. L'option devra être mise avec le pseudo\n"
 "en préfixe."
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11207,7 +10776,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11215,7 +10784,7 @@ msgstr ""
 "Tapez /msg %S HELP SET option pour plus d'informations sur\n"
 "une option particulière."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11225,128 +10794,108 @@ msgstr ""
 "Votre vie privée est respectée, cet e-mail ne sera pas \n"
 "divulgué à des tierces personnes."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Tapez /msg %s LIST NEW pour les lister."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Tapez /msg %s READ %d pour le lire."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Tapez /msg %s READ LAST pour le lire."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE pseudo modes"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canal"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND pseudo"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Impossible de charger le module %s."
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Impossible de décharger le module %s."
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Option SASET %s inconnue."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "L'option SET %s est inconnue."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Option STATS inconnue %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Commande %s inconnue."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Commande %s inconnue. Tapez \"/msg %s HELP\" pour obtenir de l'aide."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Mode %c ignoré car inconnu."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Option inconnue %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Option %s inconnue.\n"
-"Tapez /msg %S HELP KICK pour plus d'informations."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Option %s inconnue.\n"
 "Tapez /msg %S HELP SET pour plus d'informations."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Mise à jour des bases de données."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Caractéristiques du lien: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Connecté à: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr ""
-"L'utilisateur %s n'a pas été trouvé dans la base de données de NickServ."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Utilisateur   : %6d enregistrements, %5d ko"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11354,11 +10903,11 @@ msgstr ""
 "L'utilisateur se servant de votre pseudo a été déconnecté.\n"
 "/msg %s RELEASE %s pour le récupérer avant que la %s ne s'écoule."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "Utilisateur trouvé dans les exceptions."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11366,66 +10915,78 @@ msgstr ""
 "Liste des utilisateurs:\n"
 "Nick                 Masque"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Protection des voices"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Liste des VOPs de %s:\n"
-"  Num  Pseudo"
+"Attention: Vous avez dépassé votre nombre maximum de mémos (%d).  Vous ne "
+"pourrez plus recevoir de nouveaux mémos sauf si vous supprimez quelques-uns "
+"de vos mémos actuels. "
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Protection des voices"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Attention: Vous avez atteint votre nombre maximum de mémos (%d).  Vous ne "
+"pourrez plus recevoir de nouveaux mémos sauf si vous supprimez quelques-uns "
+"de vos mémos actuels. "
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Surveillez votre langage !"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Vous êtes déjà membre du groupe de %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Vous êtes déjà identifié."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "Vous êtes déjà dans %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Vous n'êtes plus SuperAdmin"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Vous n'êtes pas autorisé à être sur ce canal."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Vous n'êtes pas autorisé à changer votre limite de mémos."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Vous êtes maintenant SuperAdmin."
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Vous êtes maintenant IRCOp."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11433,38 +10994,45 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Vous êtes maintenant dans le groupe de %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Vous ne pouvez pas recevoir d'accusé de réception quand vous vous\n"
 "ètes envoyé un message à vous-meme."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "Vous pouvez utiliser cette commande."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Vous ne pouvez pas utiliser GHOST sur vous-même!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr ""
+"Vous ne pouvez pas déconnecter %s parce que c'est un administrateur\n"
+"des services."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Vous ne pouvez pas utiliser RECOVER sur vous-même!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11474,7 +11042,7 @@ msgstr ""
 "Utilisez les commandes AOP, SOP et VOP à la place.\n"
 "Tapez /msg %s HELP commande pour plus d'informations."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11484,7 +11052,7 @@ msgstr ""
 "Utilisez les commandes AOP, SOP, HOP and VOP à la place.\n"
 "Tapez /msg %s HELP command pour plus d'informations."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11493,66 +11061,66 @@ msgstr ""
 "Utilisez la commandes ACCESS à la place.\n"
 "Tapez /msg %s HELP ACCESS pour plus d'informations."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Vous ne pouvez mettre la limite de mémos de %s à plus de %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Vous ne pouvez mettre votre limite de mémos à plus de %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Vous ne pouvez pas effacer votre e-mail sur ce réseau."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "Vous ne pouvez pas utiliser cette commande."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Vous avez actuellement %d mémos, desquels %d n'ont pas été lus."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Vous avez actuellement %d mémos, desquels 1 n'a pas été lu."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Vous avez actuellement %d mémos."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Vous avez actuellement %d mémos, aucun d'entre-eux n'a été lu."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Vous avez actuellement 1 mémo, qui n'a pas encore été lu."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Vous avez actuellement 1 mémo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Vous n'avez aucun mémo actuellement."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Vous avez %d nouveaux mémos."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Vous avez 1 nouveau mémo."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11560,34 +11128,38 @@ msgstr ""
 "Vous avez un nouveau mémo de %s.\n"
 "Tapez /msg %s READ %d pour le lire."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Vous avez été invité à rejoindre %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Vous avez été débanni de %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr ""
 "Vous n'avez aucune limite sur le nombre de mémos que vous pouvez garder."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Vous n'avez pas de mémos."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Vous n'avez pas de nouveaux mémos."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Vous devez entrer une durée valide"
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11596,27 +11168,17 @@ msgstr ""
 "cette commande.\n"
 "Tapez /msg %S HELP ASSIGN pour plus d'informations."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Vous devez être un opérateur du canal pour l'enregistrer."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Vous devez rester connecté plus de %d secondes pour enregistrer votre pseudo."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr ""
-"Vous devez faire garder le mode +i pour en faire autant avec le mode +K."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr ""
-"Vous devez faire garder le mode +l pour en faire autant avec le mode +L."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11626,75 +11188,95 @@ msgstr ""
 "Cet e-mail vous permettra de retrouver votre mot de passe\n"
 "au cas où vous le perdriez."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "Vous devez être identifié pour utiliser cette commande."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Vous serez notifié pour les nouveaux mémos à la connexion et quand ils "
 "arrivent."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Vous serez notifié pour les nouveaux mémos à la connexion."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Vous serez notifié quand de nouveaux mémos arrivent."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Vous ne pourrez désormais plus recevoir de mémos."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "Vous ne serez plus averti par mail de l'arrivée de nouveau(x) mémo(s)."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Vous ne serez pas notifié pour les nouveaux mémos."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr ""
 "Vous serez maintenant averti par mail de l'arrivée de nouveau(x) mémo(s)."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
 msgstr "L'IRCD utilisé ne supporte par la modification de l'ident."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Votre liste d'accès est vide."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "la liste de kicks automatiques de %s est vide."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "La liste des ignorés est vide."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Votre limite de mémos a été désactivée."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Votre limite de mémos a été fixée à %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Votre limite de mémos est de %d, et ne peut être changée."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Votre limite de mémos est de %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Votre limite de mémos est de 0, vous ne recevrez aucun nouveau mémo."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11702,180 +11284,744 @@ msgstr ""
 "Votre limite de mémos est de 0, vous ne recevrez aucun nouveau mémo.  Vous "
 "ne pouvez pas changer cette limite."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Votre pseudo n'est plus identifié."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Votre pseudo est déjà enregistré, tapez /msg %s DROP d'abord."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Votre pseudo n'est pas enregistré."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Votre pseudo a été effacé."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Votre pseudo est maintenant changé en %s."
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Votre mot de passe a été renvoyé à %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Votre mot de passe est %s - notez-le pour une utilisation ultérieure."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 "Votre mot de passe est trop long. Veuillez réessayer avec un mot de passe "
 "plus court."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Votre vhost %s est activé."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Votre vhost %s@%s est activé."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Logon News - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Oper News - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[News Aléatoire - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "inactif"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "n'expire pas"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "actif"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "expire à la prochaine mise à jour de la base de données"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "expire dans %d jour"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "expire dans %d jours"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expire dans %d heure, %d minute"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expire dans %d heure, %d minutes"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expire dans %d heures, %d minute"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expire dans %d heures, %d minutes"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "expire dans %d minute"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expire dans %d minutes"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Le vhost pour %s a été supprimé."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Le vhost pour %s enregistrée en %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Le vhost pour %s enregistrée en %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Le vhost pour le groupe %s enregistrée en %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Le vhost pour le groupe %s enregistrée en %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "Le vhost pour le groupe %s a été supprimé."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "Système de listes de xOPs"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "Le système de xOP est maintenant INACTIF sur %s."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "Le système de xOP est maintenant ACTIF sur %s."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "Le système xOP n'est pas disponible."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {pseudo | canal} texte-du-memo"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s ajouté à la liste des AOPs de %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s ajouté à la liste des HOPs de %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s ajouté à la liste des SOPs de %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s ajouté à la liste des VOPs de %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s supprimé de la liste des HOPs de %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s supprimé de la liste des SOPs de %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s supprimé de la liste des VOPs de %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s a été déplacé dans la liste des HOPs de %s."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s a été déplacé dans la liste des SOPs de %s."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s a été déplacé dans la liste des VOPs de %s."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s introuvable sur la liste des HOPs de %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s introuvable sur la liste des SOPs de %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s introuvable sur la liste des VOPs de %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Défini la langue que Services utilisera dans les messages\n"
+#~ "               qu'il vous envoie."
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Empêche votre pseudo d'être affiché par\n"
+#~ "                   /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d jours"
+
+#~ msgid "%d hours"
+#~ msgstr "%d heures"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minutes"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d secondes"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "La liste des HOPs de %s est vide."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "La liste des SOPs de %s est vide."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "La liste des VOPs de %s est vide."
+
+#~ msgid "1 day"
+#~ msgstr "1 jour"
+
+#~ msgid "1 hour"
+#~ msgstr "1 heure"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minute"
+
+#~ msgid "1 second"
+#~ msgstr "1 seconde"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Autorisé à utiliser la commande CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Autorisé à utiliser les commandes HALFOP/DEHALFOP"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "La liste des HOPs de %s est maintenant vide."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "La liste des SOPs de %s est maintenant vide."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "La liste des VOPs de %s est maintenant vide."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "%d entrées supprimées de la liste des HOPs de %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "%d entrées supprimées de la liste des SOPs de %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "%d entrées supprimées de la liste des VOPs de %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "1 entrée supprimée de la liste des HOPs de %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "1 entrée supprimée de la liste des SOPs de %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "1 entrée supprimée de la liste des VOPs de %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Votre adresse e-mail a été effacée."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Fin de la liste des utilisateurs."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Le message d'entrée de %s a été effacé."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Le bot n'est pas sur le canal %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "    Message d'entrée: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "La liste d'accès de %s est vide."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Liste d'accès de %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Le message d'entrée de %s a été changé."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "La fantaisie est maintenant désactivée sur le canal %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Le message d'accueil est maintenant désactivé sur le canal %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Liste des HOPs de %s:\n"
+#~ "  Num  Pseudo"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Erreur interne - impossible d'effectuer la commande."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Article de logon news #%d supprimé."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Le pseudo %s n'est pas enregistré."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Enregistrement d'un pseudo (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Mot de passe du pseudo %s"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Aucun # trouvé devant le nom du canal."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Le mode sans bot est maintenant désactivé sur le canal %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Aucune entrée correspondante sur la liste des HOPs de %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Aucune entrée correspondante sur la liste des SOPs de %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Aucune entrée correspondante sur la liste des VOPs de %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Entrée inexistante (#%d) sur la liste des AOPs de %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Entrée inexistante (#%d) sur la liste des HOPs de %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Entrée inexistante (#%d) sur la liste des SOPs de %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Entrée inexistante (#%d) sur la liste des VOPs de %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr ""
+#~ "L'option 'op-notice' est maintenant INACTIVE sur\n"
+#~ "%s."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Le mode 'paix' est INACTIF pour %s."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Veuillez patienter %d secondes avant d'utiliser la commande SEND à "
+#~ "nouveau."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Le mode privé du bot %s est maintenant désactivé."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "L'option 'privé' pour %s est maintenant INACTIVE."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "L'option 'privé' est maintenant INACTIVE pour %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "La protection est maintenant INACTIVE pour %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "La protection est maintenant activée, sans délai."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER motdepasse [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Les restrictions d'accès pour %s sont maintenant INACTIVES."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Liste des SOPs de %s:\n"
+#~ "  Num  Pseudo"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "ERREUR : Le canal %s n'est pas enregistré."
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND canal [raison]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "L'option de sécurité du propriétaire pour %s est INACTIVE."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "La sécurité des OPs sur %s est maintenant INACTIVE."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "L'option de sécurité pour %s est INACTIVE."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "L'option de sécurité est maintenant INACTIVE pour %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Les Services ne peuvent changer les modes. Vos serveurs sont-ils "
+#~ "configurés correctement?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Les services tournent depuis %d jour, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Les services tournent depuis %d heure, %d minute"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Les services tournent depuis %d heure, %d minutes"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Les services tournent depuis %d heures, %d minute"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Les services tournent depuis %d minute, %d seconde"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Les services tournent depuis %d minute, %d secondes"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Les services tournent depuis %d minutes, %d seconde"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Les kicks ne seront plus signés sur %s."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Désolé, la modification des listes des HOPs des canaux est temporairement "
+#~ "désactivée."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Désolé, la modification des listes des SOPs des canaux est temporairement "
+#~ "désactivée."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Désolé, la modification des listes des VOPs des canaux est temporairement "
+#~ "désactivée."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr ""
+#~ "Désolé, vous ne pouvez avoir que %d entrées sur les listes des AOPs/SOPs/"
+#~ "VOPs d'un canal."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "La symbiose est maintenant désactivée sur le canal %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Syntaxe: RANDOMNEWS ADD texte"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR canal raison"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Syntaxe: OPERNEWS ADD texte"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Syntaxe: SET DEBUG {ON | OFF | nombre}\n"
+#~ "\n"
+#~ "Active ou désactive le mode debug. Dans le mode debug toutes\n"
+#~ "les données envoyées vers et par les Services ainsi qu'un bon\n"
+#~ "nombre d'autres messages de déboguage sont écrits dans le \n"
+#~ "fichier de log. Si nombre est donné, le mode debug est activé,\n"
+#~ "avec le niveau de déboguage équivalent à nombre.\n"
+#~ "\n"
+#~ "Cette option est équivalente à l'option de la ligne de commande\n"
+#~ "-debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Syntaxe: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Le message d'accueil de %s a été effacé."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "Ce module ne peut pas être déchargé."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Le verrouillage du sujet pour %s est maintenant INACTIF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Le maintient du topic est maintenant INACTIF sur %s."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Commande %s inconnue."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Option %s inconnue.\n"
+#~ "Tapez /msg %S HELP KICK pour plus d'informations."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr ""
+#~ "L'utilisateur %s n'a pas été trouvé dans la base de données de NickServ."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Liste des VOPs de %s:\n"
+#~ "  Num  Pseudo"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Le bot %s a été supprimé."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] Le mémo que vous avez envoyé a %s a été vu."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] Le mémo que vous avez envoyé a %s a été vu."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Le dernier mémo envoyé à %s a été supprimé."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Votre vhost %s est activé."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Le bot %s a été supprimé."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "Le système de xOP est maintenant INACTIF sur %s."
diff --git a/lang/anope.hu_HU.po b/language/anope.hu_HU.po
index ad4aa1d9e..0ee5a1a68 100644
--- a/lang/anope.hu_HU.po
+++ b/language/anope.hu_HU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:37-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Hungarian\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s bõvebb információért."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "beírod, hogy: /msg %S parancs, lásd még a\n"
 "/msg %S HELP parancs."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -54,14 +54,15 @@ msgstr ""
 "Bõvebb információt így kaphatsz az adott parancsról:\n"
 "/msg %S HELP parancs."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S lehetõséget ad arra, hogy regisztráld a csatornádat.\n"
@@ -73,12 +74,12 @@ msgstr ""
 "kapcsolatban, akkor írd be: /msg %S HELP parancs.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -91,124 +92,108 @@ msgstr ""
 "\t\n"
 "%S parancsok a következõket tartalmazzák:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s módosította DEFCON a szintet erre: %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s hozzáadva %s AOP listához."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s hozzáadva %s HOP listához."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s hozzáadva %s SOP listához."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s hozzáadva %s VOP listához."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr ""
 "%s hozzáadva a %s hozzáférési listájához.\n"
 "A hozzáférési szintje a ChanServ parancsokhoz:  %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s hozzáadva a (%s) csatorna autokick listájához"
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "A %s szó hozzáadva a %s tiltott szavak listájához."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s hozzáadva az AKILL listához."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s hozzáadva a SNLINE listához."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s hozzáadva az SQLINE listához."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s hozzáadva az SZLINE listához."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s hozzáadva a hozzáférési listádhoz."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s hozzáadva a hozzáférési listádhoz."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "A %s szót már tartalmazza a %s tiltott szavak listája"
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s már szerepel a (%s) csatorna autokick listáján."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s már bekapcsolva az AKILL lista."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s már szerepel az SNLINE listán."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s már szerpel az SQLINE listán."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s már szerepel az SZLINE listán."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s nem fogadható el banolási idõnek."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s váltóztatott a módodon."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -217,239 +202,185 @@ msgstr ""
 "%s szoba listája:\n"
 "Név \t\t\tUser Mód   Topic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s törölve lett a %s AOP listáról."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s törölve lett a %s HOP listáról."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s törölve lett a %s SOP listáról."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s törölve lett a %s VOP listáról."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s törölve lett a (%s) csatorna hozzáférési listájáról."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s törölve a (%s) csatorna autokick listájáról."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "A %s szó törölve %s tiltott szavak listájából."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s törölve a session-korlát kivétel listáról."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s törölve az AKILL listáról."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s törölve az SNLINE listáról."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s törölve az SQLINE listáról."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s törölve az SZLINE listáról."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s törölve a hozzáférési listádról."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s letiltva a (%s) csatornán."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s részére túl sok csatorna van regisztrálva."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s van már %s ilyen bejegyzés."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s hozzáadva a hozzáférési listádhoz."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s nem érvényes ban típus."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s nem érvényes bot vagy regisztrált szoba."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s nem érvényes e-mail cím."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s többé már nem aktív a (%s) csatornán."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s jelenleg nincs a %s szobában ."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s most már mindig aktív a (%s) csatornán."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s nick nem található a mellõzöttek listáján."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
 "removed."
 msgstr "%s megegyezik egy kivétellel (%s) nem tiltható, amíg a kivétel él."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s  áthelyezve a %s AOP listára."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s  áthelyezve a %s HOP listára."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s  áthelyezve a %s SOP listára."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s  áthelyezve a %s VOP listára."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s nem találatható a %s AOP listán."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s nem találatható a %s HOP listán."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s nem találatható a %s SOP listán."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s nem találatható a %s VOP listán."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s nem található a (%s) csatorna hozzáférési listáján."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s nem szerepel a (%s) csatorna autokick listáján."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "A %s szó nem található a %s tiltott szavak listáján."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s nincs a session listán."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s nem található a session-korlát kivétel listán."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s nem található az AKILL listán."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s nincs a SNLINE listán."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s nnem található az SQLINE listán."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s nem található az SZLINE listán."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s nem található a hozzáférési listádon."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s törölve a hozzáférési listádról."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -458,31 +389,31 @@ msgstr ""
 "%s felhasználó lista:\n"
 "Nick                 Maszk"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s nick most már nics mellõzve."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s nick most mellõzte %s nicket."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s nick most véglegesen mellõzve van."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Üzenet:Minden %S-nek küldött parancs naplózva van."
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr "Megjegyzés: A Szervíz csak olvasás módban fut!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -490,11 +421,11 @@ msgstr ""
 "Emlékeztetõ: AKILL maszk nem tartalmazhat nicknevet;\n"
 "ellenõrizd, hogy nem tartalmazhat nick részt a maszk."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Emlékeztetõ:Te hozzáadhatsz IP maszkot SZLINE listához."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -535,41 +466,38 @@ msgstr ""
 "LEVELS paranccsal; írd be: /msg %S HELP LEVELS bõvebb\n"
 "információért."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Figyelem: Fogadható üzenetek maximális számát (%d).\n"
-"Nem fogadhatsz több üzenetet, amíg törölsz néhányat."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Figyelem: Fogadható üzenetek maximális száma (%d).\n"
-"Nem fogadhatsz több üzenetet, amíg nem törölsz néhányat."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] A memo, amit küldtél meg lett tekintve."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] A memo, amit %s számára küldtél meg lett tekintve."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER jelszó email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER jelszó email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP célnick jelszó"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -581,7 +509,7 @@ msgstr ""
 "visszaélés jutalma minimum az visszaélõ nickjének\n"
 "elvesztése."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -593,7 +521,7 @@ msgstr ""
 "hogy a szoba jelszót használnának, és megnézhetika az\n"
 "access, AKICK, és beállitási szint listát a csatornán."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -604,368 +532,384 @@ msgstr ""
 "beazonosíttotak a nicknevükre, és megnézhetik a nickek\n"
 "hozzáférési listáját. (/msg %S ACCESS LIST nick)"
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "\tBeállítások: %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "vhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "Bot név: %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "Bot név: nincs társítva még."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "Opciók: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "\tCaps Lockért kirúgás : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "\tCaps Lockért kirúgás: %s (%d kirúgás után kitiltás; min. %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "\tCaps Lockért kirúgás: %s (minimum %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "    Tulajdonos: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "    Ban típus: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "\tFélkövér betûkért kirúgás: %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "\tFélkövér betûkért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "\tFloodért kirúgás: %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "\tFloodért kirúgás: %s (%d kirúgás után kitiltás; %d sor %ds mp alatt)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "\tFloodért kirúgás: %s (%d sor %ds mp alatt)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "Maszk : %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "\tSzinezésért kirúgás: %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "\tSzinezésért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "    Ban típus: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "    Utoljára használva: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "\tRögzített módok: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "\tIsmétlésért kirúgás: %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "\tIsmétlésért kirúgás: %s (%d kirúgás után kitiltás; %d idõre)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "\tIsmétlésért kirúgás : %s (%d alkalommal)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "    Jogutód: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr " Felfüggesztve: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "\tCaps Lockért kirúgás : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "\tFélkövér betûkért kirúgás: %s (%d kirúgás után kitiltás)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "\tItalics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "\tItalics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "    Utolsó topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "    Regisztrálás ideje: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (letiltva)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (csak foundernek)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     A hozzáférési lista módosítása"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     A szoba hozzáférési listájának beállítása"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "ACT                Makes the bot do the equivalent of a \"/me\" command"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Szerkeszti az AKILL listát"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      List channels you have access on"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        AutoOperátor lista beállítása"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Társít egy botot a csatornához"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Szerkeszti a tiltott szavak listáját"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bans a selected nick on a channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       A banolás tipusának beállítása"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Karbantartja a hálózat botjainak listáját"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Listázza az elérhetõ botokat"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Visszavonja az utoljára küldött memot"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL az összes usert a csatornáról"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Listázza az összes csatornát "
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Ellenõrzi, hogy a címzett elolvasta-e már az üzit"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Törli a szoba módot"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirm a nickserv auth code"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "Született: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipulálja a DefCon rendszert"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Törli egy felhasználónak a vhostját"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Törli a megadott üzenete(ke)t"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Törli a vhosztot a nickekröl a csoportban"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deops a selected nick on a channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          A szobameghatározás állítás"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoices a selected nick on a channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Set the display of your group in Services"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Törölheted a csatornád regisztrációját"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Nicknév regisztrációjának törlése"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "    Leírás: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Egy E-mail cím társítása a nicknevedhez"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      A szoba belépo üzenetének \n"
-"                  állítása"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Módosítja a session-korlát/kivétel listát"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Megakadályozza a szoba használatát"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Megelõzi, hogy a nicknév regisztrált legyen"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       A founder megváltoztatása"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -973,70 +917,75 @@ msgstr ""
 "    GETEMAIL   Kiírja az ilyen e-mail címmel regisztrált\n"
 "               felhasználókat"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Returns the key of the given channel"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Kiirja a jeszavát a nicknévnek\n"
 "               (encryption esetén nem használható)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lists all nicknames in your group"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Üzenetet küld összes felhasználónak"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Köszöntõ üzenet társítása a nicknevedhez"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       A vhostot a csoport minden tagjára állítja"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Csatlakozás egy csoporthoz"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "Köszöntõ üzenet: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Halfops a selected nick on a channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       A nicknévhez tartozó információk elrejtése"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Jelszavas azonosítás"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Módosítja a Szervíz mellõzési listáját"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Módosítja a Szervíz mellõzési listáját"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1044,137 +993,130 @@ msgstr ""
 "INFO               Allows you to see BotServ information about a channel or "
 "a bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Displays information about a given nickname"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Lists information about the named registered channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Kiírja az üzenetekkel kapcsolatos információkat"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        Létrehoz egy \"Jupiter\" álszervert."
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr "    KEEPTOPIC     Topic megtartása ha a szoba nincs használatban"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Konfigurálja a kirúgásokat"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Kirúgja a felhasználót csatornáról"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicks a selected nick from a channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       A kill védelem be-,kikapcsolása"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
 msgstr "    LANGUAGE   A szervíz nyelvezetének megválasztása"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Átállíthatod a szoba hozzáférési szintjeit"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Kiír egy vagy több vhost bejegyzést"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       List all registered nicknames that match a given pattern"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lists all registered channels matching the given pattern"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Megjeleníti az üzenetek listáját"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr "    LOGONNEWS   Fellépõ üzenetek beállítása"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Szoba módok lezárása (+flag -flag)"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Váltóztatja a szoba módot"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Törli a szoba módot"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Információ a betöltött modulokról"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Listázza a betöltött modulokat"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Betölti a modult"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Betölti a modult"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Kitölti a modult"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Megváltoztatja a szervízzel való kommunikációt"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1182,86 +1124,79 @@ msgstr ""
 "    NOOP        Ideiglenesen törli az összes O:line-t a szerver\n"
 "                távollétében"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Kikapcsolja a társított vhostot"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Operflaget ad a biztos felhasználónak"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Aktiválja a társított vhostot"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Gives Op status to a selected nick on a channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr "    OPERNEWS    Operek részére megjelenõ üzenetet állít be"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr "    OPNOTICE      Üzenetet küld az OP/VOICE parancsok használtáról"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gives you owner status on channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "Beállításai: %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Set your nickname password"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Szabályozza a kritikus parancsok használatát"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       A szoba elrejtése a listából"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr "    PRIVATE    A nickneved /msg %S LIST -ból való elrejtése"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protects a selected nick on a channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Leállítja a szervíz programot mentés nélkül"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1269,238 +1204,241 @@ msgstr ""
 "    RANDOMNEWS  Véletlenszerûen megjelenõ üzenetet állít be \n"
 "                a felhasználók részére"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Elolvassa a megadott üzenete(ke)t"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER    Killeli a nickedet használó usert"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Nicknév regisztráció"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Nicknév regisztráció"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr "    RELEASE    Visszaadja a neved a RECOVER után"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Resend a nickserv auth code"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords."
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Menti az adatbázist, és újraindítja a szervízt"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Restrict access to the channel"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Memo üzenetet küld és olvasási visszaigazolást kér"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "\tVisszafelé írásért kirúgás: %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "\tVisszafelé írásért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "SAY                Makes the bot say the given text on the given channel"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Aktiválja a %S biztonsági lehetõségeit"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER Csatornán a founder státusz szigorú kezelése"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     A csatornán az op státusz szigorú kezelése"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Üzenetet küld egy nicknek vagy csatornára"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL Memo küldése minden regisztrált felhasználónak."
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Elfelejtetted a jelszavad? Próbáld ezt"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Olvassa a sessionok hoszt listáját"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Konfigurálja a bot opcióit"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Beállít egy vhosztot a felhasználónak"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Beállítja szervíz általános változóit"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Beállíthatod a csatornád opcióit"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Opciók beállítása, például kill védelem"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Üzenetekkel kapcsolatos beállításokat hajt végre"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Beállítja a vhosztot összes nicknek a csoportban"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Leállítja a szervíz programot mentéssel"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Sign kickek, melyek a KICK paranccsal történnek"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Szerkeszti az SNLINE listát"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        SzuperOperátor lista beállítása"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Szerkeszti az SQLINE listát"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Kijelzi a szervízt és aktív állapotát"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF Memo küldése minden opernek/adminnak."
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Mutatja a Szervít és hálózat állapotát"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Kiírja a felhasználó aktuális hozzáférési\n"
 "               szintjét a megadott csatornán"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Returns the owner status of the given nickname"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     A successor megadása"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Felfüggeszti a szoba használatát de\n"
 "               megõrzi az adatokat és beállításokat."
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend a given nick"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Megváltoztatja a felhasználó nicknevét"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Szerkeszti az SZLINE listát"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     Témaváltás letiltása "
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Felhasználó módok állítása"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Unassigns a bot from a channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Törli a suspendet a csatornáról."
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend a given nick"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1508,84 +1446,84 @@ msgstr ""
 "    UPDATE      A Szervíz adatbázist frissíti, felülírja\n"
 "                lemezre közvetlenül"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Listázza az összes felhasználót  "
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Használva: %d szobában"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Voices a selected nick on a channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Xop (Sop, Aop, Hop, Vop) lista rendszer bekapcsolása"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "\tCsúnya szavakért kirúgás: %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "\tCsúnya szavakért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "E-mail cím: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "Jelenleg online errõl a címrõl: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "Utoljára ekkor volt: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "    A témát beállította: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1594,17 +1532,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1613,98 +1551,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c %-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c %-20s %-8s  %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "    Köszöntõ üzenet: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "Valódi neve: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "Regisztrálás ideje: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "\tAláhúzásért kirúgás: %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "\tAláhúzásért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Sorszám  Küldõ            Dátum/Idõ"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1713,7 +1655,7 @@ msgstr ""
 "%3d  %s (by %s on %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1722,25 +1664,16 @@ msgstr ""
 "%3d %s (%s által, ekkor: %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (stuck) (%s által, ekkor: %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (%s által, ekkor: %s; %s)\n"
 "    Korlát: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1749,345 +1682,335 @@ msgstr ""
 "%5d (%s %s által)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "%S parancsok:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s nem kért értesítést az üzeneteirõl."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c %3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modul betöltve."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d botok rendelkezésre állnak."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d nap"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (%s által, ekkor: %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d óra"
+msgid "%d Modules loaded."
+msgstr "%d Modul betöltve."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d perc"
+msgid "%d bots available."
+msgstr "%d botok rendelkezésre állnak."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicknév van a csoportban."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d másodperc"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "%s AOP listája üres."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "%s HOP listája üres."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "%s SOP listája üres."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "%s VOP listája üres."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s hozzáférési listája üres."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "%s autokick listája üres."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "%s tiltott szavak listája üres."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s nem lehet a %s csatorna successora, mert õ a founder is."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s nem fogadhat üzeneteket."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "%S parancsok:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "%s túl tág tartományra vonatkozik."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s számára %d üzenet érkezett, ebbõl %d olvasatlan."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s számára %d üzenet érkezett, ebbõl 1 olvasatlan."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s számára %d üzenet érkezett."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s számára %d üzenet érkezett, és mind olvasatlan."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s listáján van 1 olvasatlan üzenet."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s listáján van 1 üzenet."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s üzenetlistája üres."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s túl sok üzenettel rendelkezik, és nem fogadhat többet."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s korlátlan számú üzenetet fogadhat."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s üzenetlistája üres."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s nem kapott új üzenetet."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s az %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s jelenleg offline."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s jelenleg online."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s is disabled"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s is enable"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s már nem Szuper-Admin"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s nem kért értesítést az üzeneteirõl."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr "%s értesítést kért csatlakozáskor,és ha új üzenete van,"
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s kérte, csatlakozáskor értesítést kapjon,üzeneteirõl."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s értesítést kért, ha új üzenete érkezik."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s most már Szuper-Admin"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"%s AOP listája:\n"
+"  Sorszám  Nicknév"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s nem szerepel a (%s) csatorna autokick listáján."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s törölve a (%s) csatorna autokick listájáról."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s mostmár nem fog értestíteni, ha új üzeneted érkezik."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s mostmár értesíteni fog, ha új üzeneted érkezik."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
 "you."
 msgstr "%s értesíteni fog az üzenetekrõl csatlakozáskor."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr "%s értesít az üzenetekrõl csatlakozáskor/AWAY OFF-kor."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) hozzáadva a bot listához."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s max. fogadható üzenteinek száma: %d, és ez fix érték."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s maximálisan fogadható üzeneteinek száma: %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL minden új kliensre csatlakozáskor."
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Beállítja a következõ módokat: (%s) az összes csatornán."
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Mellõzve minden nem operátortól jövõ üzenet"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killelve lesz minden új felhasználó csatlakozásnál. "
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Nincs MLOCK módosítás"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Nem lehet új csatornát regisztrálni."
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Nem lehet új memot küldeni"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Nem lehet új nicket regisztrálni."
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Csendes mellõzés, csak operátorok"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Használva a csökkentett session korlát: %d."
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 nap"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 óra"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 perc"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 másodperc"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<ismeretlen>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Egy massmemo elküldve minden regisztrált felhasználónak."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2096,137 +2019,139 @@ msgstr ""
 "Az értesítõ üzenet %s részére el lett küldve, informálva\n"
 "õt arról, hogy elolvastad a memoját."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "A kód a %s címre lett küldve, írd be /msg %s confirm <kód> a regisztráció "
 "befejezéséhez."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "A vhost identnek érvényes formátumúnak kell lenni."
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "A vhost hosztmaszknak érvényes formátumban kell lennie."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 "ACCESS #szoba { ADD | DEL | LIST | VIEW | CLEAR } [ nick [ szint ] | "
 "sorszám ]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [maszk]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT #szoba szöveg"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [maszk]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK #szoba {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR}"
 "[ nick-maszk ] [ indok ]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 "Az AKICK ENFORCE a(z) %s csatornán teljesítve;\n"
 "%d user eltávolítva."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "AKILL lista üres."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+lejárat] {maszk | sorszám} "
 "[indok]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"%s AOP listája:\n"
-"  Sorszám  Nicknév"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN #szoba nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Hozzáférés megtagadva."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "%s hozzáférése a (%s) csatornán változott: %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "%s hozzáférési szintje a (%s) csatornán : %d"
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "A hozzáférési szintnek %d és %d között kell lennie."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "A hozzáférési szint nem lehet nulla."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "%s hozzáférési szintjeinek beállításai:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "%s szintjei visszaállítva az alapértékekre."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "%s hozzáférési listája:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "%s hozzáférési listája:\n"
 "  Sorszám   Szint  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Hozzáférési lista:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2235,22 +2160,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s hozzáadva a (%s) csatorna autokick listájához"
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Hozzáadva az új fellépési hír: (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Hozzáadva az új oper hír:(#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Hozzáadva az új random news tétel (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2258,238 +2188,231 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Összes O:lines %s módosítva."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Összes O:lines %s újra aktív."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "A (%s) csatornáról minden kitiltás levéve."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "A (%s) csatornáról minden kivétel levéve."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "All invites on channel %s have been removed."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Összes fellépési hír tétel törölve."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Minden üzenetet töröltem a %s csatornán."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Összes mód törölve a %s csatornáról."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "A (%s) csatornáról minden mód el levéve."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Minden üzenetet töröltem."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Összes oper hír törölve."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Összes random news tétel törölve."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "A (%s) csatornáról minden felhasználó ki lett rúgva."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s@%s lett"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Használhatja a (de)halfopme parancsot."
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Használhatja a (de)opme parancsot."
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Használhatja a (de)protectme parancsot"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Használhatja a (de)voiceme parancsokat"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Társíthat/eltávolíthat services botot"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Használhatja a banme parancsot"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Használhatja a kickme parancsot"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Írhat/olvashat csatorna memo üzeneteket"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Módosíthatja a hozzáférési listát."
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Használhatja az AKICK parancsot."
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Használhatja a BADWORDS parancsot"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Használhatja a BAN parancsot"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Használhatja a CLEAR parancsot."
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Használhatja a GETKEY parancsot."
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Használhatja a HALFOP/DEHALFOP parancsokat"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Használhatja az INFO parancsot az ALL opcióval"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Használhatja az INVITE parancsot."
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Használhatja a KICK parancsot"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Használhatja az OP/DEOP parancsot."
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Használhatja a PROTECT/DEPROTECT parancsokat"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Használhatja az ACT és SAY parancsokat."
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Használhatja a SET parancsot (kivéve FOUNDER/PASSWORD)."
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Használhatja a TOPIC parancsot"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Használhatja az UNBAN parancsot."
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Használhatja a VOICE/DEVOICE parancsokat."
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Használhatja a fantasia parancsokat."
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Megtekintheti a hozzáférési listát."
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "%s autokick listája:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Automatikus operátor (+o) státusz"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Automatikus protect (+a) mód. "
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Automatikus halfop (+h) státusz (félop)"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Automatikus voice (+v) státusz (hangadás)"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS #szoba{ADD|DEL|LIST|CLEAR}[szó|sorszám]\n"
 "[SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2499,7 +2422,7 @@ msgstr ""
 "BOT CHANGE réginickújnick [user [hoszt [valósnév]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2508,111 +2431,109 @@ msgstr ""
 "%s tiltott szavak listája:\n"
 "  Szám   szó                           tipus"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Tiltott szó lista üres."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "A megadott csatorna (%s) új ban típusa: #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Bináris módok és kitiltások törölve a %s csatornáról."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "%s nevû bot már létezik."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "%s nevû bot nem létezik."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "A %s nevû bot társítva a %s szobához."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "A %s nevû bot megváltoztatva %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "A %s nevû bot törölve."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "A %s nevû bot már társítva van a %s szobához."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "A Bot most már opot is kirúg a %s szobából."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "A Bot most már a hangadókat is kirúgja a %s szobában."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "A Bot nem fog opot kirúgni a %s szobából."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "A Bot nem fogja a hangadókat kirúgni a %s szobában."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Bot Hoszt csak érvényes karaktereket tartalmazhat."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents may only contain %d characters."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Bot Ident csak érvényes karaktereket tartalmazhat."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nick csak érvényes karaktereket tartalmazhat."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "A Bot nincs a %s csatornán."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Botok listája:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"A Bot akkor fog belépni a csatornára, ha legalább\n"
-"%d felhasználó van bent."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2623,7 +2544,7 @@ msgstr ""
 "%d kirúgás után a usert. Használd a BADWORDS parancsot\n"
 "hogy hozzáadj vagy törölj tiltott szavakat a listából."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2631,20 +2552,20 @@ msgstr ""
 "Bot kirúgja tiltott szó használatáért. Használd a BADWORDS\n"
 "parancsot hogy hozzáadj vagy törölj tiltott szavakat a listából."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "A Bot kirúgja félkövér betû használat miatt, és \n"
 "kitiltja %d kirúgás után a usert."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "A Bot kirúgja félkövér betû használat miatt a usert."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2655,7 +2576,7 @@ msgstr ""
 "%d karakter és ennek %d%%-a nagybetû), kitiltja \n"
 "%d kirúgás után a usert."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2664,47 +2585,47 @@ msgstr ""
 "Bot most már kirúgja caps lock miatt a usert (legalább\n"
 "%d karakter és ennek %d%%-a nagybetû)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "A Bot kirúgja szines írás miatt, és kitiltja \n"
 "%d kirúgás után a usert."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "A Bot kirúgja szines írás miatt a usert."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "A Bot kirúgja flood miatt (%d sor %d mp alatt),\n"
 "és kitiltja %d kirúgás után a usert."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot kirúgja flood miatt a usert. (%d sor %d mp alatt)"
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2714,7 +2635,7 @@ msgstr ""
 "A Bot kirúgja ismétlés miatt (ha %d alkalommal ismétli\n"
 "ugyanazt a sort), és kitiltja %d kirúgás után a usert."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2723,137 +2644,153 @@ msgstr ""
 "A Bot kirúgja ismétlés miatt a usert (ha %d alkalommal\n"
 "ismétli ugyanazt a sort)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "A Bot kirúgja fordított írás miatt, és kitiltja %d\n"
 "kirúgás után a usert."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "A Bot kirúg fordított írás miatt."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "A Bot kirúgja aláhúzásos írás miatt, és kitiltja\n"
 "%d kirúgás után a usert."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "A Bot kirúgja aláhúzásos írás miatt a usert."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "A Bot kirúgja szines írás miatt a usert."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "A Bot most már nem fog kirúgni tiltott szó miatt."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "A Bot nem fog kirúgni félkövér betû használat miatt."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Bot nem fog kirúgni caps lock miatt."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Bot nem fog kirúgni szines írás miatt."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "A Bot nem fog kirúgni flood miatt."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "A Bot nem fog kirúgni ismétlés miatt."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "A Bot nem fog rúgni fordított írás miatt."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot nem fog kirúgni aláhúzásos írás miatt."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Bot nem fog kirúgni caps lock miatt."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Botok melyeket csak IRC operátorok társíthatnak:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Olvasott Byteok : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Írott Byteok : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | #szoba}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nicknév "
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR #szoba mit?"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES #szoba [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "%s nem tud kijelentkezni, mert õ egy Services Operator."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR #szoba mit?"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Nem lehet most levelet küldeni;  próbáld újra késõbb."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "%s usermódjai megváltoztatva."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "%scsatorna nem létezik."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "%s csatorna regisztrációjának törlése sikerült."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2862,142 +2799,103 @@ msgstr ""
 "%scsatornát %s forbidolta:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "A megadott csatorna %s már regisztrált!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "A (%s) szoba letiltva."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "(%s) szoba újra használható."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "(%s) szoba használata felfüggesztve."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr " %s szoba nem regisztrált."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "%scsatornát nem lehet regisztrálni vagy használni."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Ez a csatorna %s nem regisztrálható. "
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Regisztráltam a %s csatornát a (%s) nickre."
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Szoba\t       : %6d bejegyzés, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "A megadott csatorna (%s) el fog évülni."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "A megadott csatorna (%s) nem fog elévülni."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Channel %s AOP list has been cleared."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Channel %s HOP list has been cleared."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Channel %s SOP list has been cleared."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Channel %s VOP list has been cleared."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Channel %s access list has been cleared."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Channel %s akick list has been cleared."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "(%s) szoba újra használható."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Csatorna AOP listája csak regisztrált nevet tartalmazhat."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Csatorna HOP listája csak regisztrált nevet tartalmazhat."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Csatorna SOP listája csak regisztrált nevet tartalmazhat."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Szoba SQLINE-ok nem támogatottak ezen az IRCd-n,ezért\n"
 "nem tudod használni."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Csatorna VOP listája csak regisztrált nevet tartalmazhat."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Csatorna listája csak regisztrált nickeket tartalmazhat."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3005,11 +2903,7 @@ msgstr ""
 "Szoba lista:\n"
 "Név\t\t\tUser Mód   Topic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Csatorna operátori státusz tiltása."
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3018,7 +2912,7 @@ msgstr ""
 "Azon csatornák, ahol %s nicknek hozzáférése van:\n"
 "  Sorszám  Csatorna              Szint    Meghatározás"
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3026,31 +2920,16 @@ msgstr ""
 "Azon csatornák, ahol hozzáférésed van:\n"
 "  Sorszám  Csatorna           Szint    Meghatározás "
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "%s szobát nem sikerült letiltani!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Nem forbidolható: %s!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "%s szobát nem sikerült használhatóvá tenni!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "%s szobát nem sikerült felfüggeszteni!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Aktuális AKILL lista:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3058,15 +2937,15 @@ msgstr ""
 "Aktuális AKILL lista:\n"
 "  Szám   Maszk                              Indok"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Jelenlegi Modul lista:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Aktuális SNLINE lista:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3074,11 +2953,11 @@ msgstr ""
 "Aktuális SNLINE lista:\n"
 "  Szám   Maszk                              Indok"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Aktuális SQLINE lista:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3086,11 +2965,11 @@ msgstr ""
 "Aktuális SQLINE lista:\n"
 "  Szám   Mask                              Indok"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Aktuális SZLINE lista:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3098,725 +2977,612 @@ msgstr ""
 "Aktuális SZLINE lista:\n"
 "Szám\tMask\t\t\t\t\tIndok"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Aktuális Session korlát kivétel lista:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Aktuális AKILLek száma: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Aktuális SNLINEok száma: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Aktuális SQLINEok száma : %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Aktuális SZLINEok száma: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Aktuális felhasználók: %d (%d op)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [#szoba] { szám | list | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP #szoba"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Alap AKILL lejárati idõ: %d nap"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Alap AKILL lejárati idõ: %d óra"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Alap AKILL lejárati idõ: %d perc"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Alap AKILL lejárati idõ: 1 nap"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Alap AKILL lejárati idõ: 1 óra"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Alap AKILL lejárati idõ: 1 perc"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Alap AKILL lejárati idõ: Nem elévülõ"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Alap SNLINE lejárati idõ: %d nap"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Alap SNLINE lejárati idõ: %d óra"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Alap SNLINE lejárati idõ: %d perc"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Alap SNLINE lejárati idõ: 1 nap"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Alap SNLINE lejárati idõ: 1 óra"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Alap SNLINE lejárati idõ: 1 perc"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Alap SNLINE lejárati ido: Nem elévülõ"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Alap SQLINE lejárati idõ: %d nap"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Alap SQLINE lejárati idõ: %d óra"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Alap SQLINE lejárati idõ: %d perc"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Alap SQLINE lejárati idõ: 1 nap"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Alap SQLINE lejárati idõ: 1 óra"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Alap SQLINE lejárati idõ: 1 perc"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Alap SQLINE lejárati idõ Nem elévülõ"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Alap SZLINE lejárati idõ: %d nap"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Alap SZLINE lejárati idõ: %d óra"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Alap SZLINE lejárati idõ: %d perc"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Alap SZLINE lejárati idõ: 1 nap"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Alap SZLINE lejárati idõ: 1 óra"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Alap SZLINE lejárati idõ: 1 perc"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Alap SZLINE lejárati idõ: Nem elévülõ"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "%d bejegyzés törölve a %s AOP listáról."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "%d bejegyzés törölve a %s HOP listáról."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "%d bejegyzés törölve a %s SOP listáról."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "%d bejegyzés törölve a %s VOP listáról."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "%d bejegyzés törölve (%s) csatorna hozzáférési listájáról."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d bejegyzés törölve a (%s) csatorna autokick listájáról."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "Törölve %d bejegyzés %s tiltott szavak listájáról."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "Törölve %d bejegyzés a session-korlát kivétel listáról."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "Törölve %d bejegyzés az AKILL listáról."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "Törölve %d bejegyzés a SNLINE listáról."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "Törölve %d bejegyzés az SQLINE listáról."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "Törölve %d bejegyzés az SZLINE listáról."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "1 bejegyzés törölve a %s AOP listáról."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "1 bejegyzés törölve a %s HOP listáról."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "1 bejegyzés törölve a %s SOP listáról."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "1 bejegyzés törölve a %s VOP listáról."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 bejegyzés törölve a (%s) csatorna hozzáférési listájáról"
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 bejegyzés törölve a (%s) csatorna autokick listájáról."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "Törölve 1 bejegyzés %s tiltott szavak listájáról."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "Törölve 1 bejegyzés a session-korlát kivétel listáról."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "Törölve 1 bejegyzés az AKILL listáról."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "Törölve 1 bejegyzés a SNLINE listáról."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "Törölve 1 bejegyzés az SQLINE listáról."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "Törölve 1 bejegyzés az SZLINE listáról."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "1 bejegyzés törölve a %s AOP listáról."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "%s csatorna leírás megváltoztatva: %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "letiltva"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Kiírja az összes bejegyzést (Számláló: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Kiírja a bejegyzéseket %d-tól %d-ig"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr ""
 "Kiírja azokat a hosztokat melyben a %s szó szerepel.\n"
 "(számláló: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Nem használható kiemelt betû ezen a csatornán!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Nem szinezhetsz ezen a csatornán!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Nem írj visszafelé ezen a csatornán!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Nem használható ez a szó: %s!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Nem használj aláhúzásokat ezen a csatornán!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "E-mail cím törölve."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "%sEmail címe nem érvényes."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [paraméterek]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Egyezõ emailek %s ehhez: %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "engedélyezve"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "%s lista vége."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Hozzáférési lista vége."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Vége a szoba listának."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Lista vége - %d / %d csatorna megjelenítve."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Lista vége - %d / %d találat megjelenítve."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Vége a felhasználó listának."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Magyar"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "%s csatorna belépõ üzenete megváltozott."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "%s csatorna belépõ üzenete törölve."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr "Hiba! Az Ident hoszzú, írj %d karakternél rövidebbet!"
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr "Hiba! A vhost hoszzú, írj %d karakternél rövidebbet!"
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "%s kivétel (#%d) áthelyezve a %d pozicíóba."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Lejárati idõ megváltozott: %s."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID #szoba indok"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID #szoba [indok]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nicknév indok"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nicknév [indok]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasy"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Fantasy mód most ON a %s csatornán."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Fantasy mód most OFF a %s csatornán."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Fantasy mód most ON a %s csatornán."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s nick most már nics mellõzve."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "A megadott csatorna (%s) új foundere: %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Nincs * karakter!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nicknév"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS  nem elérhetõ, amíg az encryption használatban van"
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nicknév [jelszó]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL üzenet"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP célnick jelszó"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "A befagyott kliens killelve."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Üdvözlés"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "NickServ-es köszöntõ üzenet megjelenik."
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Üdvözlõ mód most OFF a %s szobán."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Üdvözlõ mód most ON a %s szobán."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"%s HOP listája:\n"
-"  Sorszám  Nicknév"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosztok legalább %d sessionnel:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY jelszó"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [idõ] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO #szoba"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {#szoba | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE #szoba"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Ha nem váltasz nevet 20 sec.-en belül, én megváltoztatom."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Ha nem váltasz nevet 1 percen belül, én megváltoztatom."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Mellõzés kód lessz használva."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Mellõzés kód nem lessz használva."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Mellõzöttek lista törölve."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Mellõzöttek lista üres."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Botok listája:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3832,29 +3598,25 @@ msgstr ""
 "\n"
 "Írd be: /msg %S HELP SET opció bõvebb információért."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Információk a %s nevû botról:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "%s információi:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Belsõ hiba - nem teljesíthetõ kérés."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Érvénytelen elévülési idõ."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3862,12 +3624,12 @@ msgstr ""
 "Érvénytelen hosztmaszk. Csak érvényes hosztmaszk lehet,\n"
 "a kivétel nem lehet nick vagy usernév."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr "Érvénytelen kód, ellenõrizze az e-mailben, majd próbálja újra."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3877,297 +3639,311 @@ msgstr ""
 "és nagyobbnak vagy egyenlõnek mint zéró és kissebbnek \n"
 "mint %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Érvénytelen küszöb érték. 1-nél nagyobb egész számnak\n"
 "kell lennie."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE szervernév [leírás]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK #szoba opció {ON|OFF} [beállítások]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK #szoba user indok"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS #szoba{SET | DIS[ABLE] | LIST | RESET }[ opció [szint]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST pattern"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [#szoba] [list | NEW ]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS { ADD | DEL | LIST } [szöveg|szám]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Új nyelvezet: Magyar."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "%s részére küldött utolsó memo üzenet visszavonva."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Utolsó kilépõ üzenet: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Utoljára látott cím: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "%s szintjének új értéke a (%s) csatornán: %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "A szintnek kizárólag %d és %d között kell lennie."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Ez a parancs használhatatlan ebben a módban. (xOP)"
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Azon bejegyzések listája, melyek egyeznek ezzel, %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "%s csoportjába tartozó nickek listája:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "A csoportodba tartozó nickek listája:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Helyi csatornák nem regisztrálhatók."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Logon news tétel #%d törölve."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Logon news tétel #%d nem található!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Fellépési hírek:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE szoba mód"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO Fájlnév"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD Fájlnév"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD Fájlnév"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD Fájlnév"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Ez a maszk: %s már szerepel a hozzáférési listádon."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "A maszknak ilyen formátumúnak kell lennie: user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Legtöbb felhasználó: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Üzenet szám: %d; feladó: %s (%s). Törléshez: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Üzenet szám: %d; feladó.: %s (%s). Törléshez: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "A megadott üzenetet (%d) töröltem."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "%s ezentúl korlátlan számú üzenetet fogadhat."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "%s maximálisan fogadható üzeneteinek száma: %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "%s ezentúl nem fogadhat üzeneteket."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Túl nagy érték a max.bejövÕ üzenetnek,%d az új értéke."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Üzenet elküldve %s részére."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "%s üzenetei. Olvasáshoz írd be: /msg %s READ szám"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "%s üzenetei.  Olvasáshoz : /msg %s READ %s szám"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "%s üzenetei. Olvasáshoz írd be: /msg %s READ szám"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "%s üzenetei.  Olvasáshoz : /msg %s READ %s szám"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Üzenet mód"
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "%c mód figyelmen kívül hagyva, mert nem rögzítheted."
-
-#: language.cpp:1314
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "A (%s) csatornán minden +o mód levéve."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "A megadott csatornán (%s) az új Mode lock: %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "\tRögzített módok: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "%s modul betöltve"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "%s modul betöltve"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "%s modul kitöltve"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modul: %s Verzió: %s Szerzõ: %s Betöltve: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modul: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} szerver"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliases\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS Csoport\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Nem lesz kirúgva a bot automatikus funkcióival."
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Új memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Új üzenet %s részére. Olvasáshoz: /msg %s READ szám"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "%s új üzenetei.  Olvasáshoz,: /msg %s READ %s szám"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "A Hírlista tele!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4176,146 +3952,132 @@ msgstr ""
 "Ezt a nicket: %s %s forbidolta:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr " %snick illegális nicknév vagy nem használható."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Ez a nick: %s jelenleg használatban van."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "%s nick most már forbidolt."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "A %s nick a Hálózat Szervízének egysége."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Ezt a nicket %s nem fogja a services."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Ez a nick: %s nincs jelenleg használatban."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Ez a nick: %s nem regisztrált."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr " %snicket  nem lehet regisztrálni vagy használni."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s nick nem található a mellõzöttek listáján."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "A nicked %s meg lett csonkítva %d karakter hosszúságúra."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "%s nickre nem érkezett memo üzenet tõled."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr " %s nick sikeresen kijelentkezett."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is currently suspended."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NEM regisztrált, próbáld késõbb."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "A %s nicknév érvényesítve. "
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "A %s nicknevet dropoltad."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Ez a nicknév: %s már regisztrált!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Ez a nicknév: %s nem regisztrálható."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Ez a nicknév: %s számodra lett regisztrálva: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Nicknév Regisztráció (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Nicknév jelszó (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4326,161 +4088,116 @@ msgstr ""
 "a regisztrációja elévül, a nicknevet bárki regisztrálhatja,\n"
 "és használhatja."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Nincs # a szoba neve elõtt."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Nincs Bot mód most OFFa %s szobán."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Nincs Bot mód most ONa %s szobán."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nincs Email listázva ehhez: %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Nincs bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Nincs ezzel kapcsolatban segítség: %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Nincs elérhetõ információ a  %s modulról"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Nincs törölhetõ fellépési hír!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Nincs ilyen bejegyzés a %s AOP listán."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Nincs ilyen bejegyzés a %s HOP listán."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Nincs ilyen bejegyzés a %s SOP listán."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Nincs ilyen bejegyzés a %s VOP listán."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nincs ilyen bejegyzés a (%s) csatorna hozzáférési listáján."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nincs ilyen bejegyzés a (%s) csatorna autokick listáján."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Nincs ilyen szó %s a tiltott szavak listáján."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "Nincs ilyen bejegyzés a session-korlát kivétel listán."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Nincs ilyen bejegyzés az AKILL listán."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Nincs ilyen bejegyzés az SNLINE listán."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Nincs ilyen bejegyzés az SQLINE listán."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Nincs ilyen bejegyzés az SZLINE listán."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Nincs visszavont memo üzenet."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Jelenleg nincs modul betöltve."
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nincs törölhetõ opernews tétel!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Nincs törölhetõ random news tétel!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Nincs indok"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Nincs signkick, ha a SIGNKICK LEVEL használatban van."
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Nem található (#%d) a %s AOP listán."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Nem található (#%d) a %s HOP listán."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Nem található (#%d) a %s SOP listán."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Nem található (#%d) a %s VOP listán."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Nincs"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Nem léphet a csatornára, ha a RESTRICTED használatban."
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4491,95 +4208,93 @@ msgstr ""
 "napig, automatikusan elvesztik regisztrációjukat.\n"
 "Automatikusan dropolásra kerülnek."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Szám  Korlát  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flagek"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "Opok értesítése"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS { ADD | DEL |LIST } [ szöveg | szám ]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "A régi info megegyezik az újjal."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Szint Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Op-notice option for %s is now OFF."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Op-notice option for %s is now ON."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Oper news tétel #%d törölve."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Oper news tétel #%d nem található!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper hírek listája:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "%s operflagek megadva a %s nicknek."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Opok védelme"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Ez az opció: %snem állítható be ezen a hálózaton."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Kód a %s nickhez:  %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Jelszavad elfogadva - azonosítás sikeres."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4587,60 +4302,56 @@ msgstr ""
 "Jelszavas azonositás szükséges ehhez a parancshoz.\n"
 "Próbáld újra miután beírtad: /msg %s IDENTIFY jelszó."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "%s jelszava: %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Hibás jelszó."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "%s nick jelszava elküldve."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Békesség"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Peace option for %s is now OFF."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Peace option for %s is now ON."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr "Keress meg egy Operátort és kérj tõle vhostot."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4648,169 +4359,130 @@ msgstr ""
 "karakter legyen,\tés nem kitalálható legyen, (ne a\n"
 "nickneved/valósneved),  ne legyen benne írásjel."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Kérlek használj érvényes szerver nevet amikor jupolsz!"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Please use the symbol of # when attempting to register"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Kérlek várj %d másodpercet és próbáld újra."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Kérlek várj %d másodpercet, mielõtt ismét használod a GROUP parancsot."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr " Várj %d másodpercet mielõtt  használnád ezt a parancsot!"
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Kérlek várj %d másodpercet mielõtt újra használod az RSEND parancsot."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Kérlek, várj %d másodpercet mielõtt SEND parancsot újra használod!"
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Privát"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Private mód a %s botban most OFF."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Private mód a %s botban most ON."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Private option for %s is now OFF."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Private option for %s is now ON."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Kill védelem"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "A Kill védelem opció most már ON, késleltetés nélkül."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Modul parancsai: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS { ADD | DEL | LIST } [ szöveg | szám ]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [#szoba] {list | LAST | NEW }"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nicknév [jelszó]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER #szoba leírás"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER jelszó email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER jelszó [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nicknév [jelszó]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | #szoba} memo-szöveg"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Random news tétel #%d törölve."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Random news tétel #%d nem található!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Véletlenszerû hírek listája:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4818,296 +4490,307 @@ msgstr ""
 "Regisztráció 1 lépése lehet, hogy elévült, írd be: \"/msg %s register "
 "<jelszó> <email>\"."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Korlátozott hozzáférés"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Restricted access option for %s is now OFF."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Restricted access option for %s is now ON."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY #szoba szöveg"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | #szoba} memo-szöveg"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nicknév"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS nem elérhetõ, amíg az encryption használatban van."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST korlát"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hosztmaszk>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET #szoba opció beállítások"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET botname NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET botnév PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET #szoba opció paraméterek"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET #szoba DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET #szoba DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET #szoba FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET szoba GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET #szoba KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET #szoba OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET #szoba NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET #szoba OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET #szoba PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET #szoba PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET #szoba RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET #szoba SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET #szoba SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET #szoba SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET #szoba SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET szoba SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET #szoba TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET #szoba XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET opció paraméterek"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET opció beállítás"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE szám"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [#szoba] limit"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [user | #szoba] {limit | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hosztmaszk>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "SNLINE lista üres."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5115,341 +4798,326 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[ +lejárat] {maszk| sorszám }[:"
 "Indok]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP #szoba { ADD | DEL | LIST | CLEAR }[ nick | sorszám]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"%s SOP listája:\n"
-"  Sorszám  Nicknév"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "SQLINE lista üres."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD|DEL|LIST|VIEW|CLEAR}[ [ +lejárat ] { maszk | sorszám }[ indok ]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Channel %s not registered"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND #szoba indok"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND #szoba [indok]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND #szoba indok"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick újnick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "SZLINE lista üres."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR }[[ +lejárat ] { maszk | sorszám } "
 "[ indok ]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Secure"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Founderjog védelme"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Opjog védelme"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Secure founder option for %s is now OFF."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Secure founder option for %s is now ON."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Secure ops option for %s is now OFF."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Secure ops option for %s is now ON."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Secure option for %s is now OFF."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Secure option for %s is now ON."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Biztonság"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "Szervíz Defcon módban fut, próbáld késõbb."
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Szervíz új DEFCON szintje %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Szervíz elévülõ módban van."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Szervíz nem elévülõ módban van."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Szervíz most  csak olvas módban."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Szervíz most olvas ír módban."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Szervíz most debug módban (szint: %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Szervíz most debug módban fut."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Szervíz most már nem fut debug módban."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "A Szervíz úgy van beállítva, hogy nem küld mailt."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Szervíz mellõzés lista:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Szervíz nem tudja változtatni a módokat.\n"
-"A szervereid jól vannak beállítva?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Szervíz nem tudja változtatni a módokat.\n"
 "A szerverek U:lines beállitása helyes?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Szervíz fent van %d nap, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Szervíz fent van %d nap, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
+msgid "Services up %d hours, %d minutes"
 msgstr "Szervíz fent van %d óra, %d perce"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Szervíz fent van %d óra, %d perce"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Szervíz fent van %d perc, %d másodperce."
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Szervíz fent van %d óra, %d perce"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Szervíz fent van %d óra, %d perce"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Szervíz fent van %d perc, %d másodperce."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Szervíz fent van %d perc, %d másodperce."
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Szervíz fent van %d perc, %d másodperce."
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Szervíz fent van %d perc, %d másodperce."
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/os_stats.cpp:163
+#, c-format
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
+
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Szervíz konfigurációs fájl újratöltve."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "A Services rendelkezésedre bocsájtotta a nicket."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Session korlát %s részére %d-re állítva."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Session korlátozás tiltva."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Session\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "%s beállítás nem ismert. Írd be /msg %s HELP LEVELS DESC\n"
 "az érvényes beállítások listájának megtekintéséhez.  "
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "A DEBUG beállításhoz kell ON,/OFF,/ pozitív szám."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Mellõzés beállitásnak kell lenni ON vagy OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Az NOEXPIRE beállításhoz kell ON vagy OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "READONLY beállitáshoz kell lenni ON vagy OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 "SET SuperAdmin  ON vagy OFF \n"
 "(engedélyezni kell a services.conf-ban)"
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Signed kick option for %s is now OFF."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Signed kick option for %s is now ON."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5458,209 +5126,181 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Signed kick option for %s is now ON."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Signed kicks"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sajnálom, az RSEND használata le van tiltva ezen a hálózaton."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Bot társítás ideiglenesen nem mûködik."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "A bot létrehozása sikertelen."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "A bot módosítás ideiglenesen szünetel."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Bot beállítás idõlegesen szünetel."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Csatorna AOP lista módosítás szünetel."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Csatorna HOP lista módosítás szünetel."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Csatorna SOP lista módosítás szünetel."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Csatorna VOP lista módosítás szünetel."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "A csatorna hozzáférési listájának módosítása szünetel."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Csatorna autokick listájának módosítása szünetel."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Csatornán tiltott szaval listájának változtatása letiltva."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "A csatornák regisztrációjának törlése jelenleg szünetel."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "A csatornák opcióinak beállitása jelenleg szünetel."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Sajnálom,  a csatorna regisztráció jelenleg szünetel."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Sajnálom, a group parancs használata sikertelen."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Sajnálom, azonosítás sikertelen."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Kirúgás használata ideiglenesen letiltva."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Üzenet opcióinak beállítása szünetel."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Sajnálom, az üzenetküldés szünetel."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Sajnálom,  a nicknevek regisztrációjának törlése  szünetel."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Sajnálom, a csoportok használata ideiglenesen le van tiltva."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "Sajnálom,  a nicknév opció beállítás jelenleg szünetel."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Sajnálom, a nickregisztráció jelenleg nem mûködik."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Sajnálom, a regisztráció sikertelen."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Csak %d számú helyed van a csatorna VOP/AOP/SOP listán."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Neked csak %d  helyed van a csatorna listáján."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Neked csak %d bejegyzésed lehet a hozzáférési listán."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Neked csak %d  helyed van a csatorna listáján."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "%d bejegyzésnél nem lehet több a listán."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Csak %d tiltott szó lehet a csatornán."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Már túllépted a felsõ korlátot (%d) a csatornán."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Már elérted a felsõ korlátot (%d) csatornák számában."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statisztika nullázva."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Státusz frissítve (memok, vhost, chmodok, flagek)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Ne floodolj!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Ne ismételd magad!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "A megadott csatorna %s successora törölve."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "A megadott csatorna (%s) új successora: %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Együttélés"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Együttélés mód most OFFa %s szobán."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Együttélés mód most ONa %s szobán."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Szintaktika: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5687,7 +5327,7 @@ msgstr ""
 "2: *!*@host formátumú tiltás\n"
 "3: *!*user@*.domain formátumú tiltás"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5700,27 +5340,12 @@ msgstr ""
 "Beállítható a szoba általános meghatározása, ami látszódni\n"
 "fog a  LIST és INFO parancs használata esetén."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Syntax: %s #szoba ENTRYMSG [üzenet]\n"
-"\n"
-"Beállít egy üzenetet, amit /notice formában fognak\n"
-"a szobába belépõ userek megkapni. Ha nincs paraméter\n"
-"megadva akkor a szoba belépõ üzenete törlõdik."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Syntax: %s #szoba FOUNDER nick\n"
@@ -5728,7 +5353,7 @@ msgstr ""
 "Megváltoztatja a szoba founderjét.\n"
 "Az új nicknév regisztrált kell hogy legyen!"
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5746,76 +5371,7 @@ msgstr ""
 "a topicot a %S megjegyzi miután az utolsó user elhagyja a\n"
 "szobát, és visszaállítja a következõ megnyitáskor."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Syntax: %s #szoba  MLOCK módok\n"
-"\n"
-"Beállíthatod a mode-lock opciót a csatornán. A  %S\n"
-"lehetõséget nyújt arra, hogy meghatározd azokat a módokat\n"
-"amelyek mindig be (vagy ki) lesznek kapcsolva. \n"
-"\t\n"
-"A módok felrakhatóak a /MODE paranccsal is; \n"
-"azok a módok amelyek a + jel után vannak lockolódnak,\n"
-"és azok a módok amelyek a - jel után vannak nem\n"
-"rakhatóak fel a szobára.\n"
-"\n"
-"Figyelmeztetés:  Ha beállítasz egy mode-lock alatti \n"
-"kulcsot, mint azt a második példában látod, akkor be kell\n"
-"állítanod a RESTRICTED opciót a csatornán (lásd \n"
-"HELP\tSET RESTRICTED) vagy bárki beléphet a szobába,\n"
-"amikor üres és lehetõsége lesz meglátni a kulcsot!\n"
-"\n"
-"Példák:\n"
-"\n"
-"    SET #szoba MLOCK +nt-ikl\n"
-"         Az  \"n\" és a \"t\" állandóan fent van, és az \"i\", \"k\", és\n"
-"         \"l\" állandóan ki lesz kapcsolva. Minden más mód \n"
-"         felrakása-levétele szabad.\n"
-"\n"
-"    SET #szoba MLOCK +knst-ilmp my-key\n"
-"         A \"k\", \"n\", \"s\", és \"t\" állandóan fent van, és az \"i\",\n"
-"         \"l\", \"m\", és a \"p\" ki lesz kapcsolva. A szobába való\n"
-"         belépéshez szküséges jelszó:\t\"my-key\".\n"
-"\n"
-"    SET #szoba MLOCK +\n"
-"         Eltávolítja az összes lockolt módot.\n"
-"         Minden mód szabadon ki/bekapcsolható."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5833,7 +5389,7 @@ msgstr ""
 "az OP, VOICE, vagy a hozzájuk kapcsolódó parancsokat a\n"
 "szoban."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5850,7 +5406,7 @@ msgstr ""
 "rúghatnak ki, tilthatnak ki olyan usert akinek az övékkel\n"
 "egyenlõ vagy magasabb szintje van a %S parancsokhoz."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5895,7 +5451,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5910,13 +5466,13 @@ msgstr ""
 "parancs által kilistázott csatornák között nem szerepel \n"
 "a szoba."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Syntax: %s #szoba RESTRICTED {ON | OFF}\n"
@@ -5925,7 +5481,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5944,7 +5500,7 @@ msgstr ""
 "jelszavukkal (használván az IDENTIFY parancsot) kaphatnak\n"
 "a szobában jogokat, ha szerepelnek a hozzáférési listán."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5963,52 +5519,12 @@ msgstr ""
 "szoba jelszavát, founderét, jogutódját, de azok nem,\n"
 "akik csak az IDENTIFY parancsot használták a %S-ben."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Syntax: %s #szoba SECUREOPS {ON | OFF}\n"
-"\n"
-"Bekapcsolja vagy letiltja a secure ops opciót.\n"
-"Amikor a secure ops be van kapcsolva, akkor azok, akik \n"
-"nem szerepelnek a hozzáférési listán nem kaphatnak szoba\n"
-"operátori státuszt."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Syntax: %s #szoba SIGNKICK {ON | SZINT | OFF}\n"
-"\n"
-"Engedélyezi vagy letiltja a signed kick opciót a csatornán\n"
-"Amikor a SIGNKICK be van állítva, a %S KICK parancsával\n"
-"végrehajtott kirúgásokban az indokban szerepel az op neve.\n"
-"\n"
-"Ha használod a LEVEL-t, akkor azok, akiknek a szintje\n"
-"megegyezik vagy magasabb, mint a signkick szintje, azoknak\n"
-"a neve nem fog szerepelni a kick indokjában.\n"
-"Lásd még: /msg %S HELP LEVELS bõvebb információkért. "
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6026,24 +5542,7 @@ msgstr ""
 "is ez történik, ha nem volt megadva successor.\n"
 "A nicknek regisztrálnak kell lennie."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Syntax: %s #szoba TOPICLOCK {ON | OFF}\n"
-"\n"
-"Engedélyezi vagy letiltja a topic lezárása opciót a \n"
-"csatornán. Ha a topic lezárása be van kapcsolva,a %S nem\n"
-"engedélyezi a csatornán a topic változtatását a TOPIC\n"
-"paranccsal."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6077,10 +5576,11 @@ msgstr ""
 "Az xOP lista rendszerrõl az access lista rendszerre való \n"
 "áttérés nem okoz gondot."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6093,18 +5593,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6158,7 +5662,7 @@ msgstr ""
 "Az ACCESS CLEAR parancs töröl minden bejegyzés a szoba\n"
 "hozzáférési listájáról."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6207,7 +5711,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "          Megmutatja a hozzáférési listát."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6219,12 +5723,18 @@ msgstr ""
 "A bot \"/me\" akcióval küldi el a megadott szöveget\n"
 "a csatornára."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6245,15 +5755,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6322,7 +5823,8 @@ msgstr ""
 "AKICK CLEAR paranccsal az összes akick lista bejegyzés \n"
 "törölhetõ."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6330,21 +5832,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6408,7 +5910,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6447,7 +5949,7 @@ msgstr ""
 "Azok a csatornák melyeken a NOEXPIREopció be van állítva,\n"
 "prefixel lesznek megjelölve a listában."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6467,10 +5969,11 @@ msgstr ""
 "\n"
 "Ennek a használata korlátozva Szervíz adminra."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6552,7 +6055,7 @@ msgstr ""
 "írd be: /msg %S HELP SET XOP hogy megnézd, hogyan tudsz \n"
 "váltani az xOP rendszerrol az access lista rendszerre."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6566,7 +6069,8 @@ msgstr ""
 "botodat a csatornád igényeidnek megfelelõen.\n"
 "Kellemes botozást! :-)"
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6598,7 +6102,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6635,7 +6139,7 @@ msgstr ""
 "BADWORDS CLEAR parancs törli az összes bejegyzést\n"
 "a tiltott szavak listájáról"
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6651,7 +6155,7 @@ msgstr ""
 "Alapbeállítás szerint, minimum AOP vagy 5-ös access \n"
 "szinttel kell rendelkezned a csatornán, hogy használhasd."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6693,7 +6197,7 @@ msgstr ""
 "nickkel, akkor a nick dropolva lesz. Akkor is, ha a user\n"
 "éppen használja a nicket; killelve lesz."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6703,7 +6207,7 @@ msgstr ""
 "\n"
 "Listázza az összes érvényes botot a hálózatról."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6715,7 +6219,7 @@ msgstr ""
 "Visszavonja az utolsó memo üzenetet, amit a nicknek\n"
 "vagy csatornának küldtél."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6727,7 +6231,7 @@ msgstr ""
 "és teljesen valós ident@host maszkot használja, minden \n"
 "nick esetében végrehajtja az AKILLt."
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6751,7 +6255,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6764,69 +6268,32 @@ msgstr ""
 "küldtél már olvasott-e vagy még olvasatlan.\n"
 "Megjegyzés, ez csak nickekkel mûködik szobákkal nem."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Syntax: CLEAR #szoba mit?\n"
-"\n"
-"A %S eltávolítja a beállításokat a csatornán. \n"
-"A következõ opciók lehetségesek:\n"
-"\n"
-"    MODES    Törli az összes módot ami nem szerepel a szoba\n"
-"             mode lockjában.\n"
-"    BANS     Törli az összes tiltást a csatornán.\n"
-"    EXCEPTS  Törli az összes kivételt a csatornán.\n"
-"    INVITES  Clears all invites on the channel.\n"
-"    OPS      Elvesz minden opot a csatornán. If supported, removes\n"
-"\t\t     channel-admin (mode +a) and channel-owner (mode +q)\n"
-"\t\t     as well.\n"
-"    HOPS     Eltávolít minden félop csatorna státuszt (+h mód)\n"
-"             az összes csatornán lévõ féloperátortól, ha támogatott.\n"
-"    VOICES   Elvesz minden \"voice\"-t (mode +v) a csatornán.\n"
-"    USERS    Eltávolít minden usert a csatornáról (kirúgás).\n"
-"\t\n"
-"Alapbeállításban, a founder szintû userek használhatják."
+"Syntax: DEOWNER #szoba\n"
+"\n"
+"Elveszi a tulajdonosi státuszt a csatornán.\n"
+"\n"
+"Csak founder szintu user használhatja."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Syntax: CLEARMODES szoba [ALL]\n"
-"\n"
-"Töröl minden módot (i,k,l,m,n,p,s,t)és kitiltást a \n"
-"csatornáról. Ha az ALL-t megadod akkor eltávolítja\n"
-"az op és voice jogokat (+o és +v módot) a csatornán. \n"
-"\t\n"
-"Korlátozva Szervíz operátornak."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6852,7 +6319,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6864,12 +6331,14 @@ msgstr ""
 "korlátozást a szervíz használatban egy támadás alkalmával\n"
 "a hálózaton."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6885,7 +6354,7 @@ msgstr ""
 "a HOP listán vagy 4-es access szinten szereplõ userek\n"
 "használhatják, hogy saját maguktól elvegyék a félopot"
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6895,11 +6364,12 @@ msgstr ""
 "A vhost törölve az adott nick adatbázisából.\n"
 "Korlátozva Hoszt változtatókra."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -6931,10 +6401,11 @@ msgstr ""
 "\tDEL 2-5,7-9\n"
 "\t\tTörli a memo üzeneteket 2 és 5, illetve 7 és 9 között."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntax: DELALL <nick>.\n"
@@ -6943,12 +6414,14 @@ msgstr ""
 "\n"
 "Korlátozva Hoszt változtatókra."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -6961,29 +6434,35 @@ msgstr ""
 "Alap beállítás szerint csak a minimum AOP listán\n"
 "vagy 5-ös access szinten szereplo userek használhatják."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Syntax: DEOWNER #szoba\n"
+"Syntax: DEOP #szoba [nick]\n"
 "\n"
-"Elveszi a tulajdonosi státuszt a csatornán.\n"
+"Deopolja a megadott nicket a megadott csatornán.\n"
+"Ha nem adsz meg nicket, magadat deopolod.\n"
 "\n"
-"Csak founder szintu user használhatja."
+"Alap beállítás szerint csak a minimum AOP listán\n"
+"vagy 5-ös access szinten szereplo userek használhatják."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Syntax: DEPROTECT #szoba [nick]\n"
 "\n"
@@ -6994,12 +6473,14 @@ msgstr ""
 "vagy min. az SOP listán vagy 10-es access szinten\n"
 "szereplõ userek használhatják maguk deprotectolására."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7015,7 +6496,7 @@ msgstr ""
 "a VOP listán vagy 3-as access szinten szereplo userek\n"
 "használhatják saját maguktól elvenni voiceot."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7027,7 +6508,7 @@ msgstr ""
 "Törli a megnevezett szoba regisztrációját.\n"
 "Csak a szoba founder használhatja."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7040,9 +6521,10 @@ msgstr ""
 "droppolhat csatornát,úgy hogy nem használja a szoba\n"
 "jelszavát."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7050,6 +6532,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7066,7 +6552,7 @@ msgstr ""
 "mint a nick tulajdonosa, használva az IDENTIFY parancsot,\n"
 "írd be: /msg %S HELP IDENTIFY bõvebb információért. "
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7089,8 +6575,8 @@ msgstr ""
 "\n"
 "Használat korlátozva Szervíz adminoknak."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7101,7 +6587,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7123,7 +6609,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7174,7 +6660,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7192,7 +6678,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7210,7 +6696,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminra."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7225,7 +6711,7 @@ msgstr ""
 "lekért email cím és az azt lekérõ személy naplózva lesz.\n"
 "Korlátozva Szervíz adminra."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7235,16 +6721,15 @@ msgstr ""
 "\n"
 "Megadja a szoba kulcsot."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Syntax: GETPASS nicknév\n"
 "\n"
@@ -7257,14 +6742,14 @@ msgstr ""
 "\n"
 "A parancs nem elérhetõ, ha az encryption használatban van."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7280,7 +6765,7 @@ msgstr ""
 "befagy például lefagy a géped vagy a kapcsolatod.\n"
 "A beragadt nicked killelheted, ha ismered a jelszót ."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7290,7 +6775,7 @@ msgstr ""
 "\n"
 "Listáz minden nicket a csoportodból."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7310,7 +6795,7 @@ msgstr ""
 "\n"
 "Ennek a használata korlátozva Szervíz adminra."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7323,7 +6808,7 @@ msgstr ""
 "Megengedi, hogy az IRCopok üzenetet küldjenek az összes \n"
 "felhasználónak a hálózaton. Üzenetet a %s nickrõl küldi."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7336,7 +6821,7 @@ msgstr ""
 "Ez a parancs lehetõvé teszi, hogy a JELENLEGI nick\n"
 "vhostját beállítsuk a csoport minden nickjére."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7399,16 +6884,17 @@ msgstr ""
 "Megjegyzés: minden nicknévnek a csoportban ugyanaz\n"
 "\t\t a jelszava."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Syntax: HALFOP #szoba [nick]\n"
 "\n"
@@ -7420,10 +6906,11 @@ msgstr ""
 "a HOP listán vagy 4-es access szinten szereplõ userek\n"
 "használhatják saját maguknak félop adására."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7501,7 +6988,7 @@ msgstr ""
 "és írd be: /msg %S HELP SET XOP hogy megnézd, hogyan \n"
 "tudsz váltani az xOP rendszerrõl access lista rendszerre."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7518,9 +7005,20 @@ msgstr ""
 "nicknek. Jelszónak ugyanannak kell lennie amit a \n"
 "regisztrációnál megadtál, vagy amire módosítottad."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7551,7 +7049,7 @@ msgstr ""
 "Ignores will not be enforced on IRC Operators.\n"
 "\t"
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7572,7 +7070,7 @@ msgstr ""
 "\n"
 "Alapból az ALL opció csak a foundernek engedélyezett."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7588,7 +7086,7 @@ msgstr ""
 "informaciót megkaphatsz az ALL paraméter használatával \n"
 "és  így látni fogod a rejtett információkat is."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7605,7 +7103,7 @@ msgstr ""
 "érkezésekor. Paraméter megadása esetén az információt\n"
 "csatornára vonatkozóan jeleníti meg."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7631,7 +7129,7 @@ msgstr ""
 "meg ezeket az információkat.Enek használat korlátozva \n"
 "Szervíz adminra."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7651,12 +7149,12 @@ msgstr ""
 "kapsz információkat, például létrehozás ideje, csatornák\n"
 "száma."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7668,14 +7166,15 @@ msgstr ""
 "Alapbeállítás szerint, min. AOP vagy 5-ös access szinttel\n"
 "kell rendelkezned a csatornán, hogy használhasd."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7694,7 +7193,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7710,7 +7209,7 @@ msgstr ""
 "Alapbeállítás szerint, min. AOP vagy 5-ös access szinttel\n"
 "kell rendelkezned a csatornán, hogy használhasd."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7737,7 +7236,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7759,12 +7258,14 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7803,14 +7304,14 @@ msgstr ""
 "Megjegyzés: A parancshoz való hozzáférést a level SET-ben\n"
 "lehet korlátozni."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7826,7 +7327,25 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7844,7 +7363,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7873,7 +7392,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7891,7 +7410,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7914,7 +7433,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7930,7 +7449,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7948,7 +7467,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot.\t"
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7966,8 +7485,8 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -7977,17 +7496,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8019,7 +7538,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8045,7 +7564,7 @@ msgstr ""
 "amikor megjeleníti a tartalmat az operátornak.\n"
 "Korlátozva Szervíz operátorokra."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8060,7 +7579,7 @@ msgstr ""
 "(Ahol a PRIVATE opció be van kapcsolva nem fog\n"
 " megjelenni a listában.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8101,7 +7620,8 @@ msgstr ""
 "          Listáz minden nicket, amit utoljára olyan user használt,\n"
 "          akinek a bar.org volt a domain-je."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8129,7 +7649,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE]\n"
 "\n"
@@ -8158,13 +7677,14 @@ msgstr ""
 "            Listázza az összes felhasználót, akinek a beállítása\n"
 "            nem elévülõ."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8180,11 +7700,11 @@ msgstr ""
 "\tLIST 2-5,7-9\n"
 "\t\tListázza az üzeneteket 2 és 5, illetve 7 és 9 között."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Syntax: LOGONNEWS ADD szöveg"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8213,11 +7733,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Syntax: LOGONNEWS DEL {szám | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8231,7 +7751,7 @@ msgstr ""
 "Ezzel az IDENTIFY parancs hatásának fordítottját éred el.\n"
 "Nem fog a NickServ egy adott nick tulajdonosának tekinteni."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8256,12 +7776,13 @@ msgstr ""
 "\n"
 "Használat korlátozva Szervíz adminoknak."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Syntax: MODE #szoba módok\n"
@@ -8272,7 +7793,34 @@ msgstr ""
 "\t\n"
 "Korlátozva Szervíz operatornak."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8282,7 +7830,7 @@ msgstr ""
 "\n"
 "A parancs részletes információt ad a betöltött modulokról."
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8293,7 +7841,7 @@ msgstr ""
 "Listázza az összes betöltött aktív modult.\n"
 "\t"
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8305,7 +7853,7 @@ msgstr ""
 "Ez a parancs betölti azt modult, a modules könyvtárból,\n"
 "amelyiknek a fájlnevét megadtad."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8317,7 +7865,7 @@ msgstr ""
 "Ez a parancs betölti azt modult, a modules könyvtárból,\n"
 "amelyiknek a fájlnevét megadtad."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8329,10 +7877,12 @@ msgstr ""
 "Ez a parancs kitölti a megnevezett fájlnevû msdult a \n"
 "modulok listájából."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8358,7 +7908,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8370,7 +7920,7 @@ msgstr ""
 "Ha valaki használ /whois parancsot a nickeden, akkor a\n"
 "valós IP címed vagy hosztod fogja látni."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8384,7 +7934,7 @@ msgstr ""
 "operflaget adjon. Elõjelként \"+\" vagy \"-\" adható meg.\n"
 "Ha csak a \"-\" paraméter adod meg akkor mindent eltávolít."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8397,12 +7947,14 @@ msgstr ""
 "akkor a vhostodat fogja látni a valódi IP címed vagy\n"
 "hosztneved helyett."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8415,11 +7967,11 @@ msgstr ""
 "Alap beállítás szerint csak a minimum AOP listán\n"
 "vagy 5-ös accessen szereplo userek használhatják."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Syntax: OPERNEWS ADD szöveg"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8448,30 +8000,37 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Syntax: OPERNEWS DEL {szám | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Syntax: OWNER #szoba\n"
+"Syntax: OP #szoba [nick]\n"
 "\n"
-"Tulajdonosi státuszt ad a csatornán.\n"
+"Opolja a megadott nicket a megadott csatornán.\n"
+"Ha nem adsz meg nicket, magadat opolod.\n"
 "\n"
-"Csak founder szintû user használhatja."
+"Alap beállítás szerint csak a minimum AOP listán\n"
+"vagy 5-ös accessen szereplo userek használhatják."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8485,10 +8044,11 @@ msgstr ""
 "vagy minimum a SOP listán vagy 10-es access szinten\n"
 "szereplõ userek használhatják saját maguk protectolására."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8561,7 +8121,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8581,11 +8141,11 @@ msgstr ""
 "\n"
 "Korlátozva Services Operatoroknak."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Syntax: RANDOMNEWS ADD szöveg"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8607,18 +8167,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Syntax: RANDOMNEWS DEL {szám | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8636,7 +8197,7 @@ msgstr ""
 "\tREAD 2-5,7-9\n"
 "\t\tMegjeleníti 2 és 5, a 7 és 9 között a memo üzeneteket"
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8684,7 +8245,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8695,7 +8257,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8726,24 +8288,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8789,15 +8352,15 @@ msgstr ""
 "megoszthasd a hozzáféréseidet és beállításaidat a nickjeid\n"
 "között. Bõvebb információkért írd be: /msg %S HELP GROUP"
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8818,7 +8381,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8835,7 +8398,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8847,7 +8410,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8858,7 +8421,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8872,13 +8435,14 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak.\t"
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8893,23 +8457,25 @@ msgstr ""
 "Amint a címzett elolvasta a memot, egy automatikus értesítést\n"
 "fog kapni a feladó arról, hogy az üzenetét elolvasták."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -8917,7 +8483,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8929,7 +8495,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8939,7 +8505,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8955,7 +8521,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8978,22 +8544,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9011,7 +8577,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9028,7 +8594,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9042,7 +8608,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9054,17 +8620,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9083,16 +8650,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9106,7 +8673,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9116,13 +8683,14 @@ msgstr ""
 "\n"
 "Elküldi a bot a megadott szöveget a csatornára."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Syntax: SEND { nick  |  #szoba } memo-szöveg\n"
@@ -9133,16 +8701,18 @@ msgstr ""
 "A címzett csatornának vagy nicknévnek regisztráltnak kell\n"
 "lennie."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Syntax: SENDALL memo-üzenet\n"
 "\n"
 "Memo üzenet küldése minden regisztrált felhasználónak."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9162,7 +8732,7 @@ msgstr ""
 "\n"
 "Korlátozni lehet IRC operátorokra egyes hálózatokon."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9198,7 +8768,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9215,7 +8785,66 @@ msgstr ""
 "\n"
 "Korlátozva Hoszt változtatókra."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Syntax: %s #szoba SECUREOPS {ON | OFF}\n"
+"\n"
+"Bekapcsolja vagy letiltja a secure ops opciót.\n"
+"Amikor a secure ops be van kapcsolva, akkor azok, akik \n"
+"nem szerepelnek a hozzáférési listán nem kaphatnak szoba\n"
+"operátori státuszt."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Syntax: %s #szoba SIGNKICK {ON | SZINT | OFF}\n"
+"\n"
+"Engedélyezi vagy letiltja a signed kick opciót a csatornán\n"
+"Amikor a SIGNKICK be van állítva, a %S KICK parancsával\n"
+"végrehajtott kirúgásokban az indokban szerepel az op neve.\n"
+"\n"
+"Ha használod a LEVEL-t, akkor azok, akiknek a szintje\n"
+"megegyezik vagy magasabb, mint a signkick szintje, azoknak\n"
+"a neve nem fog szerepelni a kick indokjában.\n"
+"Lásd még: /msg %S HELP LEVELS bõvebb információkért. "
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Syntax: %s #szoba TOPICLOCK {ON | OFF}\n"
+"\n"
+"Engedélyezi vagy letiltja a topic lezárása opciót a \n"
+"csatornán. Ha a topic lezárása be van kapcsolva,a %S nem\n"
+"engedélyezi a csatornán a topic változtatását a TOPIC\n"
+"paranccsal."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9226,6 +8855,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9249,7 +8879,7 @@ msgstr ""
 "Megjegyzés: ezekhez a parancsokhoz a hozzáférést a\n"
 "levels-ben lehet állítani."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9262,7 +8892,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9278,7 +8908,7 @@ msgstr ""
 "\n"
 "Elérhetõ opciók:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9293,7 +8923,7 @@ msgstr ""
 "kirúgni, akkor se, ha nem egyeznek meg a NOKICK szinttel\n"
 "\t"
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9307,7 +8937,7 @@ msgstr ""
 "Ha engedélyezve van, akkor a hangadókat nem fogja a bot\n"
 "kirúgni, akkor se, ha nem egyeznek meg a NOKICK szinttel"
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9339,7 +8969,7 @@ msgstr ""
 "szükséges. (például, az !op használatához, meg kell\n"
 "legyen a megfelelõ szintjük az OPDEOP parancsokhoz.)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9354,7 +8984,22 @@ msgstr ""
 "Ha engedélyezve van, akkor a bot megjeleníti azoknak\n"
 "a köszöntõ üzenetét, akiknek a szintjük megfelelõ ehhez."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9370,7 +9015,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9384,7 +9029,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9401,25 +9046,17 @@ msgstr ""
 "amit egyébként a %s csinálna a csatornán, mint MODE,\n"
 "KICK, és a belépõüzenet kiírása."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Syntax: SET opció paraméterek\n"
-"\n"
-"Beállítható nicknév opciók. Az opció ezek egyike lehet:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9435,7 +9072,17 @@ msgstr ""
 "\n"
 "További információért írd be: /msg %S HELP SET opció"
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Syntax: SET opció paraméterek\n"
+"\n"
+"Beállítható nicknév opciók. Az opció ezek egyike lehet:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9445,7 +9092,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Syntax: SET  opció beállítás\n"
@@ -9462,7 +9108,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9474,30 +9120,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Syntax: SET DEBUG {ON | OFF | szám}\n"
-"\n"
-"Be vagy kikapcsolja a debug módot. Debug módban, minden a\n"
-"Szervíznek és a szervíz által küldött üzenet és persze még\n"
-"sok más üzenet rögzítésere kerül a naplófájlban. Ha megadsz\n"
-"számot is, akkor a debug mód bekapcsol és a megadott szinten\n"
-"fog muködni.\n"
-"\n"
-"Ez az opció megegyezik a parancs-sorban kiadható opcióval:\n"
-"-debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9510,7 +9133,7 @@ msgstr ""
 "szervízben.\tAz új megjelenítésnek a csoport egyik\n"
 "nickjének KELL lennie."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9524,7 +9147,7 @@ msgstr ""
 "Ez az E-mail cím szerepelni fog az INFO-id között,\n"
 "amit bárki lekérhet az INFO paranccsal."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9541,7 +9164,7 @@ msgstr ""
 "megfelelõ szinttel, ami az üzenet megjelenitéséhez\n"
 "szükséges a csatornán."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9564,18 +9187,8 @@ msgstr ""
 "az opció ki legyen kapcsolva(OFF)\tvagy el legyen rejtve\n"
 "az információ(ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9589,7 +9202,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9607,7 +9220,7 @@ msgstr ""
 "kérlek ne használd ezt az opciót csak ha nagyon indokolt.\n"
 "A network adminisztrátorok letilthatják ezt."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9622,7 +9235,7 @@ msgstr ""
 "írja.(Például: amikor válaszol egy parancsra, amit te \n"
 "adtál ki). A sorszám alapján válaszd ki a nyelvezetet:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9639,7 +9252,7 @@ msgstr ""
 "küldhet üzenetet a nickedre/csatornára. Mindamellett,\n"
 "nem állíthatod ezt a számot többre, mint %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9681,7 +9294,7 @@ msgstr ""
 "korlátot de nem törölhetik, és nem állíthatnak %d érték \n"
 "felett valamint HARD korlátot."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9690,7 +9303,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %S settings"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9705,10 +9318,11 @@ msgstr ""
 "Az MSG beállítással, a szervíz, privát üzeneteket fog\n"
 "használni, egyébként pedig noticeokat."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9723,7 +9337,7 @@ msgstr ""
 "Ez az opció megegyezik a parancs-sorban kiadható opcióval:\n"
 "-noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9759,7 +9373,7 @@ msgstr ""
 "\n"
 "Az ON ekvivalens a LOGON és a NEW kombinálásával."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9770,7 +9384,7 @@ msgstr ""
 "\n"
 "Megváltoztatja a nicknév tulajdonosának jelszavát."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9790,7 +9404,7 @@ msgstr ""
 "(Máskülönben, bárki kaphat információt a nicknevedrõl\n"
 "használva az INFO parancsot.)"
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9820,16 +9434,16 @@ msgstr ""
 "Ez a parancs egyenértéku a parancs-sorban kiadott\n"
 "-readonly opcióval.\t"
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9843,7 +9457,7 @@ msgstr ""
 "nem fog automatikusan nevet váltóztatni a %S, hacsak\n"
 "nincs bekapcsolva a KILL opció."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9859,14 +9473,15 @@ msgstr ""
 "Ez az opció nem ajánlott, csak akkor használd, ha \n"
 "szükséges és kapcsold ki, ha már nem."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Syntax: SETALL <nick> <hosztmaszk>.\n"
@@ -9878,7 +9493,7 @@ msgstr ""
 "a nickeket a csoportban a parancs után jegyezték\t\n"
 "Korlátozva Hoszt változtatókra."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9890,10 +9505,11 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -9929,7 +9545,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -9977,10 +9593,11 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10059,7 +9676,8 @@ msgstr ""
 "és írd be: /msg %S HELP SET XOP hogy megnézd, hogyan \n"
 "tudsz váltani az xOP rendszerrõl access lista rendszerre."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10075,31 +9693,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10148,21 +9766,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10172,16 +9776,18 @@ msgstr ""
 "Kijelzi az összes szervíz résztvevõ nickjét, szintjét és \n"
 "on-line helyzetét."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Syntax: STAFF memo-üzenet\n"
 "\n"
 "Memo üzenet küldése az opereknek/adminoknak."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10223,7 +9829,7 @@ msgstr ""
 "A RESET beállítás nullázza az aktuális felhasználók max.\n"
 "számát átírja a jelenlegi felhasználó számra\t"
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10249,12 +9855,13 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10294,7 +9901,7 @@ msgstr ""
 "figyelmen kívül hagyja. If no nickname is given, your status\n"
 "will be returned."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10313,7 +9920,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10323,7 +9930,8 @@ msgstr ""
 "\n"
 "Erõszakkal meváltóztatja a user nickevét újnicknévre."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10336,31 +9944,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10406,7 +10014,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10430,7 +10038,7 @@ msgstr ""
 "Alapból a szoba founder szintû userei használhatják\n"
 "csak a csatornán. "
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10444,7 +10052,7 @@ msgstr ""
 "módjait megváltoztassa. Parameterek ugyanazok mint a\n"
 "szabvány /MODE parancsnál."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10462,7 +10070,7 @@ msgstr ""
 "Azaz nem kell újra bekonfigurálnod, ha késõbb vissza\n"
 "akarod hozni a szobádba."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10481,7 +10089,7 @@ msgstr ""
 "Alapbeállítás szerint, min. AOP vagy 5-ös access szinttel\n"
 "kell rendelkezned, hogy használhasd.\t"
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10498,7 +10106,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10512,7 +10120,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10526,7 +10134,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10551,12 +10159,14 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10572,10 +10182,11 @@ msgstr ""
 "a VOP listán vagy 3-as access szinten szereplo userek\n"
 "használhatják saját maguk voiceolására."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10651,7 +10262,7 @@ msgstr ""
 "be: /msg %S HELP SET XOP hogy megnézd, hogyan tudsz \n"
 "váltani az xOP rendszerrol az access lista rendszerre."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10667,7 +10278,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10675,7 +10286,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10683,7 +10294,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10696,144 +10307,145 @@ msgstr ""
 "módokat, (ModeonID)és frissíti a vhostod, az userflagjeid\n"
 "(utolsó fellépés, stb.)"
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC #szoba [topic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "Az  IMMED opció nem elérhetõ ezen a hálózaton."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "Az AKILL lista törölve."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "A Defcon szint most: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "Az SNLINE lista törölve."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "Az SQLINE lista törölve."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "Az SZLINE lista törölve"
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "A következõ lehetõségek/funkciók elérthetõek.\n"
 "Megjegyzés: az AUTODEOP és NOJOIN esetén maximum szintrõl\n"
 "az összes többi esetén minimum szintrõl van szó."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "A %s hoszt aktuálisan %d sessiont használ, a határértéke %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "Az utolsó memo, amit %s részére (%s idõpontban) küldtél már olvasott."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Az utolsó memo, amit %s részére (%s idõpontban) küldtél még olvasatlan."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Nem változtathatod meg %s üzeneteinek számát."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Az új megjelenítés: %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "A nicked %s meg lett változtatva erre: %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Összesen %d üzenet van a %s csatornán."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10841,7 +10453,7 @@ msgstr ""
 "Nem áll rendelkezésre bot.\n"
 "Kérj meg egy szervíz admint, hogy csináljon!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10851,12 +10463,12 @@ msgstr ""
 "Írd: /msg %s HELP GLIST és /msg %s HELP DROP\n"
 "bõvebb információkért."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "%d üzenete van a %s szobának."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10864,28 +10476,28 @@ msgstr ""
 "Új üzenete érkezett a %s szobának.\n"
 "Ha szeretnéd elolvasni, írd be: /msg %s READ %s %d."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Nincsen bot kijelölve %s szobában többet."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Nincs fellépõ üzenet."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Nincs oper news."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Nincs véletlenszerû hír."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Nincs beállítva email cím a nevedhez."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10901,32 +10513,28 @@ msgstr ""
 "    PRIVATE          Megelõzi, hogy egy botot nem IRCop személy\n"
 "                       társíthasson"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Ez a szoba forbidolva lett."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ez a szoba a %s adatbázisában regisztrált."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "A szoba használata felfüggesztve."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Ez a csatorna nem használható."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Ez a csatorna nem fog elévülni."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -10934,7 +10542,7 @@ msgstr ""
 "Ezt a nicket már kérelmezték, ellenõrizd az e-mail cimed, egy levélben van a "
 "kódod."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -10942,7 +10550,7 @@ msgstr ""
 "A nick az emailben elküldött kóddal való aktíválásra vár a regisztráció "
 "befejezéséhez."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -10950,20 +10558,20 @@ msgstr ""
 "Ez a nick már regisztrált.  Kérlek válassz másikat.\n"
 "Ha ez a te nicked, akkor /msg %s IDENTIFY jelszó! "
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Ez a nicknév regisztrált; te nem használhatod."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -10973,15 +10581,15 @@ msgstr ""
 "akkor /msg %s IDENTIFY jelszó!\n"
 "Különben válassz másik nicknevet!"
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Ez a nicknév nem használható. Kérlek válassz másikat!"
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Ez a nicknév nem fog elévülni."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10989,44 +10597,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Témaváltás lezárása"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Témamegõrzés"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Topic lock option for %s is now OFF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Topic lock option for %s is now ON."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Topic retention option for %s is now OFF."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Topic retention option for %s is now ON."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Kapcsold ki a caps lockod!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "A parancsokkal kapcsolatos további segítségért\n"
@@ -11036,7 +10635,7 @@ msgstr ""
 "olvashatja a szoba memo üzeneit. Ez megváltoztatható a\n"
 "%s LEVELS paranccsal."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11046,7 +10645,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11054,7 +10653,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11062,7 +10661,7 @@ msgstr ""
 "Írd be: /msg %S HELP SET opció bõvebb információért az\n"
 "adott opcióról."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11071,127 +10670,108 @@ msgstr ""
 "Írd be: /msg %S SET EMAIL e-mail \n"
 "Az email címed nem lesz kiadva harmadik személynek."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Használd a: /msg %s LIST NEW parancsot"
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Használd a /msg %s READ %d parancsot."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Használd a /msg %s READ LAST parancsot."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick mód"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN #szoba"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN #szoba [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND #szoba"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Nem sikerült a betölteni a %s modult"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Nem sikerült eltávolítani a %s modult"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Ismeretlen SET opció: %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Ismeretlen STATS opció: %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Ismeretlen Parancs %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Ismeretlen parancs %s. Írd be: \"/msg %s HELP\"."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Ismeretlen mód karakter: %c figyelmen kívül hagyva."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Ismeretlen beállítás %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Ismeretlen opció: %s.\n"
-"További információért írd be: /msg %S HELP KICK "
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Ismeretlen opció: %s.\n"
 "Használd /msg %S HELP SET információért."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Adatbázis mentve."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "%s felhasználó nincs a nickserv db fájlban."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Felhasználó\t : %6d bejegyzés, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11199,11 +10779,11 @@ msgstr ""
 "User claiming your nick has been killed.\n"
 "/msg %s RELEASE %s to get it back before %s timeout."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "Fehasználó társítása szobával kivétel."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11211,66 +10791,76 @@ msgstr ""
 "Felhasználó lista:\n"
 "Nick                 Maszk"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP #csatorna { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Voices védelme"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"%s VOP listája:\n"
-"  Sorszám  Nicknév"
+"Figyelem: Fogadható üzenetek maximális számát (%d).\n"
+"Nem fogadhatsz több üzenetet, amíg törölsz néhányat."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Voices védelme"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Figyelem: Fogadható üzenetek maximális száma (%d).\n"
+"Nem fogadhatsz több üzenetet, amíg nem törölsz néhányat."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Figyelj a stílusra kiskomám!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Már tagja vagy ennek a csoportnak: %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Már be vagy azonosítva. :-)"
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Te nem vagy már Szuper-Admin"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Nem tartózkodhatsz ezen a csatornán."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Nem változtathatod meg a max. fogadható üzenetek számát."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Most már Szuper-Admin vagy"
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Most már IRC Operátor vagy!"
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11278,36 +10868,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Mostantól tagja vagy a %scsoportnak."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Nem ghostolhatod ki magad!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "%s nem tud kijelentkezni, mert õ egy Services Operator."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Nem használhatod az aktiv nickedre!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11317,7 +10912,7 @@ msgstr ""
 "Használd az AOP, SOP és VOP parancsokat helyette.\n"
 "Írd be: /msg %s HELP parancs bõvebb információért."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11327,7 +10922,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11335,66 +10930,66 @@ msgstr ""
 "Nem használhatod a parancsot. Használd az ACCESS parancsot.\n"
 "Bõvebb információ: /msg %s HELP ACCESS"
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "%s max. bejövõ üzenetek száma nem lehet több, mint %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "A max. bejövõ üzenetek száma nem lehet több, mint %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Nem törölheted ezen a hálózaton az e-mail címed."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Van %d üzeneted, ebbõl %d olvasatlan."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Van %d üzeneted, ebbõl 1 olvasatlan."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Van %d üzeneted."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Van %d üzeneted; és mind olvasatlan."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Van 1 olvasatlan üzeneted."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Van 1 üzeneted."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Jelenleg nincs üzeneted."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "%d darab új üzeneted van."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Van egy új üzeneted."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11402,35 +10997,39 @@ msgstr ""
 "%s küldött egy új üzenetet.\n"
 "Ha szeretnéd elolvasni, írd be: /msg %s READ %d."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "%s csatornán a tiltást levetetted magadról."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Korlátlan számú üzenetet fogadhatsz."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Nincs üzeneted."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Nem kaptál új üzenetet."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr ""
 "Használj érvényes számot idõnek. \n"
 "(Adj meg érvényes számot az idõhöz.)"
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11438,64 +11037,56 @@ msgstr ""
 "Társítanod kellene egy botot a csatornára mielõtt használod\n"
 "ezt a parancsot, írd be /msg %S HELP ASSIGN bõvebb infókért."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "A csatornán operátornak kell lenned, hogy regisztrálhasd."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "A nicked regisztrálásához %d másodpercnél régebben kell csatlakozva lenned."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Rögzítened kell a +i módot is, ha a +K módot rögzíted."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Rögzítened kell a +l módot is, ha a +L módot rögzited."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
 "case you forget it."
 msgstr "Be kell állítanod egy E-mail címet a nicknevedhez."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Értesítést kapsz új üzenetek érkezésérõl csatlakozáskor."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Értesítést kapsz az új üzeneteidrõl,ha fellépsz az IRC-re."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Értesítést kapsz új üzenetek érkezésekor."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Ezentúl nem tudsz üzeneteket fogadni."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "Már nem kapsz értesítést emailben."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Nem kapsz értesítést az új üzeneteidrõl."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "Az új memo üzeneteidrõl emailben kapsz értesítést."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11503,34 +11094,54 @@ msgstr ""
 "Ön ircdje nem támogatja a videnteket, ha ez nem igaz,\n"
 "akkor kérem jelentse ezt, mint lehetséges hibát."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "%s autokick listája üres."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Mellõzöttek lista üres."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Ezentúl korlátlan számú üzenetet fogadhatsz."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "A max. bejövõ üzenetek számanak új értéke: %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "A max. bejövõ üzentek száma: %d,ez fix érték."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "A maximálisan fogadható üzentek száma:  %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "A max. bejövõ üzentek száma: 0; és több nem jöhet."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11538,178 +11149,727 @@ msgstr ""
 "A max. bejövõ üzentek száma: 0; és nem köhet több. \n"
 "Ez nem változtatható meg."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "A nicked sikeresen kijelentkezett."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "A nicked már regisztrált; írd be /msg %s DROP elõször."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "A neved még nem regisztrált."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "A nickneved dropolva lett,"
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "A nickneved most meg lesz változtatva: %s."
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "A kód újra el lett küldve erre a címre: %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Jelszavad: %s - jegyezd meg a késõbbi használathoz!"
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Your password is too long. Please try again with a shorter password."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "A %s virtuális hosztod aktiválva."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "A  %s@%s virtuális hosztod aktiválva."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Fellépési Hír] - %s %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Oper Hír] - %s %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Véletlenszerû Hír] - %s %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "letiltva"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "nem fog elévülni"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "engedélyezve"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "elévül a következõ adatbázis mentésnél"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "elévül %d nap múlva"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "elévül %d nap múlva"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "elévül %d perc múlva"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "elévül %d perc múlva"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "%s vhosztja törölve lett."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "%s vhostja erre változott: %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "%s vhostja erre változott: %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "A %s csoport vhostja %s lett."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "A %s csoport vhostja erre változott: %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "A %s csoport vhostja törölve."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "xOP lista rendszer"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "xOP lists system for %s is now OFF."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "xOP lists system for %s is now ON."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | #szoba} memo-szöveg"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s hozzáadva %s AOP listához."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s hozzáadva %s HOP listához."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s hozzáadva %s SOP listához."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s hozzáadva %s VOP listához."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s törölve lett a %s HOP listáról."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s törölve lett a %s SOP listáról."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s törölve lett a %s VOP listáról."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s  áthelyezve a %s HOP listára."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s  áthelyezve a %s SOP listára."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s  áthelyezve a %s VOP listára."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s nem találatható a %s HOP listán."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s nem találatható a %s SOP listán."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s nem találatható a %s VOP listán."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr "    PRIVATE    A nickneved /msg %S LIST -ból való elrejtése"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d nap"
+
+#~ msgid "%d hours"
+#~ msgstr "%d óra"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d perc"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d másodperc"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "%s HOP listája üres."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "%s SOP listája üres."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "%s VOP listája üres."
+
+#~ msgid "1 day"
+#~ msgstr "1 nap"
+
+#~ msgid "1 hour"
+#~ msgstr "1 óra"
+
+#~ msgid "1 minute"
+#~ msgstr "1 perc"
+
+#~ msgid "1 second"
+#~ msgstr "1 másodperc"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Használhatja a CLEAR parancsot."
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Használhatja a HALFOP/DEHALFOP parancsokat"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Channel %s HOP list has been cleared."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Channel %s SOP list has been cleared."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Channel %s VOP list has been cleared."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "%d bejegyzés törölve a %s HOP listáról."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "%d bejegyzés törölve a %s SOP listáról."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "%d bejegyzés törölve a %s VOP listáról."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "1 bejegyzés törölve a %s HOP listáról."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "1 bejegyzés törölve a %s SOP listáról."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "1 bejegyzés törölve a %s VOP listáról."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "E-mail cím törölve."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP #szoba { ADD | DEL | LIST | CLEAR }[ nick | sorszám]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Vége a felhasználó listának."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "%s csatorna belépõ üzenete törölve."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "A Bot nincs a %s csatornán."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "    Köszöntõ üzenet: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Access list for %s is empty."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "%s hozzáférési listája:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "%s csatorna belépõ üzenete megváltozott."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Fantasy mód most OFF a %s csatornán."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Üdvözlõ mód most OFF a %s szobán."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "%s HOP listája:\n"
+#~ "  Sorszám  Nicknév"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Belsõ hiba - nem teljesíthetõ kérés."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Logon news tétel #%d törölve."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Nicknév Regisztráció (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Nicknév jelszó (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Nincs # a szoba neve elõtt."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Nincs Bot mód most OFFa %s szobán."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Nincs ilyen bejegyzés a %s HOP listán."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Nincs ilyen bejegyzés a %s SOP listán."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Nincs ilyen bejegyzés a %s VOP listán."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Nem található (#%d) a %s AOP listán."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Nem található (#%d) a %s HOP listán."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Nem található (#%d) a %s SOP listán."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Nem található (#%d) a %s VOP listán."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Op-notice option for %s is now OFF."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Peace option for %s is now OFF."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr "Kérlek, várj %d másodpercet mielõtt SEND parancsot újra használod!"
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Private mód a %s botban most OFF."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Private option for %s is now OFF."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "A Kill védelem opció most már ON, késleltetés nélkül."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER jelszó [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Restricted access option for %s is now OFF."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "%s SOP listája:\n"
+#~ "  Sorszám  Nicknév"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Channel %s not registered"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND #szoba [indok]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Secure founder option for %s is now OFF."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Secure ops option for %s is now OFF."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Secure option for %s is now OFF."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Szervíz nem tudja változtatni a módokat.\n"
+#~ "A szervereid jól vannak beállítva?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Szervíz fent van %d nap, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Szervíz fent van %d óra, %d perce"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Szervíz fent van %d óra, %d perce"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Szervíz fent van %d óra, %d perce"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Szervíz fent van %d perc, %d másodperce."
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Szervíz fent van %d perc, %d másodperce."
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Szervíz fent van %d perc, %d másodperce."
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Signed kick option for %s is now OFF."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr "Csatorna HOP lista módosítás szünetel."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr "Csatorna SOP lista módosítás szünetel."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr "Csatorna VOP lista módosítás szünetel."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr "Csak %d számú helyed van a csatorna VOP/AOP/SOP listán."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Együttélés mód most OFFa %s szobán."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Syntax: RANDOMNEWS ADD szöveg"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR #szoba mit?"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Syntax: OPERNEWS ADD szöveg"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Syntax: SET DEBUG {ON | OFF | szám}\n"
+#~ "\n"
+#~ "Be vagy kikapcsolja a debug módot. Debug módban, minden a\n"
+#~ "Szervíznek és a szervíz által küldött üzenet és persze még\n"
+#~ "sok más üzenet rögzítésere kerül a naplófájlban. Ha megadsz\n"
+#~ "számot is, akkor a debug mód bekapcsol és a megadott szinten\n"
+#~ "fog muködni.\n"
+#~ "\n"
+#~ "Ez az opció megegyezik a parancs-sorban kiadható opcióval:\n"
+#~ "-debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Szintaktika: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Topic lock option for %s is now OFF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Topic retention option for %s is now OFF."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Ismeretlen Parancs %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Ismeretlen opció: %s.\n"
+#~ "További információért írd be: /msg %S HELP KICK "
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "%s felhasználó nincs a nickserv db fájlban."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "%s VOP listája:\n"
+#~ "  Sorszám  Nicknév"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "A %s nevû bot törölve."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] A memo, amit %s számára küldtél meg lett tekintve."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] A memo, amit %s számára küldtél meg lett tekintve."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "%s részére küldött utolsó memo üzenet visszavonva."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "A %s virtuális hosztod aktiválva."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "A %s nevû bot törölve."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/lang/anope.it_IT.po b/language/anope.it_IT.po
index 76429e932..7b99d321f 100644
--- a/lang/anope.it_IT.po
+++ b/language/anope.it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:40-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s per altre informazioni."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Per maggiori informazioni su un comando specifico,\n"
 "digita /msg %S HELP comando."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -53,14 +53,15 @@ msgstr ""
 "Per maggiori informazioni sull'uso di un comando\n"
 "specifico, digita /msg %S HELP comando."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S permette di registrare i canali e di controllarne\n"
@@ -72,12 +73,12 @@ msgstr ""
 "un comando specifico, digita /msg %S HELP comando.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -90,122 +91,106 @@ msgstr ""
 "\n"
 "I comandi di %S sono:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s ha cambiato il livello DEFCON a %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s aggiunto alla lista AOP di %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s aggiunto alla lista HOP di %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s aggiunto alla lista SOP di %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s aggiunto alla lista VOP di %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s aggiunto alla lista di accesso di %s con il livello %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s aggiunto alla lista autokick di %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s aggiunto alla lista delle parolacce di %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s aggiunto alla lista AKILL."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s aggiunto alla lista SNLINE."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s aggiunto alla lista SQLINE."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s aggiunto alla lista SZLINE."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s è già presente nella lista delle parolacce di %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s è già presente nella lista autokick di %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s è già presente nella lista AKILL."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s esiste già nella lista EXCEPTION."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s è già presente nella lista SNLINE."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s è già prsente nella lista SQLINE."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s è già presente sulla lista SZLINE."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s non può essere utilizzato come il numero di kick che porta al ban."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s ha modificato i tuoi modi utente."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -214,132 +199,113 @@ msgstr ""
 "%s lista canali:\n"
 "Nome                 Utenti Modi    Topic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s eliminato dalla lista AOP di %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s eliminato dalla lista HOP di %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s eliminato dalla lista SOP di %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s eliminato dalla lista VOP di %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s è stato eliminato dalla lista di accesso di %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s è stato eliminato dalla lista autokick di %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s è stato eliminato dalla lista delle parolacce di %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s eliminato dalla lista delle eccezioni."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s eliminato dalla lista AKILL."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s eliminato dalla lista SNLINE."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s eliminato dalla lista SQLINE."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s eliminato dalla lista SZLINE."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "La maschera %s è stata eliminata dalla tua lista di accesso."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s disabilitato sul canale %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s ha registrato troppi nick."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s è già coperto da %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s non è un tipo di ban valido."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s non è un bot valido o un canale registrato."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s non è un indirizzo e-mail valido."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s da adesso non è più sempre attivo su %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s al momento non è nel canale %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s da adesso è sempre attivo su %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s non trovato nella lista ignore."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -348,107 +314,72 @@ msgstr ""
 "%s corrisponde a un'eccezione %s e non può essere bannato finché l'eccezione "
 "non sarà rimossa."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s spostato alla lista AOP di %s."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s spostato alla lista HOP di %s."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s spostato alla lista SOP di %s."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s spostato alla lista VOP di %s."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s non trovato nella lista AOP di %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s non trovato nella lista HOP di %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s non trovato nella lista SOP di %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s non trovato nella lista VOP di %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s non trovato nella lista nella lista di accesso di %s."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s non trovato nella lista autokick di %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s non trovato nella lista delle parolacce di %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s non trovato nella lista delle sessioni."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "Impossibile trovare %s nella lista delle eccezioni."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s non trovato nella lista AKILL."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s non trovato nella lista SNLINE."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s non trovato nella lista SQLINE."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s non trovato nella lista SZLINE."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "La maschera %s non è stata trovata nella tua lista di accesso."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "La maschera %s è stata eliminata dalla tua lista di accesso."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -457,33 +388,33 @@ msgstr ""
 "Lista dei nick di %s:\n"
 "Nick                 Mask"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s non è più ignorato."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s sarà ignorato per  %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s sarà ignorato permanentemente."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Nota: Tutti i comandi inviati a %S sono loggati!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Nota: i Services sono in modalità read-only; le modifiche non saranno "
 "salvate!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -491,11 +422,11 @@ msgstr ""
 "Nota: le mask delle AKILL non possono contenere nick; assicurati di non aver "
 "incluso una porzione di nick nella mask."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Nota: puoi aggiungere solo mask dell'ip alla lista SZLINE."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -539,41 +470,38 @@ msgstr ""
 "aggiungere altri, usando il comando LEVELS. Digita\n"
 "/msg %S HELP LEVELS per maggiori informazioni."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Attenzione: Hai superato il numero massimo di memo (%d). Non potrai "
-"raggiungere nuovi memo finché non ne elimini alcuni."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Attenzione: Hai raggiunto il numero massimo di memo (%d). Non potrai "
-"raggiungere nuovi memo finché non ne elimini alcuni."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] Il memo che hai inviato è stato letto."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Il memo che hai inviato a %s è stato letto."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER password email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER password email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP destinatario password"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -584,7 +512,7 @@ msgstr ""
 "o per altre azioni maliziose. L'abuso di %S\n"
 "risulterà, come minimo, nella perdita del proprio nick."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -597,7 +525,7 @@ msgstr ""
 "la lista di accesso, la lista AKICK e le liste di configurazione\n"
 "dei livelli per qualsiasi canale."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -608,371 +536,387 @@ msgstr ""
 "senza doversi identificare per quel nick, e possono visualizzare\n"
 "le liste di accesso per qualunque nick (/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "Opzioni: %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "                      vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \t      vhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "Nick del bot: %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "Nick del bot: nessun bot assegnato."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "                    Opzioni: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "   Kick in caso di maiuscole: %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "   Kick in caso di maiuscole: %s (%d portano al ban; minimo %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "   Kick in caso di maiuscole: %s (minimo %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "            Fondatore: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "          Tipo di ban: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "   Kick in caso di grassetto: %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "   Kick in caso di grassetto: %s (%d kick portano al ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kick in caso di flood: %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr ""
 "       Kick in caso di flood: %s (%d kick portano al ban; %d linee in %d "
 "secondi)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kick in caso di flood: %s (%d linee in %d secondi)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "        Hostmask: %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Kick in caso di colori: %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Kick in caso di colori: %s (%d portano al ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "          Tipo di ban: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "      Ultimo utilizzo: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Modi bloccati: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr " Kick in caso di ripetizioni: %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr " Kick in caso di ripetizioni: %s (%d kick portano al ban; %d volte)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr " Kick in caso di ripetizioni: %s (%d volte)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "           Successore: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Sospeso: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "   Kick in caso di maiuscole: %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "   Kick in caso di grassetto: %s (%d kick portano al ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "             Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "             Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "         Ultimo topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "Data di registrazione: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (disabilitato)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (solo per il fondatore)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifica la lista degli indirizzi autorizzati"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Modifica la lista degli utenti con privilegi"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr "ACT          Invia un /me in canale"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Modifica la lista AutoKick"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Modifica la lista AutoKick"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Manipola la lista AKILL"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      Mostra i canali in cui si ha accesso"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Modifica la lista degli utenti AOP"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN       Assegna un bot a un canale"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS     Gestisce la lista delle parolacce"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Permette di bannare un utente"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       Imposta il tipo di ban che sarà usato dai Services"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT          Gestisce la lista dei bot disponibili"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST      Mostra la lista dei bot disponibili"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Annulla l'ultimo memo inviato"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL tutti gli utenti su di un canale specifico"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Mostra tutti i canali"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Controlla se l'ultimo memo ad un nick è stato letto"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Annulla varie impostazioni del canale"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  \"Pulisce\" i modi di un canale"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Conferma un \"auth code\" di nickserv"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "Data di crazione: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipola il sistema DefCon"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Toglie lo stato di mezzo operatore a un utente "
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Rimuove il vhost di un altro utente"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Cancella uno o più memo"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Rimuove il vhost da tutti i nick di un gruppo"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Toglie lo stato di operatore a un utente (-o)"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Toglie lo stato di owner a un utente "
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Toglie lo stato di protezione a un utente "
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Imposta la descrizione del canale"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Toglie lo stato di voice a un utente (-v)"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Imposta il nome del gruppo"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Imposta il nome del tuo gruppo"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Annulla la registrazione di un canale"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Annulla la registrazione del nick"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "          Descrizione: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associa un indirizzo e-mail al nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Associa un indirizzo e-mail al tuo nick"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Imposta un messaggio che sarà inviato agli utenti\n"
-"                     che entrano nel canale"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr ""
 "    EXCEPTION   Modifica la lista delle eccezioni al limite delle\n"
 "                sessioni"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Blocca un canale in modo che non venga usato"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Blocca un nick in modo che non venga usato"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Imposta il fondatore del canale"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -980,291 +924,282 @@ msgstr ""
 "    GETEMAIL   Mostra l'elenco degli utenti registratisi con l'indirizzo "
 "email specificato"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Recupera la password (chiave) di un canale"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Recupera la password di un nick\n"
 "               (solo se la criptazione è disattivata)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnette un nick fantasma che non è ancora caduto"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Mostra la lista di tutti i nick nel proprio gruppo"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Invia un messaggio a tutti gli utenti"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associa un messaggio di saluto al nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Associa un messaggio di saluto al tuo nick"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Sincronizza il vhost per tutti i nick nel gruppo"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Entra in un gruppo"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "Messaggio di saluto (greet): %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Assegna lo stato di mezzo operatore a un utente (+h)"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Nasconde alcune informazioni sul tuo nick"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Modifica la lista degli utenti HOP"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Ti identifica per il tuo nick"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Modifica la lista ignore dei Services"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Modifica la lista ignore dei Services"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
 msgstr "INFO         Mostra informazioni su un bot o su un canale"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Mostra le informazioni su un nick"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Mostra le informazioni su un canale"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Mostra informazioni sui tuoi nuovi memo"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        Disabilita (\"jupiter\") un server"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr "    KEEPTOPIC     Mantiene il topic quando il canale non è in uso"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK         Configura i kick"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Kicka un utente da un canale"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Espelle un utente da un canale (kick)"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Attiva o disattiva la protezione"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
 msgstr "    LANGUAGE   Imposta la lingua utilizzata dai Services"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Ridefinisce i privilegi dei livelli di accesso"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Mostra uno o più vhost nel database"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr "    LIST       Mostra l'elenco dei nick registrati"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr "    LIST       Mostra la lista dei canali"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Mostra la lista dei propri memo"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   Definisce i messaggi da mostrare agli utenti\n"
 "                quando si connettono"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Deidentifica dal proprio nick"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Imposta il blocco dei modi di canale"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Cambia dei modi di un canale"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  \"Pulisce\" i modi di un canale"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Informazioni su un modulo caricato"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Elenca i moduli caricati"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Carica un modulo"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Carica un modulo"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Rimuovi un modulo"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Cambia il metodo di comunicazione usato dai Services"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Evita che il nickname scada"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
 msgstr "    NOOP        Rimuove temporaneamente tutte le O:line di un server"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Disattiva il tuo vhost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Imposta le operflag di un utente"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Attiva il tuo vhost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Assegna lo stato di operatore a un utente (+o)"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr "    OPERNEWS    Definisce i messaggi da mostrare agli operatori"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Invia una notifica quando vengono usati i comandi\n"
 "                     OP/DEOP"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Assegna lo stato di owner a un utente (+q)"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "         Opzioni: %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Imposta la password del nick"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Imposta la password del tuo nick"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Regola l'uso dei comandi critici"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Nasconde il canale dall'output del comando LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr "    PRIVATE    Nasconde il nick dalla lista (/msg %S LIST)"
-
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr "    PRIVATE    Nasconde il nick dalla lista (/msg %S LIST)"
 
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Assegna lo stato di protezione a un utente (+a)"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Termina i Services senza salvare i database"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1272,244 +1207,247 @@ msgstr ""
 "    RANDOMNEWS  Definisce i messaggi da mostrare casualmente\n"
 "                agli utenti quando si connettono"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Legge uno o più memo"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER    Disconnette un altro utente che usa il tuo nick"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Registra un nick"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Registra un nick"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 "    RELEASE    Permette di usare di nuovo il proprio nick dopo un RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Rilegge il file di configurazione dei Services"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Reinvia un \"auth code\" di nickserv"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords."
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Salva i database e riavvia i Services"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Limita l'accesso al canale"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Invia un memo e richiede una notifica di lettura"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "     Kick in caso di reverse: %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "     Kick in caso di reverse: %s (%d kick portano al ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Imposta le opzioni SET su un altro nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr "SAY          Fa sì che il bot dica qualcosa in canale"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Attiva le funzionalità di sicurezza di %S"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Attiva o disattiva la sicurezza"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr ""
 "    SECUREFOUNDER Abilita un controllo più severo dello stato di\n"
 "                     fondatore"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr ""
 "    SECUREOPS     Abilita un controllo più severo dello stato di\n"
 "                     operatore"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Invia un memo a un nick o a un canale"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL Invia un memo a tutti gli utenti registrati"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Invia la password del proprio nick via e-mail"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Mostra la lista delle sessioni degli host"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET          Imposta le opzioni del bot"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Imposta il vhost di un altro utente"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Imposta varie opzioni globali dei Services"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Imposta le opzioni e le informazioni di canale"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Imposta le opzioni, inclusa la protezione"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Imposta le opzioni relative ai memo"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Imposta il vhost per tutti i nick di un gruppo"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Termina i Services salvando i database"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      \"Firma\" i kick effettuati con il comando KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Manipola la lista SNLINE"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Modifica la lista degli utenti SOP"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Manipola la lista SQLINE"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Mostra lo staff dei services con stato online"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF Invia un memo a tutti gli opers/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Mostra lo stato dei Services e della rete"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS      Restituisce il livello di accesso corrente di\n"
 "                un utente su un canale"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Indica lo stato di identificazione di un nick"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Imposta il successore del fondatore del canale"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Impedisce l'utilizzo di un canale mantenendo\n"
 "               i dati e le impostazioni"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Sospendi il nick specificato"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Forza il cambio del nickname di un utente"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Manipola la lista SZLINE"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Cambia il topic di un canale"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr ""
 "    TOPICLOCK     Imposta il blocco del topic (modificabile solo\n"
 "                     attraverso il comando TOPIC)"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Cambia i modi utente di un utente"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN     Rimuove il bot da un canale"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Rilascia un canale sospeso"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Rilascia il nick specificato"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1517,85 +1455,85 @@ msgstr ""
 "    UPDATE      Forza la scrittura su disco immediata dei database\n"
 "                dei Services"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Aggiorna il tuo stato attuale, ovvero controlla eventuali "
 "nuovi memo"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Mostra tutti gli utenti"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "        Usato su: %d canale/i"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Assegna lo stato di voice a un utente (+v)"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Modifica la lista degli utenti VOP"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Seleziona il sistema di privilegi utilizzato"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (scade tra %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Kick in caso di parolacce: %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Kick in caso di parolacce: %s (%d kick portano al ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "           Indirizzo e-mail: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "                Connesso da: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "             Ultimo accesso: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "   Topic impostato da: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1604,17 +1542,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1623,97 +1561,101 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "Messaggio di ingresso: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "        Realname: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "       Ora di registrazione: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Kick in caso di sottolineato: %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Kick in caso di sottolineato: %s (%d portano al ban ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Num  Mittente          Data/Ora"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr "\"/msg %s\" non è più supportato. Usa \"/msg %s@%s\" o \"/%s\"."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1722,7 +1664,7 @@ msgstr ""
 "%3d  %s (by %s on %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1731,25 +1673,16 @@ msgstr ""
 "%3d %s (aggiunto da %s il %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (fisso) (aggiunto da %s il %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (by %s on %s; %s)\n"
 "    Limite: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1758,349 +1691,339 @@ msgstr ""
 "%5d (%s, aggiunto da %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Comandi di %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s non viene informato dei nuovi memo."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Moduli caricati."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bot disponibili."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d giorni"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (aggiunto da %s il %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d ore"
+msgid "%d Modules loaded."
+msgstr "%d Moduli caricati."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minuti"
+msgid "%d bots available."
+msgstr "%d bot disponibili."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nick nel gruppo."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondi"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "La lista AOP di %s è vuota."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "La lista HOP di %s è vuota."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "La lista SOP di %s è vuota."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "La lista VOP di %s è vuota."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "La lista di accesso di %s è vuota."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "La lista autokick di %s è vuota."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "La lista delle parolacce di %s è vuota."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
 "%s non può essere il successore del canale %s perché ne è il fondatore."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s non può ricevere memo."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Comandi di %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr ""
 "%s La copertura è troppo ampia; per favore, usa una maschera più specifica."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s ha %d memo, di cui %d non sono stati ancora letti."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s ha %d memo, di cui 1 non è stato ancora letto."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s ha %d memo."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s ha %d memo, nessuno dei quali è stato letto."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s ha 1 memo, e non è stato ancora letto."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s ha 1 memo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s non ha alcun memo."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s attualmente ha troppi memo e non può riceverne altri."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s non ha alcun limite dei memo."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s non ha nuovi memo."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s non ha nuovi memo."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s è %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s è un services operator di tipo %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s al momento è offline."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s è online in questo momento."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s è disattivato"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s è attivato"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s non è più un SuperAdmin."
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s non viene informato dei nuovi memo."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s viene informato dei nuovi memo quando si connette e quando li riceve."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s viene informato dei nuovi memo quando si connette."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s viene informato dei nuovi memo quando li riceve."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s ora è un SuperAdmin."
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Lista AOP di %s:\n"
+"  Num  Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s non trovato nella lista autokick di %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s è stato eliminato dalla lista autokick di %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s non ti informerà dei nuovi memo."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s ti informerà dei nuovi memo quando li ricevi."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
 "you."
 msgstr "%s ti informerà dei nuovi memo quando ti connetti e quando li ricevi."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s ti informerà dei nuovi memo quando ti connetti e quando torni dall'/AWAY."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) aggiunto alla lista dei bot."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "Il limite dei memo di %s è %d, e non può essere modificato."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Il limite dei memo di %s è %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL tutti i nuovi client che si collegano"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Forza l'impostazione dei modi canale (%s) su tutti i canali"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignora tutti i non-opers con messaggio"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killa tutti i NUOVI client che si collegano"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Nessune modifiche ad MLOCK"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Nessuna nuova registrazione di canali"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Niente nuovi memo inviati"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Nessuna nuova registrazione di nick"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Ignora silenziosamente i non-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Usa il limite di sessioni ridotto a %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 giorno"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 ora"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minuto"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 secondo"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<sconosciuto>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Un memo di massa è stato inviato a tutti gli utenti registrati."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2109,136 +2032,138 @@ msgstr ""
 "Un memo di notifica è stato mandato a %s informandolo/a che hai\n"
 "letto il suo memo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "Un codice di attivazione è stato inviato a %s. Digita /msg %s CONFIRM "
 "<codice> per completare la registrazione."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "L'ident per un vhost dev'essere nel formato di un ident valido"
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr ""
 "Errore! Un vhost può contenere soltanto i caratteri A-Z, a-z, 0-9, '.' e '-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 "ACCESS canale {ADD|DEL|LIST|VIEW|CLEAR} [nick [livello] | numero-lista]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT canale testo"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mask]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK canale {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-o-usermask] [motivo]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE su %s completato; ne sono stati influenzati %d utenti."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "La lista AKILL è vuota."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista} "
 "[motivo]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista AOP di %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canale nick-del-bot"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Accesso negato."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Il livello di accesso di %s su %s è stato modificato a %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Il livello di accesso di %s su %s non è stato modificato da %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Il livello di accesso deve essere compreso tra %d e %d (inclusi)."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Il livello di accesso deve essere diverso da zero."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Impostazioni dei livelli di accesso del canale %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr ""
 "I livelli di accesso di %s sono stati ripristinati ai valori originali."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "La lista d'accesso per %s è vuota."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lista di accesso di %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Lista di accesso di %s:\n"
 "  Num   Liv  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista di accesso:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2247,22 +2172,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s aggiunto alla lista autokick di %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Aggiunta una nuova Logon News (numero %d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Aggiunta una nuova Oper News (numero %d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Aggiunta una nuova Random News (numero %d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2270,238 +2200,231 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Tutte le O:lines di %s sono state rimosse."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Tutte le O:lines di %s sono state ripristinate."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Tutti i ban del canale %s sono stati rimossi."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Tutte le eccezioni del canale %s sonostate rimosse."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Tutti gli invites sono stati rimossi dal canale %s."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Tutte le Logon News sono state eliminate."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Tutti i memo per il canale %s sono stati cancellati."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Tutti i modi sono stat annullati sul canale %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Tutti i modi del canale %s sono stati ripristinati."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Tutti i tuoi memo sono stati cancellati."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Tutte le Oper News sono state eliminate."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Tutte le Random News sono state eliminate."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Tutti gli utenti sono stati kickati dal canale %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Permette di dare/togliere il modo +h (halfop) su se stessi"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Permette di dare/togliere il modo +o (op) su se stessi"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Permette di dare/togliere il modo +a (protect) su se stessi"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Permette di dare/togliere il modo +v (voice) su se stessi"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Permette l'assegnazione e la revoca di un bot"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Permette l'uso del comando BAN su se stessi"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Permette l'uso del comando KICK su se stessi"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Permette la lista e la lettura dei memo di canale"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Permette le modifiche alla lista di accesso"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Permette l'uso del comando AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Permette l'uso del comando BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Permette l'uso del comando BAN"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Permette l'uso del comando CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Permette l'uso del comando GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Permette l'uso dei comandi HALFOP e DEHALFOP"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Permette l'uso del comando INFO con l'opzione ALL"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Permette l'uso del comando INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Permette l'uso del comando KICK"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Permette l'uso dei comandi OP e DEOP"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Permette l'uso dei comandi PROTECT e DEPROTECT"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Permette l'uso dei comandi SAY e ACT del bot"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Permette l'uso del comando SET (escluso FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Permette l'uso del comando TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Permette l'uso del comando UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Permette l'uso dei comandi VOICE e DEVOICE"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Permette l'uso dei comandi \"fantasia\" del bot"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Permette la visione della lista di accesso"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista autokick di %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Modo di canale +o automatico (op)"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Modo di canale +a automatico (protect)"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Modo di canale +h automatico (halfop)"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Modo di canale +v automatico (voice)"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canale {ADD|DEL|LIST|CLEAR} [parola | numero-lista] [SINGLE|START|"
 "END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2511,7 +2434,7 @@ msgstr ""
 "BOT CHANGE vecchionick nuovonick [ident [host [realname]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2520,111 +2443,109 @@ msgstr ""
 "Lista delle parolacce di %s:\n"
 "  Num   Parola                         Tipo"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "La lista delle parolacce è stata svuotata."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Il tipo di ban del canale %s ora è #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "I Modi binari i ban sono stati annullati sul canale %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Il bot %s è già esistente."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Il bot %s non esiste."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Il bot %s è stato assegnato a %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Il bot %s è stato modificato; ora si presenta come %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Il bot %s è stato eliminato."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Il bot %s è già assegnato al canale %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Il bot kickerà anche gli operatori sul canale %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Il bot kickerà anche i voice sul canale %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Il bot non kickerà gli operatori sul canale %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Il bot non kickerà i voice sul canale %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Gli host dei bot possono contenere unicamente caratteri validi."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents may only contain %d characters."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Gli ident dei bot possono contenere unicamente caratteri validi."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "I nick dei bot possono contenere unicamente caratteri validi."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Il bot non è sul canale %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Lista dei bot disponibili:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Il bot entrerà in canale quando c'è almeno\n"
-"%d persona."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2635,7 +2556,7 @@ msgstr ""
 "%d kick nei confronti dello stesso utente. Usa il comando BADWORDS\n"
 "per aggiungere o rimuovere le parolacce dalla lista."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2643,20 +2564,20 @@ msgstr ""
 "Il bot ora kickerà chi dice le parolacce. Usa il comando BADWORDS\n"
 "per aggiungere o rimuovere le parolacce dalla lista."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Il bot ora kickerà chi usa il grassetto, e piazzerà un ban dopo \n"
 "%d kick nei confronti dello stesso utente."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Il bot ora kickerà chi usa il grassetto."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2667,7 +2588,7 @@ msgstr ""
 "%d caratteri e il %d%% dell'intero messaggio), e piazzerà un ban\n"
 "dopo %d kick nei confronti dello stesso utente."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2676,47 +2597,47 @@ msgstr ""
 "Il bot ora kickerà chi usa le maiuscole (devono costituire almeno\n"
 "%d caratteri e il %d%% dell'intero messaggio)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Il bot ora kickerà chi usa i colors, e piazzerà un ban dopo %d \n"
 "kick nei confronti dello stesso utente."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Il bot ora kickerà chi usa i colori."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Il bot ora kickerà chi flooda (%d linee in %d secondi), e\n"
 "piazzerà un ban dopo %d kick nei confronti dello stesso utente."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Il bot ora kickerà chi flooda (%d linee in %d secondi)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2727,7 +2648,7 @@ msgstr ""
 "volte la stessa cosa), e piazzerà un ban dopo %d kick\n"
 "nei confronti dello stesso utente."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2736,137 +2657,153 @@ msgstr ""
 "Il bot ora kickerà chi ripete (gli utenti che ripetono %d\n"
 "volte la stessa cosa)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Il bot ora kickerà chi usa i reverse, e piazzerà un ban dopo %d \n"
 "kick nei confronti dello stesso utente."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Il bot ora kickerà chi usa i reverse."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Il bot ora kickerà chi usa il sottolineato, e piazzerà un ban dopo %d \n"
 "kick nei confronti dello stesso utente."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Il bot ora kickerà chi usa il sottolineato."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Il bot ora kickerà chi usa i colori."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Il bot non kickerà più chi dice le parolacce."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Il bot non kickerà più chi usa il grassetto."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Il bot non kickerà più chi usa le maiuscole."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Il bot non kickerà più chi usa i colori."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Il bot non kickerà più chi flooda."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Il bot non kickerà più chi ripete."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Il bot non kickerà più chi usa i reverse."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Il bot non kickerà più chi usa il sottolineato."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Il bot non kickerà più chi usa le maiuscole."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ:     %6d records, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bot riservati agli IrcOp:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes letti:   %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes scritti: %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canale}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+scadenza] {#canale} [motivo]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR canale cosa"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canale [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Impossibile deidentificare %s perchè è un Services Operator."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR canale cosa"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Impossibile inviare e-mail adesso; riprova più tardi."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ:    %6d records, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Modi utente di %s modificati."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Il canale %s non esiste."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Il canale %s è stato deregistrato."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2875,143 +2812,103 @@ msgstr ""
 "Il canale %s è stato vietato da %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Il canale %s è già registrato!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Il canale %s non può più essere registrato o usato."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Il canale %s ora è stato rilasciato."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Il canale %s is ora è sospeso."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Il canale %s non è registrato."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Il canale %s non può essere registrato o usato."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Il canale %s non può essere registrato."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Il canale %s è stato registrato sotto il tuo nick: %s."
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canali:      %6d records, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Il canale %s scadrà."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Il canale %s non scadrà."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "La lista AOP del canale %s è stata svuotata."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "La lista HOP del canale %s è stata svuotata."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "La lista SOP del canale %s è stata svuotata."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "La lista VOP del canale %s è stata svuotata."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La lista di accesso del canale %s è stata svuotata."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La lista autokick del canale %s è stata svuotata."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Il canale %s ora è stato rilasciato."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Il canale %s non è un canale valido."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "La lista AOP può contenere soltanto nick registrati."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "La lista HOP può contenere soltanto nick registrati."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "La lista SOP può contenere soltanto nick registrati."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Le SQLINE di canale non sono supportate da questo IRCd e sono pertanto "
 "inutilizzabili."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "La lista VOP può contenere soltanto nick registrati."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr ""
-"Le liste di accesso del canale possono contenere soltanto nick registrati."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3019,11 +2916,7 @@ msgstr ""
 "Lista dei canali:\n"
 "Nome                 Utenti Modi    Topic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Modo di canale +o non permesso (op)"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3032,7 +2925,7 @@ msgstr ""
 "Canali su cui %s ha accesso:\n"
 "  Num  Canale               Livello  Descrizione"
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3040,31 +2933,16 @@ msgstr ""
 "Canali su cui hai accesso:\n"
 "  Num  Canale               Livello  Descrizione"
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Impossibile vietare il canale %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Impossibile vietare il nick %s!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Impossibile rilasciare il canale %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Impossibile sospendere il canale %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Lista AKILL attuale:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3072,15 +2950,15 @@ msgstr ""
 "Lista AKILL attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Lista moduli attuali:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Lista SNLINE attuale:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3088,11 +2966,11 @@ msgstr ""
 "Lista SNLINE attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Lista SQLINE attuale:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3100,11 +2978,11 @@ msgstr ""
 "Lista SQLINE attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Lista SZLINE attuale:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3112,725 +2990,612 @@ msgstr ""
 "Lista SZLINE attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Lista delle eccezioni attuale:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Numero attuale di AKILL: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Numero attuale di SNLINE: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Numero attuale di SQLINE: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Numero attuale di SZLINE: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Utenti correnti: %d (%d operatori)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canale] {numero | lista | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP canale"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Durata di default delle AKILL: %d giorni"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Durata di default delle AKILL: %d ore"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Durata di default delle AKILL: %d minuti"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Durata di default delle AKILL: 1 giorno"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Durata di default delle AKILL: 1 ora"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Durata di default delle AKILL: 1 minuto"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Durata di default delle AKILL: infinita"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Durata di default delle SNLINE: %d giorni"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Durata di default delle SNLINE: %d ore"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Durata di default delle SNLINE: %d minuti"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Durata di default delle SNLINE: 1 giorno"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Durata di default delle SNLINE: 1 ora"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Durata di default delle SNLINE: 1 minuto"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Durata di default delle SNLINE: infinita"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Durata di default delle SQLINE: %d giorni"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Durata di default delle SQLINE: %d ore"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Durata di default delle SQLINE: %d minuti"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Durata di default delle SQLINE: 1 giorno"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Durata di default delle SQLINE: 1 ora"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Durata di default delle SQLINE: 1 minuto"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Durata di default delle SQLINE: infinita"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Durata di default delle SZLINE: %d giorni"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Durata di default delle SZLINE: %d ore"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Durata di default delle SZLINE: %d minuti"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Durata di default delle SZLINE: 1 giorno"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Durata di default delle SZLINE: 1 ora"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Durata di default delle SZLINE: 1 minuto"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Durata di default delle SZLINE: infinita"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "Eliminati %d record dalla lista AOP di %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "Eliminati %d record dalla lista HOP di %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "Eliminati %d record dalla lista SOP di %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "Eliminati %d record dalla lista VOP di %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "Eliminati %d record dalla lista di accesso di %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Eliminati %d record dalla lista autokick di %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "Eliminati %d record dalla lista delle parolacce di %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "Eliminati %d record dalla lista delle eccezioni."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "Eliminati %d record dalla lista AKILL."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "Eliminati %d record dalla lista SNLINE."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "Eliminati %d record dalla lista SQLINE."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "Eliminati %d record dalla lista SZLINE."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "Eliminato un record dalla lista AOP di %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "Eliminato un record dalla lista HOP di %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "Eliminato un record dalla lista SOP di %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "Eliminato un record dalla lista VOP di %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "Eliminato un record dalla lista di accesso di %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Eliminato un record dalla lista autokick di %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "Eliminato un record dalla lista delle parolacce di %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "Eliminato 1 record dalla lista delle eccezioni."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "Eliminato 1 record dalla lista AKILL."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "Eliminato 1 record dalla lista SNLINE."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "Eliminato 1 record dalla lista SQLINE."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "Eliminato 1 record dalla lista SZLINE."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "Eliminato un record dalla lista AOP di %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La descrizione di %s è stata impostata a %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "disattivato"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Mostrato tutti i records (Conteggio: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Mostrato records da %d a %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Mostrato records corrispondenti alla chiave %s (Conteggio: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Non usare il grassetto su questo canale!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Non usare i colori su questo canale!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Non usare il reverse su questo canale!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Non usare la parola %s su questo canale!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Non usare il sottolineato su questo canale!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Indirizzo e-mail per %s cambiato in %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Indirizzo e-mail per %s rimosso."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Impostazione dell'indirizzo e-mail annullata."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "L'e-mail per %s non è valida."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametri]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Email corrispondondenti %s a %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "attivato"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Fine della lista %s."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Fine della lista di accesso."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Fine della lista dei canali."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fine della lista - %d/%d canali mostrati."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fine della lista - %d/%d risultati mostrati."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Fine della lista dei nick."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Italiano"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Il messaggio di ingresso di %s è stato cambiato."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Il messaggio di ingresso di %s è stato annullato."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr "Errore! L'ident è troppo lungo; usane uno che sia %d caratteri o meno."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Errore! Il vhost è troppo lungo; usane uno che sia %d caratteri o meno."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "L'eccezione per %s (numero %d) è stata spostata alla posizione %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception per %s è stata aggiornata in %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Durata di %s modificata."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID canale motivo"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID canale [motivo]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nick motivo"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [motivo]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "La modalità fantasy ora è ATTIVA sul canale %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "La modalità fantasy ora è DISATTIVA sul canale %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "La modalità fantasy ora è ATTIVA sul canale %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s non è più ignorato."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Il fondatore del canale %s ora è %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Niente WildCards!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY canale"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr ""
 "Il comando GETPASS non è disponibile perché è in uso la criptazione dei dati."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [password]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL messaggio"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP destinatario password"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "La connessione fantasma con il tuo nick è stata disconnessa."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Saluto"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Mostra il messaggio di saluto (greet)"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Messaggio di saluto per %s cambiato in %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Messaggio di saluto per %s rimosso."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "La modalità greet (saluto) ora è DISATTIVA sul canale %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "La modalità greet (saluto) ora è ATTIVA sul canale %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista HOP di %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Lista degli host con almeno %d sessioni:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY password"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO canale"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {canale | nick-del-bot}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE canale"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Se non cambi il tuo nick entro 20 secondi, verrà cambiato dal server."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Se non cambi il tuo nick entro un minuto, verrà cambiato dal server."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Il codice di ignore sarà usato."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Il codice di ignore non sarà usato."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "La lista ignore è stata annullata."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "La lista ignore è vuota."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Lista dei bot disponibili:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3846,29 +3611,25 @@ msgstr ""
 "Digita /msg %S HELP SET opzione per avere maggiori\n"
 "informazioni su una opzione specifica."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Intervallo specificato erroneo. La sintassi corretta è #da-a."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informazioni sul bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informazioni sul canale %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Errore interno - Impossibile elaborare la richiesta."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Tempo di scadenza non valido."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3876,14 +3637,14 @@ msgstr ""
 "Hostmask non valida. Solo le hostmask reali sono valide; le eccezioni non "
 "vengono confrontate con i nick o con gli username (ident)."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "È stato inserito un codice di attivazione non valido. Controlla di nuovo la "
 "tua casella di posta e riprova."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3892,296 +3653,310 @@ msgstr ""
 "Limite delle sessioni non valido. Deve essere un numero intero maggiore o "
 "uguale a zero e minore di %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Valore di soglia non valido. Deve essere un numero intero maggiore di 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE nomeserver [motivo]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canale opzione {ON|OFF} [parametri]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK canale utente motivo"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "La key per il canale %s è %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canale {SET | DIS[ABLE] | LIST | RESET} [numero [livello]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST pattern"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canale] [lista | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Lingua cambiata a Italiano."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "L'ultimo memo inviato a %s è stato annullato."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Ultimo messaggio di quit: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "     Ultimo indirizzo usato: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Il livello di %s sul canale %s è stato modificato a %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Il livello deve essere compreso tra %d e %d (inclusi)."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Questo comando è inutilizzabile in questa modalità."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista dei nick che corrispondono a %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista dei nick nel gruppo di %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Lista dei nick nel tuo gruppo:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "I canali locali non possono essere registrati."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "La Logon News numero %d è stata eliminata."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Impossibile trovare la Logon News numero %d!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Lista delle Logon News:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE canale modi"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO NomeFile"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD NomeFile"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD NomeFile"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD NomeFile"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "La maschera %s è già presente nella tua lista di accesso."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "La maschera dev'essere nel formato user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Utenti massimi: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Memo %d da %s (%s). Per eliminarlo, digita: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Memo %d da %s (%s). Per eliminarlo, digita: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Il memo %d è stato cancellato."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Il limite dei memo di %s è stato disabilitato."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Il limite dei memo di %s è stato impostato a %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Il limite dei memo di %s è stato impostato a 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Il limite dei memo è troppo alto; sarà utilizzato il valore %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo inviato a %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Memo di %s. Per leggerli, digita: /msg %s READ numero"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Memo di %s. Per leggerli, digita: /msg %s READ %s numero"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Memo di %s. Per leggerli, digita: /msg %s READ numero"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Memo di %s. Per leggerli, digita: /msg %s READ %s numero"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Modalità messaggio"
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Il modo %c è stato ignorato perché non è memorizzabile."
-
-#: language.cpp:1314
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Il modo +o è stato rimosso da tutti gli utenti di %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Il blocco dei modi di canale di %s è stato impostato a %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "        Modi bloccati: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modulo %s caricato"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modulo %s caricato"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modulo %s rimosso"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modulo: %s Versione: %s Autore: %s caricato: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modulo: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Alias (NS):  %6d records, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Gruppi (NS): %6d records, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Permette di non venire kickati dal bot"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Nuovo memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Nuovi memo di %s. Per leggerli, digita: /msg %s READ numero"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Nuovi memo di %s. Per leggerli, digita: /msg %s READ %s numero"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "La lista delle news è piena!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4190,146 +3965,132 @@ msgstr ""
 "Il nick %s è stato vietato da %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Il nick %s è un nickname non autorizzato e non può essere utilizzato."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Il nick %s è attualmente in uso."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Il nick %s ora è vietato."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Il nick %s fa parte dei servizi di questo network."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Il nick %s non è bloccato."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Il nick %s non è attualmente in uso."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Il nick %s non è registrato."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Il nick %s non può essere registrato o usato."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s non trovato nella lista ignore."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Il nick %s è stato troncato a %d caratteri."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Il nick %s scadrà."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Il nick %s non scadrà."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Il nick %s non ha un tuo memo."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Il nick %s è stato deidentificato."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Il nick %s è momentaneamente sospeso."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Il nick %s è ora rilasciato."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Il nick %s è ora sospeso."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NON registrato, prova più tardi."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Il nick %s è stato confermato."
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Il nick %s è stato deregistrato."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Il nick %s è già registrato!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Il nick %s non può essere registrato."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s non registrato."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Il nick %s è stato registrato sotto il tuo account: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s registrato."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Registrazione del nick (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Password del nick (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4340,161 +4101,116 @@ msgstr ""
 "cancellazione automatica; saranno cioè eliminati\n"
 "dopo %d giorni di inutilizzo."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Nessun # trovato davanti al nome del canale."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "La modalità No Bot ora è DISATTIVA sul canale %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "La modalità No Bot ora è ATTIVA sul canale %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nessuna email in lista per %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Nessun bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Nessun aiuto disponibile per %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Nessun'informazione sul modulo %s è disponibile"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Nessuna Logon News da eliminare!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Nessun record corrispondente nella lista AOP di %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Nessun record corrispondente nella lista HOP di %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Nessun record corrispondente nella lista SOP di %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Nessun record corrispondente nella lista VOP di %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nessun record corrispondente nella lista di accesso di %s."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nessun record corrispondente nella lista autokick di %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Nessun record corrispondente nella lista delle parolacce di %s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "Nessun record corrispondente nella lista delle eccezioni."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Nessun record corrispondente nella lista AKILL."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Nessun record corrispondente nella lista SNLINE."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Nessun record corrispondente nella lista SQLINE."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Nessun record corrispondente nella lista SZLINE."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Nessun memo è annullabile."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Nessn modulo attualmente caricato"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nessuna Oper News da eliminare!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Nessuna Random News da eliminare!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Nessun motivo"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Non invia kick \"firmati\" quando si usa SIGNKICK LEVEL is used"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Il record specificato (%d) non è presente nella lista AOP di %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Il record specificato (%d) non è presente nella lista HOP di %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Il record specificato (%d) non è presente nella lista SOP di %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Il record specificato (%d) non è presente nella lista VOP di %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Nessuna"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Non permette l'accesso se il canale è RESTRICTED"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4506,95 +4222,93 @@ msgstr ""
 "che si trova nella relativa lista di accesso) saranno\n"
 "automaticamente deregistrati."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Num  Limite Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flag"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "OP Notice"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Le vecchie informazioni sono identiche a quelle nuove."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "Su Livello Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "L'opzione Op-notice per %s è ora DISATTIVATA."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "L'opzione Op-notice per %s è ora ATTIVATA."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "La Oper News numero %d è stata eliminata."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Impossibile trovare la Oper News numero %d!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Lista delle Oper News:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ:    %6d records, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Le operflags %s sono state aggiunte a %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Protezione per gli op"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "L'opzione %s non può essere impostata su questa rete."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Il codice di attivazione per %s is %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Password accettata - adesso sei riconosciuto."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4602,60 +4316,56 @@ msgstr ""
 "Autentificazione richiesta per questo comando.\n"
 "Riprova dopo aver digitato /msg %s IDENTIFY password."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password per %s cambiata in %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password per %s cambiata."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "La password di %s è %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Password errata."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "La password di %s è stata inviata."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Pace"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "L'opzione Peace per %s è ora DISATTIVATA."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "L'opzione Peace per %s è ora ATTIVATA."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr "Contatta un Operatore per avere un vhost assegnato a questo nick."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4664,173 +4374,134 @@ msgstr ""
 "(ad es. il proprio nome o nick), e non possono contenere i caratteri di "
 "spazio e di tabulazione."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Prego utilizzare un nome server valido per jupe"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Per favore usa il simbolo # provando a registrare"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Attendi %d secondi è riprova."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Per favore attendi %d secondi prima di usare di nuovo il comando GROUP."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Per favore attendi %d secondi prima di usare di nuovo il comando REGISTER."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr ""
 "Prego attendere %d secondi prima di usare il comando RSEND command "
 "nuovamente."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Attendi %d secondi prima di usare di nuovo il comando SEND."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Privato"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "La modalità Private del bot %s ora è DISATTIVA."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "La modalità Private del bot %s ora è ATTIVA."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "L'opzione Private per %s è ora DISATTIVATA."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "L'opzione Private per %s è ora ATTIVATA."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Opzione private SPENTA per %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Opzione private ACCESA per %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Protezione"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protezione SPENTA per %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protezione ACCESA per %s, con un ritardo ridotto."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protezione ACCESA per %s, senza ritardo."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protezione ACCESA per %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "La protezione ora è ATTIVA, senza ritardo."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Fornendo il comando: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canale] {lista | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [password]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER canale descrizione"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER password email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER password [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [password]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | canale} testo-memo"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "La Random News numero %d è stata eliminata."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Impossibile trovare la Random News numero %d!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Lista delle Random News:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4838,298 +4509,309 @@ msgstr ""
 "Il primo passo della registrazione potrebbe essere scaduto. Usa /msg %s "
 "REGISTER <password> <e-mail>."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Restricted"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "L'opzione Restricted access per %s è ora DISATTIVATA."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "L'opzione Restricted access per %s è ora ATTIVATA."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname opzione parametri"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE numero"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY canale testo"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | canale} testo-del-memo"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr ""
 "Il comando SENDPASS non è disponibile perché è in uso la criptazione dei "
 "dati."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET canale opzione parametri"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET canale NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canale PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET canale opzione parametri"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canale DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canale DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET canale FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET canale GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canale KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET canale OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canale NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canale OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canale PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canale PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canale RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canale SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canale SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canale SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canale SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canale SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canale TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canale XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET opzione parametri"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET opzione parametri"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numero"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canale] limite"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [utente | canale] {limite | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "La lista SNLINE è vuota."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5137,343 +4819,328 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista}[:"
 "motivo]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista SOP di %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "La lista SQLINE è vuota."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista} "
 "[motivo]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS canale elemento"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Il canale %s non è registrato"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Il nick %s non è online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND canale motivo"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND canale [motivo]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND canale motivo"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick motivo"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nuovonick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "La lista SZLINE è vuota."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista} "
 "[motivo]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Secure"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Secure Founder"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Secure Ops"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "L'opzione Secure founder per %s è ora DISATTIVATA."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "L'opzione Secure founder per %s è ora ATTIVATA."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "L'opzione Secure ops per %s è ora DISATTIVATA."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "L'opzione Secure ops per %s è ora ATTIVATA."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "L'opzione Secure per %s è ora DISATTIVATA."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "L'opzione Secure per %s è ora ATTIVATA."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Opzione secure SPENTA per %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Opzione secure ACCESA per %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Sicurezza"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "I servizi sono in modalità Defcon, prego riprovare più tardi."
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "I servizi sono ora in DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "I Services ora sono in modalità expire."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "I Services ora sono in modalità no expire."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "I Services ora sono in modalità read-only."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "I Services ora sono in modalità read-write."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "I Services ora sono in modalità debug (livello %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "I Services ora sono in modalità debug."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "I Services ora non sono in modalità debug."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "I servizi sono stati configurati per non inviare e-mail."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Lista ignore dei Services:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"I Services non riescono a cambiare i modi. I server sono configurati "
-"correttamente?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "I Services non riescono a cambiare i modi. Le U:lines dei server sono "
 "configurate correttamente?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "I Services sono up da %d giorno, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "I Services sono up da %d giorni, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "I Services sono up da %d ora, %d minuto"
+msgid "Services up %d hours, %d minutes"
+msgstr "I Services sono up da %d ore, %d minuti"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "I Services sono up da %d ora, %d minuti"
+msgid "Services up %d minutes, %d seconds"
+msgstr "I Services sono up da %d minuti, %d secondi"
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "I Services sono up da %d ore, %d minuto"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "I Services sono up da %d ore, %d minuti"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "I Services sono up da %d minuto, %d secondo"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
+
+#: modules/core/os_stats.cpp:154
+#, c-format
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "I Services sono up da %d minuto, %d secondi"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "I Services sono up da %d minuti, %d secondo"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "I Services sono up da %d minuti, %d secondi"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "I servizi non opperanno più %s automaticamente nei canali."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "I servizi opperanno %s automaticamente nei canali."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "I servizi risponderanno a %s con \"messages\"."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "I servizi risponderanno a %s con \"notices\"."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Il file di configurazione dei Services' è stato ricaricato in memoria."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Il blocco dei servizi sul tuo nick è stato rilasciato."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Il limite di sessioni per %s è stato impostato a %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Il limite delle sessioni è disabilitato."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessioni:    %6d records, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessioni  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Impostazione %s sconosciuta. Digita /msg %s HELP LEVELS DESC per una lista "
 "delle impostazioni valide."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr ""
 "Il parametro dell'opzione DEBUG deve essere ON, OFF, o un numero positivo."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Il parametro dell'opzione IGNORE deve essere ON o OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Il parametro dell'opzione NOEXPIRE deve essere ON o OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "Il parametro dell'opzione READONLY deve essere ON o OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 "L'impostazione di SuperAdmin deve essere ON o OFF (deve essere attivato in "
 "services.conf)."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "L'opzione Signed kick per %s è ora DISATTIVATA."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "L'opzione Signed kick per %s è ora ATTIVATA."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5482,227 +5149,197 @@ msgstr ""
 "L'opzione Signed kick per %s è ora ATTIVATA, ma dipende dal\n"
 "livello dell'utente che utilizza il comando."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "L'opzione Signed kick per %s è ora ATTIVATA."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Signed kick"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Spiacente, RSEND è stato disattivato su questo network."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Spiacente, l'assegnazione dei bot è temporaneamente disabilitata."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Spiacente, la creazione del bot non è andata a buon fine."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Spiacente, la modifica dei bot è temporaneamente disabilitata."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei bot è temporaneamente "
 "disabilitata."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Spiacente, la modifica della lista AOP è temporaneamente disabilitata."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Spiacente, la modifica della lista HOP è temporaneamente disabilitata."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Spiacente, la modifica della lista SOP è temporaneamente disabilitata."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Spiacente, la modifica della lista VOP è temporaneamente disabilitata."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista di accesso dei canali è temporaneamente "
 "disabilitata."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista autokick è temporaneamente disabilitata."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista delle parolacce è temporaneamente "
 "disabilitata."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 "Spiacente, la deregistrazione dei canali è temporaneamente disabilitata."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei canali è temporaneamente "
 "disabilitata."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Spiacente, la registrazione dei canali è temporaneamente disabilitata."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Spiacente, impossibile cambiare la password per %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Spiacente, il raggruppamento non è andato a buon fine."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Spiacente, l'identificazione non è andata a buon fine."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Spiacente, la configurazione dei kick è temporaneamente disabilitata."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei memo è temporaneamente "
 "disabilitata."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Spiacente, l'invio dei memo è temporaneamente disabilitato."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Spiacente, la deregistrazione dei nick è temporaneamente disabilitata."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Spiacente, il raggruppamento dei nick è temporaneamente disabilitato."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei nick è temporaneamente "
 "disabilitata."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Spiacente, la registrazione dei nick è temporaneamente disabilitata."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Spiacente, non è andata a buon fine."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr ""
-"Spiacente, puoi avere un massimo di %d nick nelle liste SOP/AOP/HOP/VOP di "
-"un canale."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Spiacente, puoi avere un massimo di %d nella lista di accesso."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr ""
 "Spiacente, puoi avere soltanto %d maschere nella lista di accesso di un nick."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Spiacente, puoi avere un massimo di %d nella lista di accesso."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Spiacente, puoi avere un massimo di %d maschere autokick."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr ""
 "Spiacente, puoi avere un massimo di %d parolacce nella lista di un canale."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Spiacente, hai già superato il limite di %d canali registrati."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Spiacente, hai già raggiunto il limite di %d canali registrati."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Le statistiche sono state azzerate."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Stato aggiornato (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Non floodare!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Smettila di ripetere!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Il successore del canale %s è stato annullato."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Il successore del canale %s ora è %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "L'impostazione SuperAdmin non è abilitata in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Simbiosi"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "La modalità symbiosis ora è DISATTIVA sul canale %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "La modalità symbiosis ora è ATTIVA sul canale %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintassi: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5730,7 +5367,7 @@ msgstr ""
 "2: ban nella forma *!*@host\n"
 "3: ban nella forma *!*user@*.dominio"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5743,29 +5380,12 @@ msgstr ""
 "Imposta la descrizione del canale, che viene mostrata\n"
 "con i comandi LIST e INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Sintassi: %s canale ENTRYMSG [messaggio]\n"
-"\n"
-"Imposta il messaggio che sarà inviato con un /notice\n"
-"agli utenti che entrano nel canale. Se non viene\n"
-"specificato nessun messaggio, il messaggio attuale\n"
-"viene eliminato, e gli utenti che entrano non\n"
-"riceveranno alcun messaggio."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Sintassi: %s canale FOUNDER nick\n"
@@ -5773,7 +5393,7 @@ msgstr ""
 "Imposta il nuovo fondatore del canale. Il nick specificato\n"
 "deve essere registrato."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5792,80 +5412,7 @@ msgstr ""
 "l'ultimo utente esce dal canale, e sarà reimpostato\n"
 "la volta successiva che entra qualcuno."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Sintassi: %s canale MLOCK modi\n"
-"\n"
-"Imposta il blocco dei modi per il canale. %S\n"
-"permette di definire vari modi di canale che saranno\n"
-"sempre attivi, sempre disattivi, o non bloccati.\n"
-"\n"
-"Il parametro modi è costituito esattamente nella\n"
-"stessa maniera di un comando /MODE; vale a dire\n"
-"che i modi che seguono un + sono sempre attivi, e\n"
-"i modi che seguono un - sono sempre disattivi.\n"
-"Diversamente dal comando /MODE, però, ogni uso del\n"
-"comando SET MLOCK rimuove tutti i modi bloccati\n"
-"precedentemente!\n"
-"\n"
-"Attenzione:  Se imposti una password (chiave) bloccata,\n"
-"come nel secondo esempio in basso, dovresti anche impostare\n"
-"l'opzione RESTRICTED per il canale (per maggiori\n"
-"informazioni, digita HELP SET RESTRICTED),\n"
-"altrimenti chiunque entra nel canale quando è vuoto potrà\n"
-"vedere la chiave!\n"
-"\n"
-"Esempi:\n"
-"\n"
-"    SET #canale MLOCK +nt-iklps\n"
-"        Blocca come attivi i modi n e t, e come disattivi i\n"
-"        modi i, k, l, p e s. Il modo m può essere cambiato\n"
-"        dagli utenti.\n"
-"\n"
-"    SET #canale MLOCK +knst-ilmp miachiave\n"
-"        Blocca come attivi i modi k, n, s e t, e come\n"
-"        disattivi i modi i, l, m e p. Inoltre, blocca la\n"
-"        chiave del canale impostandola a \"miachiave\".\n"
-"\n"
-"    SET #canale MLOCK +\n"
-"        Rimuove il blocco dei modi; tutti i modi del canale\n"
-"        possono essere attivati o disattivati dagli utenti."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5881,7 +5428,7 @@ msgstr ""
 "Quando l'opzione è attiva, %S invierà un notice al\n"
 "canale quando vengono usati i comandi OP e DEOP."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5899,7 +5446,7 @@ msgstr ""
 "(op, mezzo op, ecc.) di un utente con livello\n"
 "superiore, attraverso i comandi di %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5944,7 +5491,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5958,13 +5505,13 @@ msgstr ""
 "Quando questa opzione è attiva, il canale non sarà\n"
 "incluso nella lista restituita da /msg %S LIST."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Sintassi: %s canale RESTRICTED {ON | OFF}\n"
@@ -5973,7 +5520,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5992,7 +5539,7 @@ msgstr ""
 "con %s e che si sono identificati con la loro password\n"
 "avranno l'accesso sul canale secondo le liste di accesso."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6011,53 +5558,12 @@ msgstr ""
 "il fondatore e il successore, mentre gli utenti identificati\n"
 "su %S per il canale non potranno."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Sintassi: %s canale SECUREOPS {ON | OFF}\n"
-"\n"
-"Attiva o disattiva l'opzione secure ops per il canale.\n"
-"Quando l'opzione è attiva, gli utenti che non sono nella\n"
-"lista di accesso non potranno avere lo stato di operatore\n"
-"di canale."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Sintassi: %s canale SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Attiva o disattiva i nick \"firmati\" per il canale. Quando\n"
-"l'opzione è attiva, i kick effettuati con il comando KICK\n"
-"di %S indicheranno anche il nick della persona che ha\n"
-"utilizzato il comando.\n"
-"\n"
-"Se usi LEVEL, il nick non sarà comunque mostrato se il\n"
-"kick è effettuato da qualcuno il cui livello di accesso\n"
-"è uguale o maggiore al livello SIGNKICK del canale.\n"
-"Per maggiori informazioni, digita /msg %S HELP LEVELS."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6076,24 +5582,7 @@ msgstr ""
 "successore.\n"
 "Il nick specificato deve essere registrato."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintassi: %s canale TOPICLOCK {ON | OFF}\n"
-"\n"
-"Attiva o disattiva il blocco del topic per il\n"
-"canale. Quando il blocco del topic è attivo,\n"
-"%S non permetterà che il topic venga cambiato, se\n"
-"non attraverso il comando TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6137,10 +5626,11 @@ msgstr ""
 "Al contrario, passare dalle liste xOP alle liste di accesso\n"
 "non causa nessun problema."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6153,18 +5643,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6224,7 +5718,7 @@ msgstr ""
 "Il comando ACCESS CLEAR svuota completamente la lista di\n"
 "accesso."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6273,7 +5767,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Visualizza la lista di accesso attuale."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6285,12 +5779,18 @@ msgstr ""
 "Fa sì che il bot faccia in canale l'equivalente di un\n"
 "\"/me\" utilizzando il testo specificato."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6311,15 +5811,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6388,7 +5879,8 @@ msgstr ""
 "\n"
 "Il comando AKICK CLEAR svuota la lista AutoKick."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6396,21 +5888,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6477,7 +5969,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR svuota la lista AKILL."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6520,7 +6012,7 @@ msgstr ""
 "I canali che hanno l'opzione NOEXPIRE impostata verranno\n"
 "mostrati con un punto esclamativo."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6538,10 +6030,11 @@ msgstr ""
 "su cui nick ha livello di accesso livello o\n"
 "superiore."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6623,7 +6116,7 @@ msgstr ""
 "maggiori informazioni, e /msg %S HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6637,7 +6130,8 @@ msgstr ""
 "indicato. Dopo averlo assegnato, il bot può essere\n"
 "configurato in base alle necessità."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6669,7 +6163,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6713,7 +6207,7 @@ msgstr ""
 "      \n"
 "Il comando BADWORDS CLEAR svuota la lista delle parolacce."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6730,7 +6224,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6774,7 +6268,7 @@ msgstr ""
 "il nick sarà deregistrato; inoltre, se un utente lo sta\n"
 "usando, verrà killato."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6784,7 +6278,7 @@ msgstr ""
 "\n"
 "Mostra la lista di tutti i bot disponibili."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6797,7 +6291,7 @@ msgstr ""
 "sempre che non sia già stato letto prima dell'uso di questo\n"
 "comando."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6809,7 +6303,7 @@ msgstr ""
 "Utilizza l'intero e completo ident@host per ogni nick,\n"
 "in seguito imposta l'AKILL. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6831,7 +6325,7 @@ msgstr ""
 "Se viene indicato SECRET, mostra solo i canali che corrisponodno a\n"
 "pattern e che hanno il modo di canale +s o +p attivo."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6843,70 +6337,34 @@ msgstr ""
 "Controlla se l'_ultimo_ memo che hai inviato al nick è stato letto\n"
 "oppure no. Nota che questo funziona unicamente coi nick, non coi canali."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Sintassi: CLEAR canale cosa\n"
-"\n"
-"Fa in modo che %S \"pulisca\" vari settaggi di un\n"
-"canale. cosa può essere una delle opzioni seguenti:\n"
-"\n"
-"     MODES    Annulla tutti i modi di canale (cioè elimina\n"
-"                  i modi i,k,l,m,n,p,s,t).\n"
-"     BANS     Annulla tutti i ban del canale.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Rimuove lo stato di operatore (modo +o) da\n"
-"                  tutti gli operatori del canale. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Rimuove lo stato di halfoperator (modo +h) da\n"
-"                  tutti gli halfoperator del canale, se supportato.\n"
-"     VOICES   Rimuove lo stato di voice (modo +v) da tutti\n"
-"                  gli utenti voice sul canale.\n"
-"     USERS    Rimuove (con un kick) tutti gli utenti del canale.\n"
+"Sintassi: DEOWNER canale\n"
 "\n"
-"Di default, il comando è limitato agli utenti con\n"
-"accesso di fondatore sul canale."
+"Ti toglie lo stato di proprietario (owner, -q) sul canale\n"
+"che specifichi.\n"
+"\n"
+"Il comando è limitato agli utenti che hanno accesso di\n"
+"fondatore."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Sintassi: CLEARMODES canale [ALL]\n"
-"\n"
-"Annulla tutti i modi binari (i,k,l,m,n,p,s,t) e i ban\n"
-"dal canale specificato. Se viene indicato ALL, verranno\n"
-"rimossi anche gli op e i voice (modi +o e +v)."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6932,7 +6390,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6944,12 +6402,14 @@ msgstr ""
 "di restrizioni dei servizi predefinite, utili durante un tentativo\n"
 "d'attacco sul network."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6965,7 +6425,7 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai HOP o agli\n"
 "utenti con livello 4 o superiori per il dehalfop su se stessi."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6974,11 +6434,12 @@ msgstr ""
 "Sintassi: DEL <nick>\n"
 "Elimina dal database il vhost assegnato al nick specificato."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7011,22 +6472,25 @@ msgstr ""
 "      Elimina i memo che hanno numero numeri tra 2 e 5 e\n"
 "      tra 7 e 9, conservando quindi il 6."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Sintassi: DELALL <nick>.\n"
 "Rimuove il vhost da tutti i nick dello stesso gruppo del nick\n"
 "specificato."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7040,31 +6504,36 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti\n"
 "con livello di accesso 5 o superiori."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintassi: DEOWNER canale\n"
+"Sintassi: DEOP canale [nick]\n"
 "\n"
-"Ti toglie lo stato di proprietario (owner, -q) sul canale\n"
-"che specifichi.\n"
+"Rimuove lo stato di operatore (op, -o) a un utente sul\n"
+"canale specificato. Se non viene indicato alcun nick,\n"
+"\"deoppa\" l'utente che invia il comando.\n"
 "\n"
-"Il comando è limitato agli utenti che hanno accesso di\n"
-"fondatore."
+"Di default, il comando è limitato agli AOP o agli utenti\n"
+"con livello di accesso 5 o superiori."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Sintassi: DEPROTECT canale [nick]\n"
 "\n"
@@ -7076,12 +6545,14 @@ msgstr ""
 "oppure ai SOP o agli utenti con livello 10 o superiori per\n"
 "la rimozione della protezione su se stessi."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7097,7 +6568,7 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai VOP o agli\n"
 "utenti con livello 3 o superiori per il devoice su se stessi."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7109,7 +6580,7 @@ msgstr ""
 "Deregistra il canale specificato. Può essere usato soltanto\n"
 "da un fondatore di canale."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7122,9 +6593,10 @@ msgstr ""
 "possono deregistrare un canale per il quale non si siano\n"
 "identificati."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7132,6 +6604,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7149,7 +6625,7 @@ msgstr ""
 "password (digita /msg %S HELP IDENTIFY per avere maggiori\n"
 "informazioni)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7173,8 +6649,8 @@ msgstr ""
 "La deregistrazione di qualsiasi nick è limitata ai\n"
 "Services Operator."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7185,7 +6661,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7207,7 +6683,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7258,7 +6734,7 @@ msgstr ""
 "grandi ed mask generiche possono degradare la funzionalità dei\n"
 "Services."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7275,7 +6751,7 @@ msgstr ""
 "\n"
 "Il motivo potrebbe essere richiesto su alcune reti."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7292,7 +6768,7 @@ msgstr ""
 "\n"
 "Su alcune reti può essere necessario specificare il motivo."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7305,7 +6781,7 @@ msgstr ""
 "non puoi usare \"wildcards\" (*) né per user, né per emailhost.\n"
 "Questo comando viene loggato."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7315,16 +6791,15 @@ msgstr ""
 "\n"
 "Restituisce la chiave (password) del canale specificato."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Sintassi: GETPASS nick\n"
 "\n"
@@ -7337,14 +6812,14 @@ msgstr ""
 "Questo comando non è disponibile quando è attiva la\n"
 "criptazione dei database."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7369,7 +6844,7 @@ msgstr ""
 "nello stesso gruppo di quel nick, o devi fornire la password\n"
 "corretta per quel nick."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7379,7 +6854,7 @@ msgstr ""
 "\n"
 "Mostra tutti i nick del tuo gruppo."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7398,7 +6873,7 @@ msgstr ""
 "nick specificato.\n"
 "Questo modo d'uso è riservato ai Services Operator."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7412,7 +6887,7 @@ msgstr ""
 "gli utenti della rete. Il messaggio sarà inviato\n"
 "dal nick %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7425,7 +6900,7 @@ msgstr ""
 "Questo comando permette agli utenti di impostare il vhost del\n"
 "loro nick ATTUALE come vhost di tutti i nick nello stesso gruppo."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7487,16 +6962,17 @@ msgstr ""
 "\n"
 "Nota: tutti i nick di un gruppo hanno la stessa password."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Sintassi: HALFOP canale [nick]\n"
 "\n"
@@ -7508,10 +6984,11 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai HOP o agli\n"
 "utenti con livello 4 o superiori per l'halfop su se stessi."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7587,7 +7064,7 @@ msgstr ""
 "maggiori informazioni, e /msg %S HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7606,9 +7083,20 @@ msgstr ""
 "deve essere la stessa che è stata utilizzata con il\n"
 "comando REGISTER."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7638,7 +7126,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7660,7 +7148,7 @@ msgstr ""
 "Di default, l'opzione ALL è limitata a coloro che hanno\n"
 "l'accesso come fondatore sul canale."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7678,7 +7166,7 @@ msgstr ""
 "ALL, vedrai tutte le informazioni, che siano nascoste\n"
 "o meno."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7694,7 +7182,7 @@ msgstr ""
 "in totale. Se viene specificato un canale, mostra le stesse\n"
 "informazioni, ma relative al canale indicato."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7719,7 +7207,7 @@ msgstr ""
 "le stesse informazioni ma relative al nick.\n"
 "Questo modo d'uso è limitato ai Services Operator."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7739,12 +7227,12 @@ msgstr ""
 "relative alla data di creazione e al numero di canali\n"
 "a cui è assegnato."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7756,14 +7244,15 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7780,7 +7269,7 @@ msgstr ""
 "\"Juped by <nick>\", indicando il nick della persona che ha\n"
 "bloccato il server."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7796,7 +7285,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7823,7 +7312,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7845,12 +7334,14 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7888,14 +7379,14 @@ msgstr ""
 "Nota: l'accesso a questo comando dipende dall'impostazione\n"
 "del livello SET."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7909,7 +7400,25 @@ msgstr ""
 "\n"
 "*** Spammer has been kicked off channel #canale by %S (OperNick (motivo))"
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7926,7 +7435,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7955,7 +7464,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7972,7 +7481,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7996,7 +7505,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8012,7 +7521,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8029,7 +7538,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8046,8 +7555,8 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8057,17 +7566,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8099,7 +7608,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8123,7 +7632,7 @@ msgstr ""
 "L'elenco utilizza il valore di NSListMax come limite per\n"
 "il numero di elementi da mostrare ad un operatore alla volta."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8138,7 +7647,7 @@ msgstr ""
 "pattern specificato. I canali con l'opzione PRIVATE\n"
 "attiva non saranno mostrati."
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8180,7 +7689,8 @@ msgstr ""
 "        Mostra tutti i nick registrati da utenti del dominio\n"
 "        bar.org."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8208,7 +7718,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Sintassi: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8241,13 +7750,14 @@ msgstr ""
 "        Mostra tutti i nick registrati che non\n"
 "        scadono."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8263,11 +7773,11 @@ msgstr ""
 "      Mostra i memo che hanno numeri tra 2 e 5 e tra 7 e 9,\n"
 "      escludendo quindi il 6."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Sintassi: LOGONNEWS ADD testo"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8296,11 +7806,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Sintassi: LOGONNEWS DEL {numero | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8316,7 +7826,7 @@ msgstr ""
 "del nick. Tieni presente, però, che non dovrai identificarti\n"
 "di nuovo."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8341,12 +7851,13 @@ msgstr ""
 "chiederanno al nick specificato di reidentificarsi. Questo\n"
 "modo di utilizzo è limitato ai Services Operator."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Sintassi: MODE canale modi\n"
@@ -8355,7 +7866,34 @@ msgstr ""
 "per qualsiasi canale. I parametri sono gli stessi utilizzati\n"
 "con il comando /MODE standard."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8364,7 +7902,7 @@ msgstr ""
 "Sintassi: MODINFO NomeFile\n"
 "Questo comando elenca informazioni sul modulo caricato specificato"
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8373,7 +7911,7 @@ msgstr ""
 "Sintassi: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Elenca tutti i moduli attualmente caricati."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8384,7 +7922,7 @@ msgstr ""
 "Questo comando carica il modulo chiamato NomeFile dalla cartella\n"
 "modules."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8395,7 +7933,7 @@ msgstr ""
 "Questo comando carica il modulo chiamato NomeFile dalla cartella\n"
 "modules."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8406,10 +7944,12 @@ msgstr ""
 "Questo comando rimuove il modulo chiamato NomeFile dalla cartella\n"
 "modules."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8433,7 +7973,7 @@ msgstr ""
 "Nota: il formato del server specificato non è controllato\n"
 "dai Services prima dell'esecuzione del comando."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8445,7 +7985,7 @@ msgstr ""
 "Quando usi questo comando, ogni utente che effettua un /whois\n"
 "su di te vedrà il tuo vero indirizzo IP."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8460,7 +8000,7 @@ msgstr ""
 "da \"+\" o \"-\". Per rimuovere tutte le flag, è sufficiente\n"
 "usare \"-\" senza altri parametri."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8473,12 +8013,14 @@ msgstr ""
 "Quando usi questo comando, ogni utente che effettua un\n"
 "/whois su di te vedrà il vhost invece del tuo vero indirizzo IP."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8492,11 +8034,11 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti\n"
 "con livello di accesso 5 o superiori."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Sintassi: OPERNEWS ADD testo"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8525,32 +8067,38 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Sintassi: OPERNEWS DEL {numero | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintassi: OWNER canale\n"
+"Sintassi: OP canale [nick]\n"
 "\n"
-"Ti assegna lo stato di proprietario (owner, +q) sul canale\n"
-"che specifichi.\n"
+"Assegna lo stato di operatore (op, +o) a un utente sul\n"
+"canale specificato. Se non viene indicato alcun nick,\n"
+"\"oppa\" l'utente che invia il comando.\n"
 "\n"
-"Il comando è limitato agli utenti che hanno accesso di\n"
-"fondatore."
+"Di default, il comando è limitato agli AOP o agli utenti\n"
+"con livello di accesso 5 o superiori."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8565,10 +8113,11 @@ msgstr ""
 "oppure ai SOP o agli utenti con livello 10 o superiori per\n"
 "la protezione su se stessi."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8641,7 +8190,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8661,11 +8210,11 @@ msgstr ""
 "Per terminare normalmente i Services, deve essere\n"
 "usato il comando SHUTDOWN."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Sintassi: RANDOMNEWS ADD testo"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8688,18 +8237,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Sintassi: RANDOMNEWS DEL {numero | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8717,7 +8267,7 @@ msgstr ""
 "      Mostra i memo che hanno numeri tra 2 e 5 e tra 7 e 9,\n"
 "      escludendo quindi il 6."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8765,7 +8315,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8776,7 +8327,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8807,24 +8358,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8875,15 +8427,15 @@ msgstr ""
 "privilegi sui canali. Per maggiori informazioni su questo\n"
 "servizio, digita /msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8904,7 +8456,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8920,7 +8472,7 @@ msgstr ""
 "il cambio dei nick dei Services, l'attivazione della\n"
 "limitazione delle sessioni, eccetera)."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8932,7 +8484,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8943,7 +8495,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8954,13 +8506,14 @@ msgstr ""
 "\n"
 "Salva i database su disco e riavvia i Services."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8976,24 +8529,26 @@ msgstr ""
 "una notifica automatica al mittente, informandolo che il suo memo\n"
 "è stato letto."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Sintassi: SASET nickname opzione parametri.\n"
 "\n"
 "Imposta varie opzioni del nick. opzione può essere una delle\n"
 "seguenti:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -9001,7 +8556,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9013,7 +8568,7 @@ msgstr ""
 "Imposta il nome con cui i Services si riferiscono al tuo\n"
 "gruppo. Il nuovo nome DEVE essere un nick del gruppo."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9023,7 +8578,7 @@ msgstr ""
 "\n"
 "Associa l'indirizzo e-mail specificato al nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9039,7 +8594,7 @@ msgstr ""
 "l'opzione GREET attiva, se si ha un livello di accesso\n"
 "al canale sufficiente."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9061,22 +8616,22 @@ msgstr ""
 "specifica se l'informazione indicata debba essere\n"
 "mostrata (OFF) o nascosta (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sintassi: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9093,7 +8648,7 @@ msgstr ""
 "opzione se non è strettamente necessario. L'opzione IMMED,\n"
 "inoltre, potrebbe non essere disponibile."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9110,7 +8665,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9124,7 +8679,7 @@ msgstr ""
 "col nick. Se MSG è attivo, i Services usano i messaggi (query),\n"
 "altrimenti usano i notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9136,18 +8691,19 @@ msgstr ""
 "Imposta se il nickname specificato scadrà.  Impostandolo su\n"
 "ON eviterà che il nickname scada."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Sintassi: SASET nickname PASSWORD nuova-password\n"
 "\n"
 "Cambia la password utilizzata per identificarsi come\n"
 "proprietario del nick."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9166,16 +8722,16 @@ msgstr ""
 "chiunque sappia il nick può leggerne le informazioni con il\n"
 "comando INFO."
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9188,7 +8744,7 @@ msgstr ""
 "accesso, %S non cambierà il suo nick, anche se l'opzione KILL\n"
 "è attiva."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9198,13 +8754,14 @@ msgstr ""
 "\n"
 "Fa sì che il bot dica in canale il testo specificato."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sintassi: SEND {nick | canale} testo-del-memo\n"
@@ -9215,15 +8772,17 @@ msgstr ""
 "che ha un nuovo memo. Il nick/canale di destinazione deve\n"
 "esser registrato."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Sintassi: SENDALL testo-memo\n"
 "Invia un memo contenente testo-memo a tutti gli utenti registrati."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9241,7 +8800,7 @@ msgstr ""
 "\n"
 "Potrebbe essere disponibile soltanto per gli IrcOp."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9275,7 +8834,7 @@ msgstr ""
 "sulla limitazione delle sessioni e come configurare limiti specifici\n"
 "per determinati host o gruppi di host."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9289,7 +8848,67 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> permette di impostare l'ident,\n"
 "oltre che il vhost."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Sintassi: %s canale SECUREOPS {ON | OFF}\n"
+"\n"
+"Attiva o disattiva l'opzione secure ops per il canale.\n"
+"Quando l'opzione è attiva, gli utenti che non sono nella\n"
+"lista di accesso non potranno avere lo stato di operatore\n"
+"di canale."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Sintassi: %s canale SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Attiva o disattiva i nick \"firmati\" per il canale. Quando\n"
+"l'opzione è attiva, i kick effettuati con il comando KICK\n"
+"di %S indicheranno anche il nick della persona che ha\n"
+"utilizzato il comando.\n"
+"\n"
+"Se usi LEVEL, il nick non sarà comunque mostrato se il\n"
+"kick è effettuato da qualcuno il cui livello di accesso\n"
+"è uguale o maggiore al livello SIGNKICK del canale.\n"
+"Per maggiori informazioni, digita /msg %S HELP LEVELS."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintassi: %s canale TOPICLOCK {ON | OFF}\n"
+"\n"
+"Attiva o disattiva il blocco del topic per il\n"
+"canale. Quando il blocco del topic è attivo,\n"
+"%S non permetterà che il topic venga cambiato, se\n"
+"non attraverso il comando TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9300,6 +8919,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9323,7 +8943,7 @@ msgstr ""
 "Nota: l'accesso a questo comando dipende dall'impostazione\n"
 "del livello SET."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9334,7 +8954,7 @@ msgstr ""
 "Questa opzione fa sì che il bot sia assegnabile\n"
 "soltanto dagli IrcOp."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9350,7 +8970,7 @@ msgstr ""
 "\n"
 "Opzioni disponibili:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9365,7 +8985,7 @@ msgstr ""
 "kickati dal bot, anche se non hanno accesso di\n"
 "livello NOKICK."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9380,7 +9000,7 @@ msgstr ""
 "kickati dal bot, anche se non hanno accesso di\n"
 "livello NOKICK."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9413,7 +9033,7 @@ msgstr ""
 "(ad esempio, per usare !op, l'utente deve avere\n"
 "privilegi sufficienti anche per il livello OPDEOP)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9430,7 +9050,22 @@ msgstr ""
 "sufficienti. Per impostare il messaggio di saluto,\n"
 "è necessario usare l'opzione SET GREET di NickServ."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9445,7 +9080,7 @@ msgstr ""
 "Se un bot è già assegnato, verrà rimosso nel\n"
 "momento in cui viene attivata l'opzione."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9457,7 +9092,7 @@ msgstr ""
 "Imposta se il canale scadrà o meno in caso di inutilizzo. Se\n"
 "l'opzione è impostata a ON, il canale non scadrà."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9476,26 +9111,17 @@ msgstr ""
 "la visualizzazione del messaggio di ingresso,\n"
 "eccetera."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Sintassi: SET opzione parametri\n"
-"\n"
-"Imposta varie opzioni del nick. opzione può essere una delle\n"
-"seguenti:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9513,7 +9139,18 @@ msgstr ""
 "Digita /msg %S HELP SET opzione per ottenere\n"
 "maggiori informazioni su un'opzione specifica."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Sintassi: SET opzione parametri\n"
+"\n"
+"Imposta varie opzioni del nick. opzione può essere una delle\n"
+"seguenti:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9523,7 +9160,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Sintassi: SET opzione impostazione\n"
@@ -9538,7 +9174,7 @@ msgstr ""
 "    IGNORE     Attiva o disattiva la modalità ignore\n"
 "    LIST       Elenca le opzioni"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9550,31 +9186,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Sintassi: SET DEBUG {ON | OFF | numero}\n"
-"\n"
-"Attiva o disattiva la modalità di debug. In modalità di\n"
-"debug, tutti i dati inviati e ricevuti dai Services,\n"
-"nonché altri messaggi di debug, saranno scritti nel file\n"
-"di log. Se viene specificato un numero, la modalità\n"
-"di debug sarà attivata, e il livello di debug sarà\n"
-"impostato a numero.\n"
-"\n"
-"Questa opzione è equivalente all'opzione di riga di comando\n"
-"-debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9586,7 +9198,7 @@ msgstr ""
 "Imposta il nome con cui i Services si riferiscono al tuo\n"
 "gruppo. Il nuovo nome DEVE essere un nick del gruppo."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9600,7 +9212,7 @@ msgstr ""
 "Questo indirizzo sarà mostrato quando qualcuno richiede\n"
 "informazioni sul proprio nick con il comando INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9616,7 +9228,7 @@ msgstr ""
 "l'opzione GREET attiva, se si ha un livello di accesso\n"
 "al canale sufficiente."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9638,18 +9250,8 @@ msgstr ""
 "parametro specifica se l'informazione indicata debba essere\n"
 "mostrata (OFF) o nascosta (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Sintassi: SET IGNORE {ON | OFF}\n"
-"Questa impostazione abilita o disabilita l'utilizzo del sistema IGNORE\n"
-"da parte di Anope."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9663,7 +9265,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sintassi: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9680,7 +9282,7 @@ msgstr ""
 "opzione se non è strettamente necessario. L'opzione IMMED,\n"
 "inoltre, potrebbe non essere disponibile."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9698,7 +9300,7 @@ msgstr ""
 "numero deve essere scelto dalla lista seguente, che\n"
 "elenca le lingue supportate:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9716,7 +9318,7 @@ msgstr ""
 "non è possibile impostare il limite a un valore maggiore\n"
 "di %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9759,7 +9361,7 @@ msgstr ""
 "privilegi, e potrebbero non essere in grado di rimuovere\n"
 "il limite o di impostarlo a un valore maggiore di %d."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9768,7 +9370,7 @@ msgstr ""
 "Sintassi: SET LIST\n"
 "Mostra le varie impostazioni di %S"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9782,10 +9384,11 @@ msgstr ""
 "con te. Se MSG è attivo, i Services usano i messaggi (query),\n"
 "altrimenti usano i notices."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9800,7 +9403,7 @@ msgstr ""
 "Questa opzione è equivalente all'opzione di riga di comando\n"
 "-noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9839,7 +9442,7 @@ msgstr ""
 "\n"
 "ON è sostanzialmente la combinazione di LOGON e NEW."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9851,7 +9454,7 @@ msgstr ""
 "Cambia la password utilizzata per identificarti come\n"
 "proprietario del nick."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9870,7 +9473,7 @@ msgstr ""
 "chiunque sappia il tuo nick può leggerne le informazioni con il\n"
 "comando INFO."
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9902,16 +9505,16 @@ msgstr ""
 "Questa opzione è equivalente all'opzione di riga di comando\n"
 "-readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9924,7 +9527,7 @@ msgstr ""
 "accesso, %S non cambierà il tuo nick, anche se l'opzione KILL\n"
 "è attiva."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9940,14 +9543,15 @@ msgstr ""
 "Questa opzione NON è persistente, e dovrebbe essere usata\n"
 "solo quando necessario, e reimpostata a OFF al più presto."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Sintassi: SETALL <nick> <hostmask>.\n"
@@ -9960,7 +9564,7 @@ msgstr ""
 "NOTA - questo comando non aggiornerà i vhost dei nick\n"
 "aggiunti successivamente al gruppo."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9970,10 +9574,11 @@ msgstr ""
 "\n"
 "Salva i database su disco e termina i Services."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10009,7 +9614,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10061,10 +9666,11 @@ msgstr ""
 "\n"
 "SNLINE CLEAR svuota la lista SNLINE."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10143,7 +9749,8 @@ msgstr ""
 "maggiori informazioni, e /msg %S HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10159,31 +9766,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10237,21 +9844,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR svuota la lista SQLINE."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10261,15 +9854,17 @@ msgstr ""
 "Mostra tutti i nick dello staff dei services coi rispettivi\n"
 "livelli e stato on-line."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Sintassi: STAFF testo-memo\n"
 "Invia un memo contenenteo testo-memo a tutto lo services staff."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10313,7 +9908,7 @@ msgstr ""
 "registrato al numero degli utenti connessi attualmente\n"
 "alla rete."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10337,12 +9932,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR messaggio-di-errore"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10382,7 +9978,7 @@ msgstr ""
 "resto sarà ignorato. Se nessun nickname è specificato verrà indicato\n"
 "lo stato del tuo nick."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10400,7 +9996,7 @@ msgstr ""
 "\n"
 "Il motivo potrebbe essere richiesto su alcune reti."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10410,7 +10006,8 @@ msgstr ""
 "\n"
 "Forza il cambio del nickname di un utente da nick a newnick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10423,31 +10020,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10498,7 +10095,7 @@ msgstr ""
 "\n"
 "SZLINE CLEAR svuota la lista SZLINE."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10522,7 +10119,7 @@ msgstr ""
 "Di default, il comando è limitato agli utenti con\n"
 "accesso di fondatore sul canale."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10536,7 +10133,7 @@ msgstr ""
 "qualsiasi utente. I parametri sono gli stessi del\n"
 "comando /MODE standard."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10554,7 +10151,7 @@ msgstr ""
 "riconfigurare tutto di nuovo nel caso se ne assegni\n"
 "uno di nuovo."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10573,7 +10170,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10590,7 +10187,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10602,7 +10199,7 @@ msgstr ""
 "Rilascia un canale sospeso. Tutti i dati e le impostazioni\n"
 "sono preservate da prima della sospensione."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10615,7 +10212,7 @@ msgstr ""
 "Services nello stesso istante in cui il comando viene\n"
 "inviato."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10639,12 +10236,14 @@ msgstr ""
 "Se viene indicato INVISIBLE, mostra solo gli utenti con il modo\n"
 "utente +i attivo."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10660,10 +10259,11 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai VOP o agli\n"
 "utenti con livello 3 o superiori per il voice su se stessi."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10740,7 +10340,7 @@ msgstr ""
 "maggiori informazioni, e /msg %S HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10756,7 +10356,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10764,7 +10364,7 @@ msgstr ""
 "Sintassi: SUSPEND nickname motivo\n"
 "Impedisce al nickname di venire utilizzato."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10772,7 +10372,7 @@ msgstr ""
 "Sintassi: UNSUSPEND nickname\n"
 "Rilascia il nickname sospeso."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10784,54 +10384,55 @@ msgstr ""
 "imposta i chanmode necessari (ModeonID) e aggiorna il tuo vhost e\n"
 "i tuoi userflags (lastseentime, ecc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canale [topic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "L'opzione IMMED non è disponibile su questa rete."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "La lista AKILL è stata svuotata."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Il livello Defcon è ora: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "L'indirizzo e-mail di %s verrà ora nascosto da %s INFO."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "L'indirizzo e-mail di %s verrà ora mostrato in %s INFO."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "La lista SNLINE è stata svuotata."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "La lista SQLINE è stata annullata."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "La lista SZLINE è stata svuotata."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Il canale %s non ha una key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "La seguente lista mostra le funzioni disponibile. Tieni\n"
@@ -10839,86 +10440,86 @@ msgstr ""
 "livelli massimi per i quali la funzione sarà attiva,\n"
 "mentre tutti gli altri sono livelli minimi."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "L'host %s ha %d sessioni, con un limite di %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "L'ultimo memo che hai inviato a %s (inviato il %s) è stato letto."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "L'ultimo memo che hai inviato a %s (inviato il %s) non è stato ancora letto."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "L'ultimo messaggio di quit di %s verrà ora nascosto da %s INFO."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "L'ultimo messaggio di quit di %s verrà ora mostrato in %s INFO."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr "L'ultima mask user@host vista di %s verrà ora nascosta da %s INFO."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr "L'ultima mask user@host vista di %s verrà ora mostrata in %s INFO."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Il limite dei memo di %s non può essere modificato."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "Il nuovo display per %s DEVE essere un nickname del gruppo nickname!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Il nuovo display adesso è %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Il nick %s viene ora cambiato in %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr "Lo stato di accesso ai servizi di %s verrà ora nascosto da %s INFO."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr "Lo stato di accesso ai servizi di %s verrà ora mostrato in %s INFO."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Ci sono %d memo sul canale %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10926,7 +10527,7 @@ msgstr ""
 "Non ci sono bot disponibili in questo momento.\n"
 "Chiedi a un Services Operator di crearne uno!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10936,12 +10537,12 @@ msgstr ""
 "alcuni. Digita /msg %s HELP GLIST e /msg %s HELP DROP \n"
 "per avere altre informazioni."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "C'è %d memo sul canale %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10949,28 +10550,28 @@ msgstr ""
 "C'è un nuovo memo sul canale %s.\n"
 "Digita /msg %s READ %s %d per leggerlo."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Non c'è più nessun bot assegnato a %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Non c'è nessuna Logon News."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Non c'è nessuna Oper News."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Non c'è nessuna Random News."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Non c'è un indirizzo email impostato per il tuo nick."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10986,32 +10587,28 @@ msgstr ""
 "    PRIVATE          Fa in modo che il bot sia assegnabile\n"
 "                        solo dagli IrcOp"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Questo canale è stato vietato."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Questo canale è stato registrato con %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Questo canale è stato sospeso."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Questo canale non può essere usato."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Questo canale non scadrà."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "Questo modulo non può essere rimosso."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -11019,7 +10616,7 @@ msgstr ""
 "Questo nick è già stato richiesto. Per favore, controlla la tua casella di "
 "posta; dovresti aver ricevuto il codice di attivazione."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -11027,7 +10624,7 @@ msgstr ""
 "Questo nick è in attesa di un codice di attivazione via e-mail per "
 "completare la registrazione."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11035,20 +10632,20 @@ msgstr ""
 "Questo nick appartiene a qualcun altro. Per favore scegline un altro.\n"
 "(Se questo è il tuo nick, digita /msg %s IDENTIFY password.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Questo nick è stato registrato; non puoi usarlo."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Questo nickname è momentaneamente sospeso"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Questo nickname è momentaneamente sospeso, motivo: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11058,15 +10655,15 @@ msgstr ""
 "nick, digita /msg %s IDENTIFY password. Altrimenti,\n"
 "scegli un nick diverso."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Questo nick non può essere usato. Per favore scegline un altro."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Questo nick non scadrà."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11074,44 +10671,35 @@ msgstr ""
 "Per cercare canali che cominciano con #, cerca il nome del canale\n"
 "senza il segno # (anope invece di #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Blocco del topic"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Mantenimento del topic"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Il blocco del topic per %s è ora DISATTIVATO."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Il blocco del topic per %s è ora ATTIVATO."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "La memorizzazione del topic per %s è ora DISATTIVATA."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "La memorizzazione del topic per %s è ora ATTIVATA."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Disattiva il caps lock!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Digita /msg %S HELP comando per maggiori informazioni\n"
@@ -11122,7 +10710,7 @@ msgstr ""
 "    minimo può essere impostato con il comando LEVELS di\n"
 "    %s."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11132,7 +10720,7 @@ msgstr ""
 "su un'opzione specifica. Le opzioni verranno impostate sul\n"
 "nickname specificato."
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11140,7 +10728,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11148,7 +10736,7 @@ msgstr ""
 "Digita /msg %S HELP option per ottenere maggiori\n"
 "informazioni su un comando specifico."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11158,127 +10746,108 @@ msgstr ""
 "La tua privacy è rispettata; questa e-mail non sarà data a\n"
 "terzi."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Digita /msg %s LIST NEW per ottenerne la lista."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Digita /msg %s READ %d per leggerlo."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Digita /msg %s READ LAST per leggerlo."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modi"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canale"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canale [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canale"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Impossibile caricare il modulo %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Impossibile rimuovere il modulo %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Opzione SASET %s sconosciuta."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Opzione SET %s sconosciuta."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opzione %s di STATS sconosciuta."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Comando sconosciuto %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Comando sconosciuto %s.  \"/msg %s HELP\" per l'aiuto."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "%c è stato ignorato perché è un modo di canale sconosciuto."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opzione %s sconosciuta."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Opzione %s sconosciuta.\n"
-"Digita /msg %S HELP KICK per maggiori informazioni."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Opzione %s sconosciuta.\n"
 "Digita /msg %S HELP SET per maggiori informazioni."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Aggiornamento dei database."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "L'utente %s non è presente nel database di NickServ."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Utenti:      %6d records, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11286,11 +10855,11 @@ msgstr ""
 "L'utente che usava il tuo nick è stato disconnesso.\n"
 "Digita /msg %s RELEASE %s per usarlo prima che termini il blocco di %s."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "L'utente corrisponde a una delle eccezioni del canale."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11298,66 +10867,76 @@ msgstr ""
 "Lista dei nick:\n"
 "Nick                 Mask"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Protezione per i voice"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Lista VOP di %s:\n"
-"  Num  Nick"
+"Attenzione: Hai superato il numero massimo di memo (%d). Non potrai "
+"raggiungere nuovi memo finché non ne elimini alcuni."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Protezione per i voice"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Attenzione: Hai raggiunto il numero massimo di memo (%d). Non potrai "
+"raggiungere nuovi memo finché non ne elimini alcuni."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Occhio a come parli!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Sei già un membro del gruppo di %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Sei già identificato."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "Sei già in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Non sei più un SuperAdmin."
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Non hai il permesso di stare su questo canale."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Non puoi modificare limite dei tuoi memo."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Ora sei un SuperAdmin."
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Ora sei un IRC Operator."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11365,36 +10944,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Adesso sei nel gruppo di %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "Non puoi richiedere una ricevuta se mandi un memo a te stesso."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Non puoi disconnettere te stesso!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Impossibile deidentificare %s perchè è un Services Operator."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Non puoi recuperare te stesso!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11403,7 +10987,7 @@ msgstr ""
 "Questo comando non è utilizzabile; usa i comandi SOP, AOP, HOP e VOP.\n"
 "Digita /msg %s HELP comando per ottenere maggiori informazioni."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11413,7 +10997,7 @@ msgstr ""
 "Utilizza invece i comandi AOP, SOP, HOP e VOP.\n"
 "Digita /msg %s HELP comando per maggiori informazioni."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11421,68 +11005,68 @@ msgstr ""
 "Questo comando non è utilizzabile; usa il comando ACCESS.\n"
 "Digita /msg %s HELP ACCESS per avere maggiori informazioni."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr ""
 "Non puoi impostare il limite dei memo di %s ad un valore superiore a %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr ""
 "Non puoi impostare il limite dei tuoi memo ad un valore superiore a %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Non puoi annullare l'impostazione dell'e-mail."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Hai %d memo, di cui %d non sono stati ancora letti."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Hai %d memo, di cui 1 non è stato ancora letto."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Hai %d memo."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Hai %d memo, nessuno dei quali è stato letto."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Hai 1 memo, e non l'hai ancora letto."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Hai 1 memo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Non hai alcun memo."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Hai %d nuovi memo."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Hai un nuovo memo."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11490,33 +11074,37 @@ msgstr ""
 "Hai ricevuto un nuovo memo da %s.\n"
 "Digita /msg %s READ %d per leggerlo."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Sei stato invitato in %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "I ban che ti riguardavano sono stati rimossi da %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Non c'è alcun limite al numero di memo che puoi conservare."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Non hai nuovi memo."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Non hai nuovi memo."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Devi inserire un numero valido per indicare il tempo."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11524,25 +11112,17 @@ msgstr ""
 "Devi assegnare un bot al canale prima di usare questo comando.\n"
 "Digita /msg %S HELP ASSIGN per maggiori informazioni."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Devi essere operatore di canale (+o) per registrare il canale."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Devi essere connesso per almeno %d secondi per poter registrare il tuo nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Per bloccare il modo +K devi bloccare anche il modo +i."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Per bloccare il modo +L devi bloccare anche il modo +l."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11552,39 +11132,39 @@ msgstr ""
 "Questa e-mail ti permetterà di recuperare la tua password\n"
 "nel caso tu la dimentichi."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Sarai informato dei nuovi memo quando ti connetti e quando li ricevi."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Sarai informato dei nuovi memo quando ti connetti."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Sarai informato dei nuovi memo quando li ricevi."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Non potrai più ricevere memo."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "Non verrai più informato via email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Non sarai informato dei nuovi memo."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "Verrai ora informato su nuovi memo via email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11592,34 +11172,54 @@ msgstr ""
 "Il tuo IRCD non supporta i vIdent; se li supporta, invia un messaggio al "
 "team di sviluppo dei Services indicandolo come possibile bug."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "La tua lista d'accesso è vuota."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "La lista autokick di %s è vuota."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "La lista ignore è vuota."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Il limite dei tuoi memo è stato disabilitato."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Il limite dei tuoi memo è stato impostato a %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Il limite dei tuoi memo è %d, e non può essere modificato."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Il limite dei tuoi memo è %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Il limite dei tuoi memo è 0; non riceverai alcun nuovo memo."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11627,178 +11227,733 @@ msgstr ""
 "Il limite dei tuoi memo è 0; non riceverai alcun nuovo memo. Non puoi "
 "modificare questo limite."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Non sei più identificato per il tuo nick."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Il tuo nick è già registrato; digita prima /msg %s DROP."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Il tuo nick non è registrato."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Il tuo nick è stato deregistrato."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Il tuo nick sarà cambiato a %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Il codice di attivazione è stato reinviato a %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "La tua password è %s - non dimenticarla!"
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "La tua password è troppo lunga. Riprova con una password piu corta."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Il tuo vhost (%s) ora è attivato."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Il tuo vhost (%s@%s) ora è attivato."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Messaggio di ingresso - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Messaggio per gli operatori - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Messaggio del giorno - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "disattivato"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "non scade"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "attivato"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "scade con il prossimo aggiornamento dei database"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "scade tra %d giorno"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "scade tra %d giorni"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "scade tra %d ora, %d minuto"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "scade tra %d ora, %d minuti"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "scade tra %d ore, %d minuto"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "scade tra %d ore, %d minuti"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "scade tra %d minuto"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "scade tra %d minuti"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Il vhost di %s è stato rimosso."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Il vhost per %s è stato impostato a %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Il vhost per %s è stato impostato a %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Il vhost per il gruppo di %s è stato impostato a %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Il vhost per il gruppo di %s è stato impostato a %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "i vhost per il gruppo %s sono stati rimossi."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "Liste xOP"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "Il sistema di liste xOP per %s è ora DISATTIVATO."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "Il sistema di liste xOP per %s è ora ATTIVATO."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "Il sistema xOP non è disponibile."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | canale} testo-del-memo"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s aggiunto alla lista AOP di %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s aggiunto alla lista HOP di %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s aggiunto alla lista SOP di %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s aggiunto alla lista VOP di %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s eliminato dalla lista HOP di %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s eliminato dalla lista SOP di %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s eliminato dalla lista VOP di %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s spostato alla lista HOP di %s."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s spostato alla lista SOP di %s."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s spostato alla lista VOP di %s."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s non trovato nella lista HOP di %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s non trovato nella lista SOP di %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s non trovato nella lista VOP di %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr "    PRIVATE    Nasconde il nick dalla lista (/msg %S LIST)"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d giorni"
+
+#~ msgid "%d hours"
+#~ msgstr "%d ore"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minuti"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d secondi"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "La lista HOP di %s è vuota."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "La lista SOP di %s è vuota."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "La lista VOP di %s è vuota."
+
+#~ msgid "1 day"
+#~ msgstr "1 giorno"
+
+#~ msgid "1 hour"
+#~ msgstr "1 ora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuto"
+
+#~ msgid "1 second"
+#~ msgstr "1 secondo"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Permette l'uso del comando CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Permette l'uso dei comandi HALFOP e DEHALFOP"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "La lista HOP del canale %s è stata svuotata."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "La lista SOP del canale %s è stata svuotata."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "La lista VOP del canale %s è stata svuotata."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "Eliminati %d record dalla lista HOP di %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "Eliminati %d record dalla lista SOP di %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "Eliminati %d record dalla lista VOP di %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "Eliminato un record dalla lista HOP di %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "Eliminato un record dalla lista SOP di %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "Eliminato un record dalla lista VOP di %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Impostazione dell'indirizzo e-mail annullata."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Fine della lista dei nick."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Il messaggio di ingresso di %s è stato annullato."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Il bot non è sul canale %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "Messaggio di ingresso: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "La lista d'accesso per %s è vuota."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Lista di accesso di %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Il messaggio di ingresso di %s è stato cambiato."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "La modalità fantasy ora è DISATTIVA sul canale %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "La modalità greet (saluto) ora è DISATTIVA sul canale %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista HOP di %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Errore interno - Impossibile elaborare la richiesta."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "La Logon News numero %d è stata eliminata."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s non registrato."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Registrazione del nick (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Password del nick (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Nessun # trovato davanti al nome del canale."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "La modalità No Bot ora è DISATTIVA sul canale %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Nessun record corrispondente nella lista HOP di %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Nessun record corrispondente nella lista SOP di %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Nessun record corrispondente nella lista VOP di %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Il record specificato (%d) non è presente nella lista AOP di %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Il record specificato (%d) non è presente nella lista HOP di %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Il record specificato (%d) non è presente nella lista SOP di %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Il record specificato (%d) non è presente nella lista VOP di %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "L'opzione Op-notice per %s è ora DISATTIVATA."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "L'opzione Peace per %s è ora DISATTIVATA."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr "Attendi %d secondi prima di usare di nuovo il comando SEND."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "La modalità Private del bot %s ora è DISATTIVA."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "L'opzione Private per %s è ora DISATTIVATA."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Opzione private SPENTA per %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protezione SPENTA per %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "La protezione ora è ATTIVA, senza ritardo."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER password [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "L'opzione Restricted access per %s è ora DISATTIVATA."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista SOP di %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Il canale %s non è registrato"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND canale [motivo]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "L'opzione Secure founder per %s è ora DISATTIVATA."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "L'opzione Secure ops per %s è ora DISATTIVATA."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "L'opzione Secure per %s è ora DISATTIVATA."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Opzione secure SPENTA per %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "I Services non riescono a cambiare i modi. I server sono configurati "
+#~ "correttamente?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "I Services sono up da %d giorno, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "I Services sono up da %d ora, %d minuto"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "I Services sono up da %d ora, %d minuti"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "I Services sono up da %d ore, %d minuto"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "I Services sono up da %d minuto, %d secondo"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "I Services sono up da %d minuto, %d secondi"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "I Services sono up da %d minuti, %d secondo"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "L'opzione Signed kick per %s è ora DISATTIVATA."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Spiacente, la modifica della lista HOP è temporaneamente disabilitata."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Spiacente, la modifica della lista SOP è temporaneamente disabilitata."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Spiacente, la modifica della lista VOP è temporaneamente disabilitata."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr ""
+#~ "Spiacente, puoi avere un massimo di %d nick nelle liste SOP/AOP/HOP/VOP "
+#~ "di un canale."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "La modalità symbiosis ora è DISATTIVA sul canale %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Sintassi: RANDOMNEWS ADD testo"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR canale cosa"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Sintassi: OPERNEWS ADD testo"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Sintassi: SET DEBUG {ON | OFF | numero}\n"
+#~ "\n"
+#~ "Attiva o disattiva la modalità di debug. In modalità di\n"
+#~ "debug, tutti i dati inviati e ricevuti dai Services,\n"
+#~ "nonché altri messaggi di debug, saranno scritti nel file\n"
+#~ "di log. Se viene specificato un numero, la modalità\n"
+#~ "di debug sarà attivata, e il livello di debug sarà\n"
+#~ "impostato a numero.\n"
+#~ "\n"
+#~ "Questa opzione è equivalente all'opzione di riga di comando\n"
+#~ "-debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Sintassi: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Messaggio di saluto per %s rimosso."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "Questo modulo non può essere rimosso."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Il blocco del topic per %s è ora DISATTIVATO."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "La memorizzazione del topic per %s è ora DISATTIVATA."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Comando sconosciuto %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Opzione %s sconosciuta.\n"
+#~ "Digita /msg %S HELP KICK per maggiori informazioni."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "L'utente %s non è presente nel database di NickServ."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista VOP di %s:\n"
+#~ "  Num  Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Il bot %s è stato eliminato."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] Il memo che hai inviato a %s è stato letto."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] Il memo che hai inviato a %s è stato letto."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "L'ultimo memo inviato a %s è stato annullato."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Il tuo vhost (%s) ora è attivato."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Il bot %s è stato eliminato."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "Il sistema di liste xOP per %s è ora DISATTIVATO."
diff --git a/lang/anope.nl_NL.po b/language/anope.nl_NL.po
index 551bbfdcf..3936584cf 100644
--- a/lang/anope.nl_NL.po
+++ b/language/anope.nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:53-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s voor meer informatie."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Voor meer informatie over een specifiek commando, type\n"
 "/msg %S HELP commando."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -54,14 +54,15 @@ msgstr ""
 "/msg %S commando typen. Voor meer informatie over een\n"
 "specifiek commando moet je /msg %S HELP command typen."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S stelt je in staat om kanalen te registreren en er\n"
@@ -73,12 +74,12 @@ msgstr ""
 "specifiek commando type je /msg %S HELP commando.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -91,122 +92,106 @@ msgstr ""
 "\n"
 "%S's commando's bevatten:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s heeft het DEFCON niveau veranderd naar %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s toegevoegd aan %s AOP lijst."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s toegevoegd aan %s HOP lijst."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s toegevoegd aan %s SOP lijst."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s toegevoegd aan %s VOP lijst."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s toegevoegd aan %s toeganslijst met niveau %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s toegevoegd aan %s autokick lijst."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s toegevoegd aan %s slechte woorden lijst."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s toegevoegd aan de AKILL lijst."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s toegevoegd aan de SNLINE lijst."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s toegevoegd aan de SQLINE lijst."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s toegevoegd aan de SZLINE lijst."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s toegevoegd aan je toegangslijst."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s toegevoegd aan je toegangslijst."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s bestaat al op %s slechte woorden lijst."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s bestaat al op %s autokick lijst."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s bestaat al op de AKILL lijst."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s bestaat al op de uitzonderingenlijst."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s bestaat al op de SNLINE lijst."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s bestaat al op de SQLINE lijst."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s bestaat al op de SZLINE lijst."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s kan niet worden ingesteld als aantal keer om te bannen."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s heeft je gebruikersmodes veranderd."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -215,132 +200,113 @@ msgstr ""
 "%s kanalen lijst:\n"
 "Naam                 Gebruikers Modes   Topic"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s verwijderd van %s AOP lijst."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s verwijderd van %s HOP lijst."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s verwijderd van %s SOP lijst."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s verwijderd van %s VOP lijst."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s verwijderd van %s toegangslijst."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s verwijderd van %s autokick lijst."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s verwijderd van %s slechte woorden lijst."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s verwijderd van de sessie limiet uitzonderingenlijst."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s verwijderd van de AKILL lijst."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s verwijderd van de SNLINE lijst."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s verwijderd van de SQLINE lijst."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s verwijderd van de SZLINE lijst."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s verwijderd van je toegangslijst."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s uitgeschakeld op kanaal %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s heeft te veel geregistreerde kanalen."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s is al gedekt door %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s toegevoegd aan je toegangslijst."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s is geen geldig ban type."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s is geen geldige bot of geregistreerd kanaal."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s is geen geldig e-mail adres."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s is niet meer altijd actief op kanaal %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s is momenteel niet op kanaal %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s is nu altijd actief op kanaal %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "Nick %s niet gevonden op de negeer-lijst."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -349,107 +315,72 @@ msgstr ""
 "%s komt overeen met een uitzondering op %s en kan niet worden gebanned "
 "totdat de uitzondering is verwijderd."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s verplaatst naar %s AOP lijst."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s verplaatst naar %s HOP lijst."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s verplaatst naar %s SOP lijst."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s verplaatst %s VOP lijst."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s niet gevonden op %s AOP lijst."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s niet gevonden op %s HOP lijst."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s niet gevonden op %s SOP lijst."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s niet gevonden op %s VOP lijst."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s niet gevonden op %s toegangslijst."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s niet gevonden op %s autokick lijst."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s niet gevonden op %s slechte woorden lijst."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s niet gevonden op de sessie lijst."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s niet gevonden op de sessie limiet uitzonderingenlijst."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s niet gevonden op de AKILL lijst."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s niet gevonden op de SNLINE lijst."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s niet gevonden op de SQLINE lijst."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s niet gevonden op de SZLINE lijst."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s niet gevonden op je toegangslijst."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s verwijderd van je toegangslijst."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -458,34 +389,34 @@ msgstr ""
 "%s gebruikers lijst:\n"
 "Nick                 Mask"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s zal niet meer genegeerd worden."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s zal nu genegeerd worden voor %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s zal nu permanent genegeerd worden."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr ""
 "Waarschuwing: Alle commando's die naar %S gestuurd worden worden gelogd!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Let op: Services zijn in alleen-lezen mode; veranderingen worden niet "
 "opgeslagen!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -493,11 +424,11 @@ msgstr ""
 "Reminder: AKILL masks kunnen geen nicknames bevatten; ben er zeker van dat "
 "je geen nick-deel in je mask hebt."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Herrinering: Je kan alleen IP masks toevoegen aan de SZLINE lijst."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -540,42 +471,38 @@ msgstr ""
 "worden toegevoegd dmv het LEVELS commando; type\n"
 "/msg %S HELP LEVELS voor meer informatie."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Waarschuwing: Je hebt je maximum aantal memo's overschreden (%d).  Je kan "
-"geen nieuwe memo's ontvangen totdat je enkele van je huidige memo's "
-"verwijdert."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Waarschuwing: Je hebt je maximum aantal memo's bereikt (%d).  Je kan geen "
-"nieuwe memo's ontvangen totdat je enkele van je huidige memo's verwijdert."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] De memo die je gestuurd hebt is bekeken."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER wachtwoord email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER wachtwoord email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP doel wachtwoord"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -585,7 +512,7 @@ msgstr ""
 "kwaadwillige acties te helpen. Misbruik van %S zal resulteren in,\n"
 "minimaal, verlies van de misbruikte nick(s)."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -597,7 +524,7 @@ msgstr ""
 "ze hoeven te indentificeren via een wachtwoord, en kunnen de\n"
 "toegangs-, AKICK-, en niveau-lijsten bekijken voor elk kanaal."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -609,368 +536,383 @@ msgstr ""
 "mogen de toegangslijst voor elke nick bekijken.\n"
 "(/msg %S ACCESS LIST nick)"
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "               Opties: %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "               vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "             Bot nick: %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "             Bot nick: nog geen toegewezen."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "              Opties: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "   Hoofdletter kicker: %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "   Hoofdletter kicker: %s (%d kick(s) om te bannen; minimaal %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "   Hoofdletter kicker: %s (minimaal %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "        Stichter: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "        Ban type: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "           Vet kicker: %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "           Vet kicker: %s (%d kick(s) om te bannen)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "         Flood kicker: %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "         Flood kicker: %s (%d kick(s) om te bannen; %d regels in %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "         Flood kicker: %s (%d regels in %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Mask: %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "       Kleuren kicker: %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "       Kleuren kicker: %s (%d kick(s) om te bannen)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "        Ban type: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr " Laatst gebruikt: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Modeslot: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "    Herhalings kicker: %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "    Herhalings kicker: %s (%d kick(s) om te bannen; %d maal)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "    Herhalings kicker: %s (%d maal)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "        Opvolger: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Tijdelijk buiten werking gesteld: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "   Hoofdletter kicker: %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "           Vet kicker: %s (%d kick(s) om te bannen)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "      Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "      Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "   Laatste topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "   Geregistreerd: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (uitgeschakeld)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (alleen stichter)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     De lijst met toegestane adressen wijzigen"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Wijzig de lijst van toegestane gebruikers"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "ACT                Makes the bot do the equivalent of a \"/me\" command"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Beheer de AutoKick lijst"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Beheer de AutoKick lijst"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Beheer de AKILL lijst"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      List channels you have access on"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Wijzig de lijst van AOP's"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Wijs een bot toe aan een kanaal"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Beheer slechte-woorden lijst"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bans a selected nick on a channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       Stelt in hoe Services bans op het kanaal maken"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Beheer de lijst met bots op het netwerk"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Geef beschikbare bots weer"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Annuleer je laatst verzonden memo"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL all users on a specific channel"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Geef alle kanalen weer"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Kijk of je laatste memo naar iemand is gelezen"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Verwijder alle modes van een kanaal"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr "    UNBAN      Remove all bans preventing you from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirm a nickserv auth code"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "    Gemaakt: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipulate the DefCon system"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Verwijder de vhost van een andere gebruiker"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Verwijder een of meerdere memo's"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Verwijder de vhost voor alle nicks in een groep"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deops a selected nick on a channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Stelt de kanaalbeschrijving in"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoices a selected nick on a channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Stel de weergave van je groep in Services in"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Annuleer een kanaalregistratie"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       De registratie van je nickname annuleren"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "    Beschrijving: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Associeer een E-mail adres met je nick"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Stel een bericht in dat naar de gebruikers\n"
-"                    wordt gestuurd zodra ze het kanaal binnekomen"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Beheer de sessie-limiet uitzonderingen lijst"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Verbied het gebruik van een kanaal"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Voorkom dat een nick gebruikt wordt"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Stelt de stichter van het kanaal in"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -978,70 +920,75 @@ msgstr ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Returns the key of the given channel"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Bekijk het wachtwoord voor een nick\n"
 "               (alleen als encryptie is uitgeschakeld)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lists all nicknames in your group"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Stuurt een bericht naar alle gebruikers"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Associeer een begroeting met je nick"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Stelt de vhost voor all nicks in een groep gelijk"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Bij een groep aanmelden"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "       Groet-bericht: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Halfops a selected nick on a channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Verberg verschillende soorten nick informatie"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Jezelf identificeren met je wachtwoord"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Wijzig de Services negeer-lijst"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Wijzig de Services negeer-lijst"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1049,49 +996,49 @@ msgstr ""
 "INFO               Allows you to see BotServ information about a channel or "
 "a bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Displays information about a given nickname"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Lists information about the named registered channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Toont info over jouw memo's"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        \"Jupiter\" een server"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 "    KEEPTOPIC     Onthoud het topic zoland het kanaal niet in\n"
 "                    gebruik is"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Configureer kickers"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Kick een gebruiker uit een kanaal"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicks a selected nick from a channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Zet bescherming aan of uit"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1099,93 +1046,86 @@ msgstr ""
 "    LANGUAGE   Selecteer de taal die Services zal gebruiken\n"
 "                   voor het versturen van berichten naar jou"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Verander de betekenissen van toegangsniveaus"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Geeft een of meer vhosts weer."
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       List all registered nicknames that match a given pattern"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lists all registered channels matching the given pattern"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Geef je memo's weer"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   Stel de berichten in die gebruikers krijgen als\n"
 "                ze inloggen"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Zet kanaal modes vast aan of uit"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Verander de modes op een kanaal"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Verwijder alle modes van een kanaal"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Info over een geladen module"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Geef geladen modules weer"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Laad een module"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Laad een module"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Ontlaad een module"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Verander de communicatiemanier van Services"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1193,92 +1133,83 @@ msgstr ""
 "    NOOP        Verwijder tijdelijk alle O:regels van een server\n"
 "                op afstand"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Deactiveert je toegewezen vhost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Geef Operflags aan een bepaalde gebruiker"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Activeert je toegewezen vhost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Gives Op status to a selected nick on a channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 "    OPERNEWS    Stel de berichten in die gebruikers te zien krijgen\n"
 "                die OPER worden"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Stuur een notice wanneer de OP/DEOP commando's\n"
 "                    worden gebruikt."
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gives you owner status on channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "     Opties: %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Verander het wachtwoord voor je nick"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Reguleer het gebruik van kritieke commando's"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Verberg een kanaal van het LIST commando"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Zorgt ervoor dat je nick niet verschijnt in een\n"
-"                   /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protects a selected nick on a channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Sluit Services af zonder databases op te slaan"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1286,241 +1217,244 @@ msgstr ""
 "    RANDOMNEWS  Stel de berichten in waarvan gebruikers er willekeurig\n"
 "                een te zien krijgen als ze inloggen"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Lees een of meerdere memo's"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER    Een andere gebruiker killen die je nick gebruikt"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Registreer een nickname"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Registreer een nickname"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr "    RELEASE    Je nick terugnemen nadat je RECOVER gebruikt hebt"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Herlaad Services' configuratie bestand"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Resend a nickserv auth code"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords."
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Sla databases op en herstart Services"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Limiteer toegang tot het kanaal"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Verstuur een memo en verzoek een ontvangstbevestiging"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "  Inverterings kicker: %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "  Inverterings kicker: %s (%d kick(s) om te bannen)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "SAY                Makes the bot say the given text on the given channel"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Activeer %S veiligheidsopties"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Zet nickname beveiliging aan of uit"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER Sterkere controle van de stichter status"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Sterkere controle van de kanaalop status"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Vertstuur een memo naar een nick of kanaal"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Stuur een memo naar alle geregistreerde gebruikers "
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Je wachtwoord vergeten? Probeer dit"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Bekijk de lijst met sessies per host"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Configureer bot opties"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Stel de vhost van een andere gebruiker in"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Stel verscheidene globale Services opties in"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Stel kanaal opties en informatie in"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Opties instellen, inclusief kill bescherming"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Stel opties gerelateerd aan memo's in"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Stel de vhost voor alle nicks in een groep in"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Sla databases op en sluit Services af"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr ""
 "    SIGNKICK      Onderteken kicks die worden uitgevoerd met het\n"
 "                    KICK commando"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Beheer de SNLINE lijst"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Wijzig de lijst van SOP's"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Beheer de SQLINE lijst"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Display Services staff and online status"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF  Stuur een memo naar alle opers/admin"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Geeft de status van Services en netwerk weer"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Geeft het huidige toegangsniveau van een gebruiker\n"
 "               op een kanaal weer"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Returns the owner status of the given nickname"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Stelt de opvolger van het kanaal in"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Stel een kanaal tijdelijk buiten werking terwijl de\n"
 "               kanaal-data en -instellingen bewaard blijven."
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend a given nick"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Forcefully change a user's nickname"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Beheer de SZLINE lijst"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     Topic kan alleen veranderd worden met TOPIC"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Wijzigt de modus van een gebruiker"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Unassigns a bot from a channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr "    UNBAN      Remove all bans preventing you from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr ""
 "    UNSUSPEND  Stelt een tijdelijk buiten werking gesteld kanaal weer\n"
 "               in werking"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend a given nick"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1528,84 +1462,84 @@ msgstr ""
 "    UPDATE      Forceer dat de Services database onmiddelijk\n"
 "                op de harde schijf wordt weggeschreven"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Geef alle gebruikers weer"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Gebruikt op: %d kana(a)l(en)"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Voices a selected nick on a channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Schakel het gebruikersprivilegesysteem om"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr " Foute woorden kicker: %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr " Foute woorden kicker: %s (%d kick(s) om te bannen)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "        E-mail adres: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "       Is online van: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "  Tijd laatst gezien: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "Topic gezet door: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1614,17 +1548,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1633,98 +1567,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr " Toegangsbericht: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr " Echte naam: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "  Tijd geregistreerd: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Onderstrepings kicker: %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Onderstrepings kicker: %s (%d kick(s) om bannen)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Nr   Verstuurder       Datum/Tijd"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1733,7 +1671,7 @@ msgstr ""
 "%3d  %s (door %s op %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1742,25 +1680,16 @@ msgstr ""
 "%3d %s (door %s op %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (eeuwig) (door %s op %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (door %s op %s; %s)\n"
 "    Limiet: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1769,255 +1698,261 @@ msgstr ""
 "%5d (%s door %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d   %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "%S commando's:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s wordt niet geinformeerd over nieuwe memo's."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modules geladen."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bots beschikbaar."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d dagen"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (door %s op %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d uren"
+msgid "%d Modules loaded."
+msgstr "%d Modules geladen."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minuten"
+msgid "%d bots available."
+msgstr "%d bots beschikbaar."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicks in de groep."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondes"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "%s AOP lijst is leeg."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "%s HOP lijst is leeg."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "%s SOP lijst is leeg."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "%s VOP lijst is empty."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s toegangslijst is leeg."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "%s autokick lijst is leeg."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "%s slechte woorden lijst is leeg."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s kan de opvolger niet zijn op kanaal %s omdat hij/zij founder is."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s kan geen memo's ontvangen."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "%S commando's:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "%s dekking is te groot; Gebruik aub een meer specifiek hostmask."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s heeft momenteel %d memo's, waarvan er %d ongelezen zijn."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s heeft momenteel %d memo's, waarvan er 1 ongelezen is."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s heeft momenteel %d memo's."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s heeft momenteel %d memo's; allemaal zijn ze ongelezen."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s heeft momenteel 1 memo, en deze is nog ongelezen."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s heeft momenteel 1 memo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s heeft momenteel geen memo's."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s heeft momenteel te veel memo's en kan er geen meer ontvangen."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s heeft geen memo limiet."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s heeft geen memo's."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s heeft geen nieuwe memo's."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s is %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s is momenteel offline."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s is momenteel online."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s is uitgeschakeld"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s is ingeschakeld"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is geen SuperAdminstrator meer"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s wordt niet geinformeerd over nieuwe memo's."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s wordt geinformeerd over nieuwe memo's wanneer je inlogt en wanneer deze "
 "arriveren."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s wordt geinformeerd over nieuwe memo's wanneer je inlogt."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s wordt geinformeerd over nieuwe memo's wanneer deze arriveren."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s is nu een SuperAdministrator"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"AOP lijst voor %s:\n"
+"  Num  Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s niet gevonden op %s autokick lijst."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s verwijderd van %s autokick lijst."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s zal je nu niet over memo's informeren."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr ""
 "%s zal je nu informeren over memo's wanneer deze naar jou worden verzonden."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2026,94 +1961,78 @@ msgstr ""
 "%s zal je nu informeren over memo's zodra je inlogt en wanneer deze naar je "
 "toe gezonden worden."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s zal je nu informeren over memo's wanneer je inlogt of /AWAY uitschakelt."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) toegevoegd aan de bot lijst."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s's memo limiet is %d, en mag niet worden veranderd."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s's memo limiet is %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL elke nieuwe client die connecteerd"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Forceer Kanaal Modes (%s) op alle kanalen"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Negeer elke non-oper met een boodschap"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill elke nieuwe client die connecteerd"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Geen MLOCK veranderingen"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Geen nieuwe channel registratie's"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Geen nieuwe memo's verzenden"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Geen nieuwe nick registratie's"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Negeer non-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Gebruik de beperkte sessie limiet van %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 dag"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 uur"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minuut"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 seconde"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Een memo werd gestuurd naar alle geregistreerde gebruikers."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2122,133 +2041,135 @@ msgstr ""
 "Een notificatie-memo is naar %s verstuurd om hem/haar te\n"
 "informeren dat je zijn/haar memo gelezen hebt."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "Een verificatiecode is verstuurd naar %s. Type /msg %s confirm "
 "<verificatiecode> om de registratie te voltooien."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "Een vhost ident moet in een geldig ident formaat zijn."
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Een vhost moet in een geldig hostmask formaat zijn."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS kanaal {ADD|DEL|LIST|VIEW|CLEAR} [nick [niveau] | lijst]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT kanaal text"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mask]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK kanaal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-of-usermask] [reden]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE voor %s compleet; %d gebruikers zijn getroffen."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "AKILL lijst is leeg."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst} "
 "[reden]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"AOP lijst voor %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN kanaal nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Toegang geweigerd."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Toegangsniveau voor %s op %s veranderd in %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Toegangsniveau voor %s op %s onveranderd van %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Toegansniveau moet tussen de %d en %d inclusief liggen."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Toegangsniveau mag geen nul zijn."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Toegangsniveau instellingen voor kanaal %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Toegangsniveaus voor %s teruggezet naar standaardwaarden."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Toegangslijst voor %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Toegangslijst voor %s:\n"
 "  Num   Niv  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Toegangslijst:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2257,22 +2178,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s toegevoegd aan %s autokick lijst."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Nieuw login nieuws toegevoegd (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Nieuw oper nieuwsbericht toegevoegd (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Nieuw willekeurig nieuwsbericht toegevoegd (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2280,237 +2206,230 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Alle O:lines van %s zijn verwijderd."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Alle O:lines van %s zijn hersteld."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Alle bans op kanaal %s zijn weggehaald."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Alle uitzonderingen op kanaal %s zijn verwijderd."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "All invites on channel %s have been removed."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Alle login nieuwsberichten zijn verwijderd."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Alle memo's voor kanaal %s zijn verwijderd."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Alle modes verwijderd van kanaal %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Alle modes op kanaal %s zijn teruggezet op hun oorspronkelijke waarde."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Al je memo's zijn verwijderd."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Alle oper nieuwsberichten zijn verwijderd."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Alle willekeurige nieuwsberichten zijn verwijderd."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Alle users zijn gekicked van kanaal %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Toegestaan om zichzelf te (de)halfoppen"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Toegestaan om zichzelf te (de)oppen"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Toegestaan om zichzelf (niet) te beschermen"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Toegestaan om zichzelf te (de)voicen"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Toegestaan om een bot aan te stellen/weg te halen"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Toegestaan om zichzelf te bannen"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Toegestaan om zichzelf te kicken"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Toegestaan om kanaal memo's te lezen"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Toegestaan om de toegangslijst te wijzigen"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Toegestaan om AKICK te gebruiken"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Toegestaan om BADWORDS te gebruiken"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Toegestaan om BAN te gebruiken"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Toegestaan om CLEAR te gebruiken"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Toegestaan om GETKEY te gebruiken"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Toegestaan om HALFOP/DEHALFOP te gebruiken"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Toegestaan om INFO met de ALL optie te gebruiken"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Toegestaan om INVITE te gebruiken"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Toegestaan om KICK te gebruiken"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Toegestaan om OP/DEOP te gebruiken"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Toegestaan om PROTECT/DEPROTECT te gebruiken"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Toegestaan om SAY en ACT te gebruiken"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Toegestaan om SET te gebruiken (niet FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Toegestaan om TOPIC te gebruiken"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Toegestaan om UNBAN te gebruiken"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Toegestaan om VOICE/DEVOICE te gebruiken"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Toegestaan om FANTASIA commando's te gebruiken"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Toegestaan om de toegangslijst te bekijken"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Autokick lijst voor %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Automatisch mode +o"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Automatisch mode +a"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Automatisch mode +h"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Automatisch mode +v"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS kanaal {ADD|DEL|LIST|CLEAR} [woord | entry-lijst] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2520,7 +2439,7 @@ msgstr ""
 "BOT CHANGE oude-nick nieuwe-nick [gebruiker [host [echte naam]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2529,111 +2448,109 @@ msgstr ""
 "Slechte woorden lijst voor %s:\n"
 "  Nr    Woord                          Type"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Slechte woorden lijst is nu leeg."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Ban type voor kanaal %s is nu #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Binaire modes en bans verwijderd van kanaal %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s bestaat al."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Bot %s bestaat niet."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s toegewezen aan %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Bot %s is veranderd in %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Bot %s is verwijderd."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Channel %s heeft al een bot toegewezen namelijk: %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot zal ops kicken op kanaal %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot zal voices kicken op kanaal %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot zal geen ops kicken op kanaal %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot zal geen voices kicken op kanaal %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts mogen maximaal %d tekens bevatten."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Bot Hosts mogen alleen geldige host-tekens bevatten."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents mogen maximaal %d tekens bevatten."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Bot Idents mogen alleen geldige tekens bevatten."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks mogen alleen geldige nick-tekens bevatten."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Bot is niet in kanaal %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Bot lijst:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Bot zal een kanaal joinen wanneer daar tenminste %d\n"
-"gebruiker(s) is/zijn."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2644,7 +2561,7 @@ msgstr ""
 "%d kicks voor dezelde gebruiker. Gebruik BADWORDS commando\n"
 "om slechte woorden toe te voegen of te verwijderen."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2652,20 +2569,20 @@ msgstr ""
 "Bot zal nu kicken op slechte woorden. Gebruik het BADWORDS commando\n"
 "om slechte woorden toe te voegen of te verwijderen."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Bot zal nu kicken op vet, en zal een ban zetten na \n"
 "%d kicks voor dezelfde gebruiker."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Bot zal nu kicken op vet."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2676,7 +2593,7 @@ msgstr ""
 "%d karakters en %d%% van het gehele bericht), en zal \n"
 "een ban plaatsen na %d kicks voor dezelfde gebruiker."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2685,47 +2602,47 @@ msgstr ""
 "Bot zal nu kicken op hoofdletters (bij minstens\n"
 "%d karakters en %d%% van het gehele bericht)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot zal nu kicken op kleuren, en zal een ban zetten na \n"
 "%d kicks voor dezelfde gebruiker."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Bot zal nu kicken op kleuren."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Bot zal nu kicken op flood (%d regels in %d seconden), \n"
 "en zal een ban zitten na %d kicks voor dezelfde gebruiker."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot zal nu kicken op flood (%d regels in %d seconden)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2736,7 +2653,7 @@ msgstr ""
 "hetzelfde zeggen), en zal een ban zetten na %d\n"
 "kicks voor dezelfde gebruiker."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2745,137 +2662,153 @@ msgstr ""
 "Bot zal nu kicken op herhalingen (users die %d maal\n"
 "hetzelfde zeggen)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot zal nu kicken op inverteringen, en zal een ban zetten na\n"
 "%d kicks voor dezelfde gebruiker."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Bot zal nu kicken op inverteringen."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot zal nu kicken op onderstrepingen, en zal een ban zetten na \n"
 "%d kicks voor dezelfde gebruiker."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Bot zal nu kicken op onderstrepingen."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Bot zal nu kicken op kleuren."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Bot zal niet meer kicken op slechte woorden."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Bot zal niet meer kicken op vet."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Bot zal niet meer kicken op hoofdletters."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Bot zal niet meer kicken op kleuren."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Bot zal niet meer kicken op flood."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Bot zal niet meer kicken op herhalingen."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot zal niet meer kicken op inverteringen."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot zal niet meer kicken op onderstrepingen."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Bot zal niet meer kicken op hoofdletters."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d records, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots gereserveerd voor IRC operators:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "   Bytes gelezen: %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes geschreven: %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | kanaal}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nick"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR kanaal wat"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES kanaal [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Kan %s niet uitloggen omdat hij een service administrator is."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR kanaal wat"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Onmogelijk e-mail te sturen; probeer na een tijdje opnieuw."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d records, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Gebruikersmodes van %s veranderd."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Channel %s bestaat niet."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Kanaal %s is gede-registreerd."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2884,142 +2817,103 @@ msgstr ""
 "Channel %s is verboden door %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Kanaal %s is al geregistreerd!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Kanaal %s is nu verboden."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Kanaal %s is nu weer in werking gesteld."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Kanaal %s is tijdelijk buiten werking gesteld."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Channel %s is niet geregistreerd."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Channel %s mag niet geregistreerd of gebruikt worden."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Kanaal %s mag niet geregistreerd worden."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Kanaal %s is geregistreerd onder jouw nickname: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Kanaal        : %6d records, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Kanaal %s zal verlopen."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Kanaal %s zal niet verlopen."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Kanaal %s AOP lijst is leeggemaakt."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Kanaal %s HOP lijst is leeggemaakt."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Kanaal %s SOP lijst is leeggemaakt."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Kanaal %s VOP lijst is leeggemaakt."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Kanaal %s toegangslijst is leeggemaakt."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Kanaal %s autokick lijst is leeggemaakt."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Kanaal %s is nu weer in werking gesteld."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Kanaal AOP lijsten mogen alleen geregistreerde nicks bevatten."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Kanaal HOP lijsten mogen alleen geregistreerde nicks bevatten."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Kanaal SOP list mag alleen geregistreerde nicks bevatten."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Kanaal SQLINEs worden niet ondersteund door je IRCd, dus kun je ze niet "
 "gebruiken."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Kanaal VOP lijst mag alleen geregistreerde nicks bevatten."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Kanaal toegangslijst mag alleen geregistreerde nicks bevatten."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3027,11 +2921,7 @@ msgstr ""
 "Kanalen lijst:\n"
 "Naam                 Gebruikers Modes   Topic"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Kanaal operator status niet toegestaan"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3040,7 +2930,7 @@ msgstr ""
 "Kanalen waarop %s toegang heeft:\n"
 "  Nr   Kanaal               Niveau   Beschrijving"
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3048,31 +2938,16 @@ msgstr ""
 "Kanalen waarop je toegang hebt:\n"
 "  Nr   Kanaal               Niveau   Beschrijving"
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Kan kanaal %s niet verbieden!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Verbieden van nick %s is niet gelukt!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Kan kanaal %s niet terug in werking stellen!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Kan kanaal %s niet tijdelijk buiten werking stellen!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Huidige AKILL lijst:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3080,15 +2955,15 @@ msgstr ""
 "Huidige AKILL lijst:\n"
 "  Nr    Mask                              Reden"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Huidige Module lijst:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Huidige SNLINE lijst:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3096,11 +2971,11 @@ msgstr ""
 "Huidige SNLINE lijst:\n"
 "  Nr    Mask                              Reden"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Huidige SQLINE lijst:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3108,11 +2983,11 @@ msgstr ""
 "Huidige SQLINE lijst:\n"
 "  Nr    Mask                              Reden"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Huidige SZLINE lijst:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3120,725 +2995,612 @@ msgstr ""
 "Current SZLINE list:\n"
 "  Nr    Mask                              Reden"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Huidige Sessie Limiet Uitzonderingenlijst:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Huidig aantal AKILLs: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Huidig aantal SNLINEs: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Huidig aantal SQLINEs: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Huidig aantal SZLINEs: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Huidige gebruikers: %d (%d ops)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [kanaal] {nr | lijst | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP kanaal"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Standaard AKILL verloop tijd: %d dagen"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Standaard AKILL verloop tijd: %d uur"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Standaard AKILL verloop tijd: %d minuten"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Standaard AKILL verloop rijd: 1 dag"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Standaard AKILL verloop tijd: 1 uur"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Standaard AKILL verloop tijd: 1 minuut"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Standaard AKILL verloop tijd: Verloopt niet"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Standaard SNLINE verloop tijd: %d dagen"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Standaard SNLINE verloop tijd: %d uur"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Standaard SNLINE verloop tijd: %d minuten"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Standaard SNLINE verloop tijd: 1 dag"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Standaard SNLINE verloop tijd: 1 uur"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Standaard SNLINE verloop tijd: 1 minuut"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Standaard SNLINE verloop tijd: Verloopt niet"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Standaard SQLINE verloop tijd: %d dagen"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Standaard SQLINE verloop tijd: %d uur"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Standaard SQLINE verloop tijd: %d minuten"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Standaard SQLINE verloop tijd: 1 dag"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Standaard SQLINE verloop tijd: 1 uur"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Standaard SQLINE verloop tijd: 1 minuut"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Standaard SQLINE verloop tijd: Verloopt niet"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Standaard SZLINE verloop tijd: %d dagen"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Standaard SZLINE verloop tijd: %d uur"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Standaard SZLINE verloop tijd: %d minuten"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Standaard SZLINE verloop tijd: 1 dag"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Standaard SZLINE verloop tijd: 1 uur"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Standaard SZLINE verloop tijd: 1 minuut"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Standaard SZLINE verloop tijd: Verloopt niet"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "%d AOPs verwijderd van %s AOP lijst."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "%d HOPs verwijderd van de %s HOP lijst."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "%d SOPs verwijderd van %s SOP lijst."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "%d VOPs verwijderd van %s VOP lijst."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "%d nicks verwijderd van %s toegangslijst."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d autokicks verwijderd van %s autokick lijst."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "%d slechte woorden verwijderd van %s slechte woorden lijst."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "%d uitzonderingen verwijderd van de sessie limiet uitzonderingenlijst."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "%d AKILLs verwijderd van de AKILL lijst."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "%d SNLINEs verwijderd van de SNLINE lijst."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "%d SQLINEs verwijderd van de SQLINE lijst."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "%d SZLINEs verwijderd van de SZLINE lijst."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "1 AOP verwijderd van %s AOP lijst."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "1 HOP verwijderd van de %s HOP lijst."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "1 SOP verwijderd van %s SOP lijst."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "1 VOP verwijderd van %s VOP lijst."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 nick verwijderd van %s toegangslijst."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 autokick verwijderd van %s autokick lijst."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "1 slecht woord verwijderd van %s slechte woorden lijst."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "1 uitzondering verwijderd van de sessie limiet uitzonderingenlijst."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "1 AKILL verwijderd van de AKILL lijst."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "1 SNLINE verwijderd van de SNLINE lijst."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "1 SQLINE verwijderd van de SQLINE lijst."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "1 SZLINE verwijderd van de SZLINE lijst."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "1 AOP verwijderd van %s AOP lijst."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Beschrijving van %s veranderd in %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "uitgeschakeld"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Alle records zijn weergegeven (Aantal: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Alle records getoond van %d tot %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Alle records getoond met overeenkomende key %s (Aantal: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Gebruik geen vet in dit kanaal!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Gebruik geen kleuren in dit kanaal!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Gebruik geen inverteringen in dit kanaal!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Gebruik het woord %s niet in dit kanaal!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Gebruik geen onderstrepingen in dit kanaal!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "E-mail adres verwijderd."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "E-mail voor %s is ongeldig."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [paramenters]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails %s komen overeen met %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "ingeschakeld"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Einde van de %s lijst."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Einde van de toegangslijst."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Einde van kanalen lijst."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Einde van de lijst - %d/%d kanalen weergegeven."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Einde van lijst - %d/%d resultaten weergegeven."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Einde van gebruikers lijst."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Nederlands"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Welkomstbericht voor %s veranderd."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Welkomstbericht voor %s verwijderd."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 "Fout! De ident is te lang. Gebruik een ident die korter is dan %d tekens."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Fout! De vhost is te lang. Gebruik een host die korter is dan %d tekens."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Uitzondering voor %s (#%d) verplaatst naar positie %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Uitzondering voor %s is veranderd in %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "\tExpires in: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Verlooptijd van %s veranders."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID kanaal reden"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID kanaal [reden]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nick reden"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [reden]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasie"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Fantasie mode staat nu AAN op kanaal %s."
+
+#: modules/core/bs_set.cpp:181
+#, c-format
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Fantasie mode staat nu UIT op kanaal %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:174
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Fantasie mode staat nu AAN op kanaal %s."
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s zal niet meer genegeerd worden."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Stichter van kanaal %s veranderd in %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host geen Wildcards!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS commando is onbeschikbaar omdat encryptie aanstaat."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [wachtwoord]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL bericht"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP doel wachtwoord"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Ghost met jouw nick is gekilld."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Begroeting"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Groetingsbericht weergegeven"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Begroetingsmode staat nu UIT op kanaal %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Begroetingsmode staat nu AAN op kanaal %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"HOP lijst voor %s:\n"
-"  Num  Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators.\t"
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts met tenminste %d sessies:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY wachtwoord"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tijd] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO kanaal"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {kanaal | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE kanaal"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Als je niet binnen 20 seconden je nick verandert, verander ik je nick."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Als je niet binnen 1 minuut je nick verandert, verander ik je nick."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Negeer code zal worden gebruikt."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Negeer code zal niet worden gebruikt."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Negeer-lijst is leeggemaakt."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Negeer-lijst is leeg."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Bot lijst:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3854,29 +3616,25 @@ msgstr ""
 "Type /msg %S HELP SET optie voor meer informatie over een\n"
 "specifieke optie."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Ongeldig bereik opgegeven. Het correct gebruik is #van-tot."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informatie voor bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informatie voor kanaal %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Interne fout - onmogelijk om aanvraag af te handelen."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Ongeldige verloop tijd."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3884,14 +3642,14 @@ msgstr ""
 "Ongeldige hostmask. Alleen echte hostmasks zijn geldig als uitzondering "
 "omdat deze niet worden vergeleken met nicks of usernames."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Ongeldige verificatiecode ingevuld. Controleer je e-mail nog eens en probeer "
 "opnieuw."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3900,296 +3658,310 @@ msgstr ""
 "Ongeldige sessie limiet. Het moet een geldige integer groter dan of gelijk "
 "aan nul en kleiner dan %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Ongeldige drempel waarrde. Het moet een geldige integer groter dan 1 zijn."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE servername [reden]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK kanaal optie {ON|OFF} [instellingen]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK kanaal gebruiker reden"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS kanaal {SET | DIS[ABLE] | LIST | RESET} [item [niveau]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST trefbeeld"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST trefbeeld [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [kanaal] [lijst | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [text|nr]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Taal veranderd in Nederlands."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Laatste memo naar %s is ge-annuleerd."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Laatste quit-bericht: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Laatst bekende adres: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Niveau voor %s op kanaal %s veranderd in %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Niveau moet tussen de %d en %d inclusief zijn."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Dit commando is nutteloos in deze mode."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lijst van nicks overeenkomend met %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lijst van nicks in de groep van %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Lijst van nicks in je groep:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Lokale kanalen kunnen niet geregistreerd worden."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Login nieuwsbericht #%d verwijderd."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Login nieuwsbericht #%d niet gevonden!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Login nieuwsberichten:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE kanaal modes"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO bestandsnaame"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD bestandsnaam"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD bestandsnaam"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD bestandsnaam"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Hostmask %s bestaat al op je toegangslijst."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Hostmask moet gegeven worden in de vorm user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Maximum gebruikers: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Memo %d van %s (%s).  Om te verwijderen, type: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Memo %d van %s (%s).  Om te verwijderen, type: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d is verwijderd."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Memo limit voor %s uitgeschakeld."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Memo limiet voor %s veranderd in %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Memo limiet voor %s veranderd in 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Memo limiet te hoog; limitatie ingesteld op %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo verstuurd naar %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ nr"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ nr"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Bericht mode"
 
-#: language.cpp:866
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Mode %c genegeerd omdat je deze niet kan forceren."
-
-#: language.cpp:1314
-#, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Mode +o is verwijderd van kanaal %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Mode forcering van kanaal %s veranderd in %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "        Modeslot: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s geladen"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s geladen"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s is uitgeladen"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Versie: %s Auteur: %s Geladen: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliassen   : %6d records, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS Groepen    : %6d records, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Wordt nooit gekicked door bot kickers"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Nieuwe memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Nieuwe memo's voor %s.  Om te lezen, type: /msg %s READ nr"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Nieuwe memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Nieuws lijst is vol!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4198,146 +3970,132 @@ msgstr ""
 "Nick %s is verboden door %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is een illegale nickname en mag niet worden gebruikt."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is momenteel in gebruik."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Nick %s is nu verboden."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is deel van de Services van dit netwerk."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Nick %s wordt niet vastgehouden."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Nick %s is momenteel niet in gebruik."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Nick %s is niet geregistreerd."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Nick %s mag niet geregistreerd of gebruikt worden."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "Nick %s niet gevonden op de negeer-lijst."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s is verkort naar %d tekens."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s heeft geen memo van jou."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Nick %s is uitgelogd."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is tijdelijk buiten werking gesteld."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is nu vrijgegeven."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is tijdelijk buiten werking gesteld."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick is NIET geregistreerd, probeer later opnieuw."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nickname %s geverificeerd."
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Nickname %s is gedropped."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Nickname %s is al geregistreerd!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Nickname %s mag niet geregistreerd worden."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Nickname %s is geregistreerd onder jouw account: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s is geregistreerd."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Nickname Registratie (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Nick wachtwoord (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4348,161 +4106,116 @@ msgstr ""
 "automatisch verlopen, oftewel: ze zullen verwijderd worden na\n"
 "%d dagen inactiviteit."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Geen # gevonden aan het begin van de kanaalnaam."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Geen Bot mode staat nu UIT op kanaal %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Geen Bot mode staat nu AAN op kanaal %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Geen emails voor %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Geen bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Geen help beschikbaar voor %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Er is geen informatie aanwezig voor module %s"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Geen login nieuwsberichten om te verwijderen!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Geen overeenkomsten op %s AOP lijst."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Geen overeenkomsten op %s HOP lijst."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Geen overeenkomsten op %s SOP lijst."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Geen overeenkomsten op %s VOP lijst."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Geen overeenkomsten op %s toegangslijst."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Geen overeenkomsten op %s autokick lijst."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Geen overeenkomsten op %s slechte woorden lijst."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "Geen overeenkomsten op de sessie limiet uitzonderingenlijst."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Geen overeenkomsten op de AKILL lijst."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Geen overeenkomsten op de SNLINE lijst."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Geen overeenkomsten op de SQLINE lijst."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Geen overeenkomsten op de SZLINE lijst."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Geen annuleerbare memo's gevonden."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Op dit moment zijn er geen modules geladen"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Geen oper nieuwsberichten om te verwijderen!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Geen willekeurige nieuwsberichten om te verwijderen!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Geen reden"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Geen ondertekende kick wanneer SIGNKICK LEVEL is gebruikt"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "#%d bestaat niet op %s AOP lijst."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "#%d bestaat niet op %s HOP lijst."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "#%d bestaat niet op %s SOP lijst."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "#%d bestaat niet op %s VOP lijst."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Geen"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Niet toegestaan kanaal te joinen indien RESTRICTED"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4513,95 +4226,93 @@ msgstr ""
 "er geen gebruiker die op de toegangslijst staat in die periode\n"
 "het kanaal binnen is gekomen) automatisch zal worden verwijderd."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Nr   Limiet Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "OP Notice"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [text|nr]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Oude informatie is gelijk aan de nieuwe."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Op-notice option for %s is now OFF."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Op-notice option for %s is now ON."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Oper nieuwsbericht #%d verwijderd."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Oper nieuwsbericht #%d niet gevonden!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper nieuwsberichten:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d records, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Operflags %s zijn toegevoegd voor %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Ops bescherming"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Optie %s kan niet gezet worden op dit netwerk."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Verificatiecode voor %s is %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Wachtwoord geaccepteerd - je wordt nu herkend."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4609,60 +4320,56 @@ msgstr ""
 "Wachtwoord verificatie benodigd voor dat commando.\n"
 "Probeer opnieuw na het typen van /msg %s IDENTIFY wachtwoord."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Wachtwoord voor %s is %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Wachtwoord incorrect."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Wachtwoord %s is verstuurd."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Vrede"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Peace option for %s is now OFF."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Peace option for %s is now ON."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr "Neem contact op met een Operator om een vhost aan deze nick te binden."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4670,170 +4377,131 @@ msgstr ""
 "tenminste 5 tekens lang zijn, niet iets makkelijk raadbaars (bijv. je echte "
 "naam of je nick), en kan geen tab of spatie bevatten."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Gebruik een geldige servernaam bij het jupen"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Gebruik het # symbool wanner je probeert een kanaal te registeren."
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Wacht %d seconden en probeer opnieuw."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Wacht %d seconden voor het opnieuw gebruiken van het GROUP commando."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Wacht %d seconden voor het opnieuw gebruiken van het REGISTER commando."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Wacht %d seconden voor je het RSEND commando weer gebruikt."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Wacht %d seconden voor het opnieuw gebruiken van het SEND commando."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Prive"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Prive mode van bot %s staat nu UIT."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Prive mode van bot %s staat nu AAN."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Private option for %s is now OFF."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Private option for %s is now ON."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Bescherming"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Protectie staat nu AAN, zonder vertraging."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Stelt het commando: /msg %s %s ter beschikking"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [text|nr]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [kanaal] {lijst | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [wachtwoord]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER kanaal beschrijving"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER wachtwoord email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER wachtwoord [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [wachtwoord]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | kanaal} memo-tekst"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Willekeurig nieuwsbericht #%d verwijderd."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Willekeurig nieuwsbericht #%d niet gevonden!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Willekeurige nieuwsberichten:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4841,296 +4509,307 @@ msgstr ""
 "Registratie stap 1 kan verlopen zijn. Gebruik eerst \"/msg %s register "
 "<wachtwoord> <email>\"."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Beperkte Toegang"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Restricted access option for %s is now OFF."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Restricted access option for %s is now ON."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY kanaal text"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | kanaal} memo-text"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS commando is onbeschikbaar omdat encryptie aanstaat."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limiet"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET kanaal optie instellingen"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET kanaal NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET kanaal PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET kanaal optie parameters"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET kanaal DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET kanaal DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET kanaal FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET kanaal GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET kanaal KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET kanaal OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET kanaal NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET kanaal OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET kanaal PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET kanaal PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET kanaal RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET kanaal SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET kanaal SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET kanaal SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET kanaal SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET kanaal SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET kanaal TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET kanaal XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET optie parameters"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET optie instelling"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE nummer"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [kanaal] limiet"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [gebruiker | kanaal] {limiet | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "SNLINE lijst is leeg."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5138,341 +4817,327 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst}[:"
 "reden]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"SOP lijst voor %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "SQLINE lijst is leeg."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst} "
 "[reden]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Channel %s not registered"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND kanaal reden"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND kanaal [reden]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND kanaal reden"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick reden"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nieuwe nick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "SZLINE lijst is leeg."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst} "
 "[reden]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Veilig"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Veilige Stichter"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Veilige Ops"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Secure founder option for %s is now OFF."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Secure founder option for %s is now ON."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Secure ops option for %s is now OFF."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Secure ops option for %s is now ON."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Secure option for %s is now OFF."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Secure option for %s is now ON."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Veiligheid"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "Services zijn in Defcon modus. Probeer later opnieuw."
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services zijn nu in DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Services is nu in verloop mode."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Services is nu in geen-verloop mode."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Services is nu in alleen-lezen mode."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Services is nu in lezen-schrijven mode."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Services is nu in debug mode (niveau %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Services is nu in debug mode."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Services is nu in non-debug mode."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Services zijn geconfigureerd geen e-mail te versturen."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Services negeer-lijst:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Services kan geen modes veranderen.  Zijn je server goed geconfigureerd?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Services kan geen modes veranderen.  Zijn de  U:lines van je servers goed "
 "geconfigureerd?"
 
-#: language.cpp:1939
+#: modules/core/os_stats.cpp:137
 #, c-format
-msgid "Services up %d day, %02d:%02d"
+msgid "Services up %d days, %02d:%02d"
 msgstr "Services draaien %d dagen, %02d:%02d"
 
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Services draaien %d dagen, %02d:%02d"
+msgid "Services up %d hours, %d minutes"
+msgstr "Services draaien %d uur, %d minuten"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Services draaien %d uur, %d minuut"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Services draaien %d minuten, %d seconden"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Services draaien %d uur, %d minuten"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Services draaien %d uur, %d minuut"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Services draaien %d uur, %d minuten"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Services draaien %d minuut, %d seconde"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Services draaien %d minuut, %d seconden"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Services draaien %d minuten, %d seconde"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Services draaien %d minuten, %d seconden"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Services' configuratie bestand is opnieuw geladen."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Nick is vrijgegeven."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Sessie limiet voor %s veranderd in %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Sessie limitering is tijdelijk uitgeschakeld."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessies       : %6d records, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessies  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Instelling %s onbekend.  Type /msg %s HELP LEVELS DESC voor een lijst van "
 "geldige instellingen."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "Instelling voor DEBUG moet ON, OFF, of een positief nummer zijn."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Instelling voor negeer code moet ON of OFF zijn."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Instelling voor NOEXPIRE moet ON of OFF zijn."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "Instelling voor alleen-lezen moet ON of OFF zijn."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 "Instelling voor SuperAdministrator moet ON of OFF zijn (moet ook "
 "ingeschakeld zijn in services.conf)"
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Signed kick option for %s is now OFF."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Signed kick option for %s is now ON."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5481,210 +5146,182 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Signed kick option for %s is now ON."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Ondertekende Kicks"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND is uitgeschakeld op dit netwerk."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Sorry, bot toewijzing is tijdelijk uitgeschakeld."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Sorry, bot creatie gefaald."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Sorry, bot wijzigen is tijdelijk uitgeschakeld."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Sorry, bot opties instellen is tijdelijk uitgeschakeld."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Sorry, kanaal AOP lijst wijzigen is tijdelijk uitgeschakeld."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Sorry, kanaal HOP lijst wijzigen is tijdelijk uitgeschakeld."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Sorry, kanaal SOP lijst wijzigen is tijdelijk uitgeschakeld."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Sorry, kanaal VOP lijst wijzigen is tijdelijk uitgeschakeld."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Sorry, kanaal toegangslijst modificatie is tijdelijk uitgeschakeld."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Sorry, kanaal autokick lijst wijzigen is tijdelijk uitgeschakeld."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Sorry, kanaal slechte woorden lijst wijzigen is tijdelijk uitgeschakeld."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Sorry, kanaal de-registratie is tijdelijk uitgeschakeld."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "Sorry, kanaal opties instellen is tijdelijk uitgeschakeld."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Sorry, kanaal registratie is tijdelijk uitgeschakeld."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Sorry, groepering gefaald."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Sorry, identificatie gefaald."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Sorry, kicker configuratie is tijdelijk uitgeschakeld."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Sorry, memo opties instellen is tijdelijk uitgeschakeld."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Sorry, memo's sturen is tijdelijk uitgeschakeld."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Sorry, nickname de-registratie is tijdelijk uitgeschakeld."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Sorry, nickname groeperingen zijn tijdelijk uitgeschakeld."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "Sorry, nickname opties aanpassen is tijdelijk uitgeschakeld."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Sorry, nickname registratie is tijdelijk uitgeschakeld."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Sorry, registratie gefaald."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Sorry, je kan maar %d AOPs/SOPs/VOPs in dit kanaal hebben."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Sorry, je kan maar %d nicks op de toegangslijst van een kanaal hebben."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Sorry, er zijn maar %d plaatsen op de toegangslijst van een nickname."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Sorry, je kan maar %d nicks op de toegangslijst van een kanaal hebben."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Sorry, je kan maar %d autokick masks op een kanaal hebben."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Sorry, je kan maar %d slechte woorden per kanaal instellen."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Sorry, je hebt je limiet van %d kanaalregistraties overschreden."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Sorry, je hebt je limiet van %d kanaalregistraties bereikt."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statistieken opnieuw gezet."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status geupdate (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Stop met flooden!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Stop met jezelf herhalen!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Opvolger voor %s verwijderd."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Opvolger voor %s veranderd in %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin instelling is niet ingeschakeld in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Symbiose"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Symbiose mode staat nu UIT op kanaal %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Symbiose mode staat nu AAN op kanaal %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Gebruik: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5711,7 +5348,7 @@ msgstr ""
 "2: ban in het formaat *!*@host\n"
 "3: ban in het formaat *!*gebruiker@*.domein"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5724,28 +5361,12 @@ msgstr ""
 "Stelt de beschrijving van een kanaal in, die weergegeven\n"
 "wordt door de LIST en INFO commando's."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Gebruik: %s kanaal ENTRYMSG [bericht]\n"
-"\n"
-"Stelt het bericht in dat via /notice zal worden verstuurd\n"
-"aan gebruikers die het kanaal binnenkomen. Als er geen\n"
-"paramenter wordt gegeven wordt er geen bericht verstuurd\n"
-"als iemand het kanaal binnenkomt."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Gebruik: %s kanaal FOUNDER nick\n"
@@ -5753,7 +5374,7 @@ msgstr ""
 "Veranderd de stichter van een kanaal. De nieuwe nick moet\n"
 "een geregistreerde nick zijn."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5773,78 +5394,7 @@ msgstr ""
 "de volgende gebruiker het kanaal binnenkomt worden\n"
 "teruggezet."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Gebruik: %s kanaal MLOCK modes\n"
-"\n"
-"Stelt de mode-slot paramenter in voor het kanaal. %S\n"
-"staat je toe om verschillen kanaalmodes altijd aan of uit\n"
-"te laten staan, of om het mogelijk te maken deze aan of uit\n"
-"te zetten met het /MODE commando.\n"
-"\n"
-"De modes paramenter wordt precies hetzelfde opgebouwd als\n"
-"in een /MODE commando: modes achter een + zijn altijd aan,\n"
-"en modes achter een - zijn altijd uit. Merk wel op dat, in\n"
-"tegenstelling tot het /MODE commando, alleen opgegeven modes\n"
-"geforceerd worden door SET MLOCK; het mode-slot wordt eerst\n"
-"leeggemaakt voor de nieuwe modes erin worden gezet!\n"
-"\n"
-"Waarschuwing: Als je het mode-slot gebruikt om een wachtwoord\n"
-"op het kanaal te zette moet je, zoals in het 2e voorbeeld, ook\n"
-"de optie RESTRICTED aanzette (zie HELP SET RESTRICTED), of\n"
-"iedereen die het kanaal binnenkomt als het leeg is kan het\n"
-"wachtwoord zien!\n"
-"\n"
-"Voorbeelden:\n"
-"\n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Foreert modes n en t aan, en modes i, k, l, p, en s\n"
-"        uit. Mode m kan aan of uit gezet worden met /MODE.\n"
-"\n"
-"    SET #channel MLOCK +knst-ilmp wachtwoord\n"
-"        Forceert modes k, n, s, en t aan, en modes i, l, m,\n"
-"        en p uit. Forceert ook dat het kanaalwachtwoord\n"
-"        \"wachtwoord\" is.\n"
-"\n"
-"    SET #channel MLOCK +\n"
-"        Verwijderd het mode-slot; alle kanaalmodes kunnen\n"
-"        vrij ingesteld worden met /MODE."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5861,7 +5411,7 @@ msgstr ""
 "het kanaal sturen wanneer de OP of DEOP commando's worden\n"
 "gebruikt voor een gebruiker in het kanaal."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5879,7 +5429,7 @@ msgstr ""
 "gebruiker met een gelijkwaardig of hoger level dan die\n"
 "van zichzelf via de %S commando's."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5924,7 +5474,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5938,13 +5488,13 @@ msgstr ""
 "de prive optie aan staat zal /msg %S LIST het kanaal\n"
 "in geen enkele lijst weergeven."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Gebruik: %s kanaal RESTRICTED {ON | OFF}\n"
@@ -5953,7 +5503,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5972,7 +5522,7 @@ msgstr ""
 "zijn met hun wachtwoord toegang krijgen tot het kanaal,\n"
 "zoals geregeld door de toegangslijst."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5991,52 +5541,12 @@ msgstr ""
 "stichter en de opvolger kunnen veranderen, en niet degenen\n"
 "die alleen geidentificeerd zijn met %S."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Gebruik: %s kanaal SECUREOPS {ON | OFF}\n"
-"\n"
-"Zet de veilige ops optie aan of uit voor een kanaal.\n"
-"Wanneer veilige ops aan staat mogen gebruikers die niet\n"
-"op de toegangslijst staan geen kanaalop status krijgen."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Gebruik: %s kanaal SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Zet ondertekende kicks aan of uit voor een kanaal.\n"
-"Wanneer SIGNKICK aan staat zullen kicks die uitgevoerd\n"
-"worden dmv het %S KICK commando de nick van degene die\n"
-"het commando uitgevoerd heeft de nick in de reden hebben.\n"
-"\n"
-"Als je LEVEL gebruikt zullen degenen die een niveau hebben\n"
-"gelijk aan of hoger dan het SIGNKICK niveau op het kanaal\n"
-"hun nick niet toegevoegd hebben aan de kicks.\n"
-"Zie /msg %S HELP LEVELS voor meer informatie."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6055,24 +5565,7 @@ msgstr ""
 "er geen opvolger is ingesteld. De nieuwe nick moet een\n"
 "geregistreerde nick zijn."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Gebruik: %s kanaal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Zet de topicslot optie aan of uit voor een kanaal.\n"
-"Wanneer topicslot aan staat zal %S het niet toestaan om\n"
-"het topic van het kanaal te veranderen. Het topic kan dan\n"
-"alleen veranderd worden met het TOPIC commando."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6118,10 +5611,11 @@ msgstr ""
 "Het overschakelen van xOP lijsten naar het toegangslijsten\n"
 "systeem brengt echter geen problemen met zich mee."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6134,18 +5628,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6204,7 +5702,7 @@ msgstr ""
 "\n"
 "Het ACCESS CLEAR commando maakt de toegangslijst leeg."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6252,7 +5750,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Geeft de huidige toegangslijst weer."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6264,12 +5762,18 @@ msgstr ""
 "Laat de bot een \"/me\" commando doen op het gegeven kanaal\n"
 "met de gegeven tekst."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6290,15 +5794,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6368,7 +5863,8 @@ msgstr ""
 "\n"
 "The AKICK CLEAR commando maakt de AutoKick lijst leeg."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6376,21 +5872,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6458,7 +5954,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR maakt de AKILL lijst leeg."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6500,7 +5996,7 @@ msgstr ""
 "Kanalen met de NOEXPIRE optie aan zullen voorafgegaan\n"
 "worden door een uitroepteken."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6520,10 +6016,11 @@ msgstr ""
 "\n"
 "Dit gebruik is gelimiteerd tot Services Operatorstrators."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6602,7 +6099,7 @@ msgstr ""
 "lijsten, en /msg %S HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6616,7 +6113,8 @@ msgstr ""
 "Hierna kun je de bot voor het kanaal instellen zoals je\n"
 "wil."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6648,7 +6146,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6689,7 +6187,7 @@ msgstr ""
 "Het BADWORDS CLEAR commando maakt de slechte woorden\n"
 "lijst leeg."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6705,7 +6203,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6747,7 +6245,7 @@ msgstr ""
 "in gebruiker is zal de betreffende gebruiker worden gekilled.\n"
 "Als de nick geregistreerd is, wordt deze gedropped."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6757,7 +6255,7 @@ msgstr ""
 "\n"
 "Geeft alle beschikbare bots op dit netwerk weer."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6770,7 +6268,7 @@ msgstr ""
 "nick of kanaal, indien deze nog niet gelezen is op het moment\n"
 "dat je dit commando gebruikt."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6782,7 +6280,7 @@ msgstr ""
 "gebruikt de complete en echte ident@host voor elke nick,\n"
 "en forceerd dan een AKILL."
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6804,7 +6302,7 @@ msgstr ""
 "weergegeven. Als SECRET is gegeven worden alleen kanalen\n"
 "die met trefbeeld overeenkomen en +s of +p mode hebben."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6817,71 +6315,32 @@ msgstr ""
 "hebt isgelezen of niet. Let wel op: dit werkt alleen met nicks,\n"
 "niet met kanalen."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Gebruik: CLEAR kanaal wat\n"
-"\n"
-"Zorgt ervoor dat %S bepaalde instellingen van het kanaal\n"
-"verwijdert. wat kan zijn:\n"
-"\n"
-"     MODES    Verwijder alle modes op het kanaal (verwijdert\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Verwijder alle bans op het kanaal.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Verwijder kanaal-operator status (mode +o) van\n"
-"                  alle kanaal-operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Verwijder kanaal-halfoperator status (mode +h)\n"
-"                  van alle kanaal-halfoperators, indien deze\n"
-"\t\t  mode ondersteund wordt.\n"
-"     VOICES   Verwijder \"voice\" status (mode +v) van iedereen\n"
-"                  met \"voice\" status op het kanaal.\n"
-"     USERS    Verwijder (kick) alle gebruikers van het kanaal.\n"
+"Gebruik: DEOWNER #kanaal\n"
 "\n"
-"Standaard is dit gelimiteerd tot degenen met stichter-toegang\n"
-"op het kanaal."
+"Verwijdert je eigenaar status op channel.\n"
+"\n"
+"Gelimiteerd tot degenen met stichter-rechten op het kanaal."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Gebruik: CLEARMODES kanaal [ALL]\n"
-"\n"
-"Verwijdert alle binaire modes (i,k,l,m,n,p,s,t) en bans van\n"
-"een kanaal. Als ALL is opgegeven, worden ook alle ops en\n"
-"voices (+o en +v modes) van het kanaal verwijderd."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6907,7 +6366,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password"
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6919,12 +6378,14 @@ msgstr ""
 "set van restricties op de services toe te passen tijdens een\n"
 "aanval op het netwerk."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6940,7 +6401,7 @@ msgstr ""
 "5 of hoger op het kanaal, of tot HOPs of degenen met niveau\n"
 "4 of hoger voor het halfop status geven van zichzelf."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6951,11 +6412,12 @@ msgstr ""
 "Verwijdert de vhost die toegewezen is aan de gegeven nick\n"
 "uit de database."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -6987,22 +6449,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Verwijdert de memo's genummerd 2 t/m 5 en 7 t/m 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntax: DELALL <nick>.\n"
 "Verwijderd de vhost voor alle nick's in dezelfde groep\n"
 "als de gegeven nick."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7016,29 +6481,36 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
 "5 of hoger op het kanaal."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Gebruik: DEOWNER #kanaal\n"
+"Gebruik: DEOP #kanaal [nick]\n"
 "\n"
-"Verwijdert je eigenaar status op channel.\n"
+"Verwijderd de op status van de gegeven nick op een kanaal.\n"
+"Als er geen nick is gegeven zal je zelf je opstatus kwijt\n"
+"raken.\n"
 "\n"
-"Gelimiteerd tot degenen met stichter-rechten op het kanaal."
+"Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
+"5 of hoger op het kanaal."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Gebruik: DEPROTECT #kanaal [nick]\n"
 "\n"
@@ -7050,12 +6522,14 @@ msgstr ""
 "degenen met een niveau van 10 of hoger op het kanaal voor\n"
 "zelf-protectie."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7071,7 +6545,7 @@ msgstr ""
 "5 of hoger op het kanaal, of tot VOPs of degenen met niveau\n"
 "3 of hoger voor het voice status geven van zichzelf."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7083,7 +6557,7 @@ msgstr ""
 "Heft de registratie van het gegeven kanaal op. Kan alleen\n"
 "gebruik wordt door de kanaalstichter."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7096,9 +6570,10 @@ msgstr ""
 "Services Operators kunnen elk kanaal droppen, ook al zijn\n"
 "ze niet voor het betreffende kanaal geindtificeerd."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7106,6 +6581,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7121,7 +6600,7 @@ msgstr ""
 "Om dit commando te kunnen gebruiken moet je je eerst identificeren\n"
 "met je wachtwoord. (/msg %S HELP IDENTIFY voor meer informatie)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7144,8 +6623,8 @@ msgstr ""
 "ongedaan maken zonder speciale privileges. Het verwijderen\n"
 "van elke nick is gelimiteerd tot Services Operators."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7156,7 +6635,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7178,7 +6657,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7229,7 +6708,7 @@ msgstr ""
 "lijsten en breed overeenkomende uitzondering-masks zullen\n"
 "zeer waarschijnlijk de prestaties van de services verminderen."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7246,7 +6725,7 @@ msgstr ""
 "\n"
 "Reden kan verplicht zijn op sommige netwerken."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7263,7 +6742,7 @@ msgstr ""
 "\n"
 "Op sommige netwerken is een reden verplicht."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7280,7 +6759,7 @@ msgstr ""
 "die dit commando uitvoerde samen met de emailhost waarop\n"
 "het werd gebruikt. "
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7290,16 +6769,15 @@ msgstr ""
 "\n"
 "Geef de key van het gegeven kanaal terug."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Gebruik: GETPASS nick\n"
 "\n"
@@ -7311,14 +6789,14 @@ msgstr ""
 "\n"
 "Dit commando is onbeschikbaar wanneer encryptie is ingeschakeld."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7342,7 +6820,7 @@ msgstr ""
 "van deze nick zijn, je geindentificeerd zijn in de group van\n"
 "die nick, of het correcte wachtwoord opgegeven zijn."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7352,7 +6830,7 @@ msgstr ""
 "\n"
 "Geeft alle nicks in je groep weer."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7373,7 +6851,7 @@ msgstr ""
 "bevinden.\n"
 "Dit gebruik is gelimiteerd tot Services Operators."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7387,7 +6865,7 @@ msgstr ""
 "naar alle gebruikers op het netwerk. Berichten zullen \n"
 "verstuurd worden vanaf de nick %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7401,7 +6879,7 @@ msgstr ""
 "HUIDIGE nick de vhost van alle nicks in de zelfde groep te\n"
 "laten zijn."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7466,16 +6944,17 @@ msgstr ""
 "\n"
 "Opmerking: alle nicks in een groep hebben hetzelfde wachtwoord."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Gebruik: HALFOP #kanaal [nick]\n"
 "\n"
@@ -7486,10 +6965,11 @@ msgstr ""
 "5 of hoger op het kanaal, of tot HOPs of degenen met niveau\n"
 "4 of hoger voor het halfop status geven van zichzelf."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7563,7 +7043,7 @@ msgstr ""
 "lijsten, en /msg %S HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7581,9 +7061,20 @@ msgstr ""
 "voordat je ze gebruikt. Het wachtwoord moet hetzelfde zijn als\n"
 "die je gestuurd hebt met het REGISTER commando."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
+msgid ""
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7614,7 +7105,7 @@ msgstr ""
 "IRC Operators zullen niet genegeerd worden, zelfs al komen\n"
 "ze overeen met een mask uit de lijst."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7635,7 +7126,7 @@ msgstr ""
 "Standaard is de ALL optie gelimiteerd tot degenen met\n"
 "stichter-toegang tot het kanaal."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7652,7 +7143,7 @@ msgstr ""
 "commando is gegeven zal je alle informatie te zien krijgen,\n"
 "om het verborgen is of niet."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7668,7 +7159,7 @@ msgstr ""
 "totaal kan ontvangen. Met een paramenter wordt dezelfde\n"
 "informatie voor het gegeven kanaal weergegeven."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7695,7 +7186,7 @@ msgstr ""
 "gegeven nick weergegeven. Dit gebruik is gelimiteerd tot\n"
 "Services Operators."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7714,12 +7205,12 @@ msgstr ""
 "je informatie over een bot, bijvoorbeeld de tijd waarop deze\n"
 "gemaakt is of op hoeveel kanalen deze is."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7731,14 +7222,15 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7755,7 +7247,7 @@ msgstr ""
 "informatie veld de text \"Juped by <nick>\" bevatten, waar\n"
 "<nick> vervangen wordt door de <nick> die de server JUPEt."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7771,7 +7263,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7797,7 +7289,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7817,12 +7309,14 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7861,14 +7355,14 @@ msgstr ""
 "Let op: toegang tot dit commando wordt gecontroleerd door\n"
 "het niveau SET commando."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7884,7 +7378,25 @@ msgstr ""
 "*** Gebruiker has been kicked off channel #mijn_kanaal by %S (IRCOp "
 "(Misbruik))"
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7900,7 +7412,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7928,7 +7440,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7945,7 +7457,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7968,7 +7480,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7984,7 +7496,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8003,7 +7515,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8022,8 +7534,8 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8033,17 +7545,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8075,7 +7587,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8095,7 +7607,7 @@ msgstr ""
 "worden weergegeven. LET OP: er is momenteel geen flood-\n"
 "bescherming voor grote databases."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8110,7 +7622,7 @@ msgstr ""
 "met het trefbeeld. (Kanalen met de PRIVATE optie aan\n"
 "worden niet weergegeven.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8149,7 +7661,8 @@ msgstr ""
 "    LIST *!*@*.bar.org\n"
 "        Geeft alle nicks weer van het bar.org domein"
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8177,7 +7690,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Gebruik: trefbeeld [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8209,13 +7721,14 @@ msgstr ""
 "        Geeft alle geregistreerde nicks weer die niet\n"
 "        zullen verlopen."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8230,11 +7743,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Geeft de memo's genummerd 2 t/m 5 en 7 t/m 9 weer."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Gebruik: LOGONNEWS ADD text"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8264,11 +7777,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Gebruik: LOGONNEWS DEL {nr | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8284,7 +7797,7 @@ msgstr ""
 "eigenaar van de nick. Merk op dat je niet gevraagd wordt om\n"
 "je opnieuw te identificeren."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8308,12 +7821,13 @@ msgstr ""
 "Services de gegeven nick vragen opnieuw te identificeren.\n"
 "Het gebruik hiervan is gelimiteerd tot Services Operators."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Gebruik: MODE kanaal modes\n"
@@ -8322,7 +7836,34 @@ msgstr ""
 "kanaal in te stellen. De paramenters zijn het zelfde als bij een\n"
 "standaard /MODE commando."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8332,7 +7873,7 @@ msgstr ""
 "Dit command geeft informatie weer over de gespecificeerde\n"
 "geladen module."
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8341,7 +7882,7 @@ msgstr ""
 "Gebruik: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Geeft alle momenteel geladen modules weer."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8353,7 +7894,7 @@ msgstr ""
 "Dit commando laadt de module genaamd bestandsnaam uit de\n"
 "modules directory."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8365,7 +7906,7 @@ msgstr ""
 "Dit commando laadt de module genaamd bestandsnaam uit de\n"
 "modules directory."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8376,10 +7917,12 @@ msgstr ""
 "Dit commando ontlaadt de module genaamd bestandsnaam uit\n"
 "de modules directory."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8402,7 +7945,7 @@ msgstr ""
 "\n"
 "Pas op: De server wordt niet gecontroleerd door Services."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8416,7 +7959,7 @@ msgstr ""
 "gebruiker die een /whois op je doet je echte hostname zien\n"
 "in plaats van je vhost."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8431,7 +7974,7 @@ msgstr ""
 "gegeaan door een \"+\" of een \"-\". Om alle flags te verwijderen\n"
 "kun je simpelweg een \"-\" typen in plaats van de flags."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8445,12 +7988,14 @@ msgstr ""
 "gebruiker die een /whois op je doet de vhost zien in plaats\n"
 "van je echte hostname."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8463,11 +8008,11 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
 "5 of hoger op het kanaal."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Gebruik: OPERNEWS ADD text"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8497,30 +8042,37 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Gebruik: OPERNEWS DEL {nr | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Gebruik: OWNER #kanaal\n"
+"Gebruik: OP #kanaal [nick]\n"
 "\n"
-"Geeft je eigenaar status op kanaal.\n"
+"Geeft de gegeven nick op-status op een kanaal. Als er geen\n"
+"nick is gegeven zal je zelf op-status krijgen.\n"
 "\n"
-"Gelimiteerd tot degenen met stichter-rechten op het kanaal."
+"Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
+"5 of hoger op het kanaal."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8534,10 +8086,11 @@ msgstr ""
 "degenen met een niveau van 10 of hoger op het kanaal voor\n"
 "zelf-protectie."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8610,7 +8163,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8628,11 +8181,11 @@ msgstr ""
 "wordt gevreesd en ze niet moeten worden opgeslagen. Voor\n"
 "normaal afsluiten moet je het SHUTDOWN commando gebruiken."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Gebruik: RANDOMNEWS ADD text"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8656,18 +8209,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Gebruik: RANDOMNEWS DEL {nr | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8684,7 +8238,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Geeft de memo's genummerd 2 t/m 5 en 7 t/m 9 weer."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8731,7 +8285,8 @@ msgstr ""
 "van deze nick zijn, je geindentificeerd zijn in de group van\n"
 "die nick, of het correcte wachtwoord opgegeven zijn."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8742,7 +8297,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8773,24 +8328,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8838,15 +8394,15 @@ msgstr ""
 "memos en dezelfde kanaalrechten te delen. Voor meer informatie\n"
 "over deze functie, type /msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8867,7 +8423,7 @@ msgstr ""
 "van deze nick zijn, je geindentificeerd zijn in de group van\n"
 "die nick, of het correcte wachtwoord opgegeven zijn."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8882,7 +8438,7 @@ msgstr ""
 "vereisen dat de Services opnieuw gestart worden (bijvoorbeeld\n"
 "Services' nicknames, activatie van de sessie limiet, etc.)"
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8894,7 +8450,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8905,7 +8461,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8917,13 +8473,14 @@ msgstr ""
 "Zorgt ervoor dat Services alle databases opslaat en dan\n"
 "opnieuw opstart."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8939,23 +8496,25 @@ msgstr ""
 "een memo teruggestuurd worden naar degene die de memo verstuurd\n"
 "heeft om hem/haar te informeren dat de memo gelezen is."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -8963,7 +8522,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8975,7 +8534,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8985,7 +8544,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9001,7 +8560,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9024,22 +8583,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9057,7 +8616,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9074,7 +8633,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9088,7 +8647,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9100,17 +8659,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9129,16 +8689,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9152,7 +8712,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9162,13 +8722,14 @@ msgstr ""
 "\n"
 "Laat de bot de gegeven tekst op het gegeven kanaal zeggen."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Gebruik: SEND {nick | kanaal} memo-text\n"
@@ -9178,16 +8739,18 @@ msgstr ""
 "de ontvanger een notice krijgen dat hij/zij een nieuwe memo\n"
 "heeft. De doel nick/kanaal moet geregistreerd zijn."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Gebruik: SENDALL memo-text\n"
 "Stuurt alle geregistreerde gebruikers een memo die\n"
 "memo-text bevat."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9205,7 +8768,7 @@ msgstr ""
 "\n"
 "Kan gelimiteerd zijn tot IRC operators op sommige netwerken."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9239,7 +8802,7 @@ msgstr ""
 "limiteringen en hoe sessie limieten in te stellen voor\n"
 "specifieken hosts en groepen daarvan."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9254,7 +8817,66 @@ msgstr ""
 "ook SET <nick> <ident>@<hostmask> gebruiken om de ident\n"
 "voor een gebruiker aan te passen gelijk met de hostname."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Gebruik: %s kanaal SECUREOPS {ON | OFF}\n"
+"\n"
+"Zet de veilige ops optie aan of uit voor een kanaal.\n"
+"Wanneer veilige ops aan staat mogen gebruikers die niet\n"
+"op de toegangslijst staan geen kanaalop status krijgen."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Gebruik: %s kanaal SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Zet ondertekende kicks aan of uit voor een kanaal.\n"
+"Wanneer SIGNKICK aan staat zullen kicks die uitgevoerd\n"
+"worden dmv het %S KICK commando de nick van degene die\n"
+"het commando uitgevoerd heeft de nick in de reden hebben.\n"
+"\n"
+"Als je LEVEL gebruikt zullen degenen die een niveau hebben\n"
+"gelijk aan of hoger dan het SIGNKICK niveau op het kanaal\n"
+"hun nick niet toegevoegd hebben aan de kicks.\n"
+"Zie /msg %S HELP LEVELS voor meer informatie."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Gebruik: %s kanaal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Zet de topicslot optie aan of uit voor een kanaal.\n"
+"Wanneer topicslot aan staat zal %S het niet toestaan om\n"
+"het topic van het kanaal te veranderen. Het topic kan dan\n"
+"alleen veranderd worden met het TOPIC commando."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9265,6 +8887,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9288,7 +8911,7 @@ msgstr ""
 "Let op: toegang tot dit commando wordt geregeld via het\n"
 "niveau SET commando."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9300,7 +8923,7 @@ msgstr ""
 "toegewezen aan een kanaal door gebruikers die geen\n"
 "IRC operator zijn."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9316,7 +8939,7 @@ msgstr ""
 "\n"
 "Beschikbare opties:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9331,7 +8954,7 @@ msgstr ""
 "gekicked worden, zelfs wanneer deze niet overeen komen\n"
 "met het NOKICK niveau."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9346,7 +8969,7 @@ msgstr ""
 "gekicked worden, zelfs wanneer deze niet overeen komen\n"
 "met het NOKICK niveau."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9378,7 +9001,7 @@ msgstr ""
 "Bijvoorbeeld: om !op te mogen gebruiken moet een gebruiken\n"
 "genoeg rechten voor het OPDEOP niveau hebben."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9394,7 +9017,22 @@ msgstr ""
 "van de gebruikers die het kanaal joinen weergegeven, mits\n"
 "ze hiertoe rechten hebben op het kanaal."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9409,7 +9047,7 @@ msgstr ""
 "automatisch van het kanaal gehaald wanneer je deze optie\n"
 "aan zet."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9421,7 +9059,7 @@ msgstr ""
 "Stelt in of het gegeven kanaal zal verlopen. Door deze optie\n"
 "AAN te zetten kun je verhinderen dan het kanaal verloopt."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9438,25 +9076,17 @@ msgstr ""
 "foor %s wordt gedaan bij kanalen, zoals MODEs, KICKs, en\n"
 "zelfs het welkomstbericht."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Gebruik: SET optie parameters\n"
-"\n"
-"Stelt verscheidene nick opties in.  option kan zijn:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9473,7 +9103,17 @@ msgstr ""
 "Type /msg %S HELP SET optie voor more informatie over\n"
 "een specifieke optie."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Gebruik: SET optie parameters\n"
+"\n"
+"Stelt verscheidene nick opties in.  option kan zijn:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9483,7 +9123,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Gebruik: SET optie instelling\n"
@@ -9498,7 +9137,7 @@ msgstr ""
 "    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9510,28 +9149,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"GEBRUIK: SET DEBUG {ON | OFF | nummer}\n"
-"\n"
-"Zet debug mode aan of uit. In debug mode zal alle data die\n"
-"naar en van Services verzonden worden, alsmede een aantal\n"
-"debug-berichten, naar het log-bestand geschreven worden.\n"
-"Als nummer is gegeven zal debug mode worden geactiveerd met\n"
-"het debug-niveau op nummer\n"
-"Deze optie komt overeen met de commandline-optie -debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9543,7 +9161,7 @@ msgstr ""
 "Verandert de weergegeven nick van je nick-groep in Services.\n"
 "De nieuwe weergave MOET een nick in je groep zijn."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9557,7 +9175,7 @@ msgstr ""
 "zal worden weergegeven wanneer iemand informatie over je nick\n"
 "opvraagt met het INFO commando."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9572,7 +9190,7 @@ msgstr ""
 "elk kanaal dat je joint waarbij de GREET optie aanstaat,\n"
 "indien je toegangsniveau hoog genoeg is hiervoor."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9594,18 +9212,8 @@ msgstr ""
 "verbergen. De tweede paramenter geeft aan of de informatie\n"
 "moet worden weergegeven (OFF) of verborgen (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9619,7 +9227,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Gebruik: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9638,7 +9246,7 @@ msgstr ""
 "Deze optie kan ook uitgeschakeld zijn door de netwerk\n"
 "administrators."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9655,7 +9263,7 @@ msgstr ""
 "op een commando dat je hebt verzonden). nummer moet gekozen\n"
 "worden uit de volgende lijst van ondersteunde talen:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9672,7 +9280,7 @@ msgstr ""
 "naar je kunnen sturen. Je kan dit echter niet hoger dan %d\n"
 "zetten."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9714,7 +9322,7 @@ msgstr ""
 "instellen, mogen geen limiet instellen boven %d, en mogen geen\n"
 "harde limiet instellen."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9724,7 +9332,7 @@ msgstr ""
 "\n"
 "Geef de verschillende %S instellingen weer."
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9738,10 +9346,11 @@ msgstr ""
 "met je communiceren. Met MSG aan zullen de Services gewone\n"
 "berichten gebruiken, anders zullen ze notices gebruiken."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9755,7 +9364,7 @@ msgstr ""
 "\n"
 "Deze optie komt overeen met de commandline-optie -noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9792,7 +9401,7 @@ msgstr ""
 "\n"
 "ON is wezenlijk LOGON en NEW gecombineerd."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9804,7 +9413,7 @@ msgstr ""
 "Verandert het wachtwoord dat je gebruik om je te identificeren\n"
 "als de eigenaar van je nick."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9823,7 +9432,7 @@ msgstr ""
 "iedereen die je nick weet kan nog steeds informatie krijgen\n"
 "mbv het INFO commando."
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9853,16 +9462,16 @@ msgstr ""
 "\n"
 "Deze optie komt overeen met de commandline-optie -readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9876,7 +9485,7 @@ msgstr ""
 "%S je niet automatisch killen, hoe de KILL optie ook\n"
 "ingesteld is."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9893,14 +9502,15 @@ msgstr ""
 "wanneer het echt nodig is, en terug op OFF gezet worden als het\n"
 "niet meer nodig is."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Gebruik: SETALL <nick> <hostmask>.\n"
@@ -9913,7 +9523,7 @@ msgstr ""
 "* LET OP, dit wijzigt niet de vhost voor elke nick lid\n"
 "wordt van de groep nadat dit commando is gebruikt."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9924,10 +9534,11 @@ msgstr ""
 "Zorgt ervoor dat Services alle databases opslaat en dan\n"
 "afsluit."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -9963,7 +9574,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10013,10 +9624,11 @@ msgstr ""
 "\n"
 "SNLINE CLEAR maakt de SNLINE lijst leeg."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10093,7 +9705,8 @@ msgstr ""
 "lijsten, en /msg %S HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10109,31 +9722,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10185,21 +9798,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR maakt de SQLINE lijst leeg."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10209,16 +9808,18 @@ msgstr ""
 "Geeft de nicks van alle Services Staff samen met\n"
 "hun level en on-line status weer."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Gebruik: STAFF memo-text\n"
 "\n"
 "Sends all services staff a memo containing memo-text."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10262,7 +9863,7 @@ msgstr ""
 "De ALL optie stelt momenteel het maximum aantal gebruikers in\n"
 "op het aantal gebruikers dat momenteel aanwezig is op het netwerk."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10286,12 +9887,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR fout-bericht"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10329,7 +9931,7 @@ msgstr ""
 "de rest wordt genegeerd. If no nickname is given, your status\n"
 "will be returned."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10348,7 +9950,7 @@ msgstr ""
 "\n"
 "Op sommige netwerken is een reden verplicht."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10357,7 +9959,8 @@ msgstr ""
 "Gebruik: SVSNICK nick nieuwe nick\n"
 "Veranderd een gebruiker's nick van nick naar nieuwe nick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10370,31 +9973,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10442,7 +10045,7 @@ msgstr ""
 "\n"
 "SZLINE CLEAR maakt de SZLINE lijst leeg"
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10466,7 +10069,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot degenen met stichter-toegang\n"
 "op het kanaal."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10480,7 +10083,7 @@ msgstr ""
 "elke willekeurige gebruiker in te stellen. De paramenters\n"
 "zijn hetzelfde als van een standaard /MODE commando."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10498,7 +10101,7 @@ msgstr ""
 "zodat je later de bot altijd opnieuw aan het kanaal kun\n"
 "toewijzen zonder dat je deze opnieuw hoeft te configureren."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10517,7 +10120,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10534,7 +10137,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10549,7 +10152,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspention."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10561,7 +10164,7 @@ msgstr ""
 "Zorgt ervoor dat Services de database bestanden op de harde\n"
 "schijf bijwerken zodra je dit commando vertsuurt."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10585,12 +10188,14 @@ msgstr ""
 "weergegeven. Als INVISBLE is gespecifificeerd worden alleen\n"
 "gebruikers met gebruikersmode +i weergegeven."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10605,10 +10210,11 @@ msgstr ""
 "5 of hoger op het kanaal, of tot VOPs of degenen met niveau\n"
 "3 of hoger voor het voice status geven van zichzelf."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10683,7 +10289,7 @@ msgstr ""
 "lijsten, en /msg %S HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10699,7 +10305,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10708,7 +10314,7 @@ msgstr ""
 "Stelt een nick tijdelijk buiten werking. Een nick die buiten werking\n"
 "is gesteld kan niet worden gebruikt: identificatie wordt uitgeschakeld."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10716,7 +10322,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10729,144 +10335,145 @@ msgstr ""
 "memo's, stelt de benodigde kanaalmodes in (ModeonID), en\n"
 "werkt je vhost en gebruikersflags bij (laatstgezien, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC kanaal [topic]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "De IMMED optie is niet beschikbaar op dit netwerk."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "De AKILL lijst is leeggemaakt."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Het Defcon niveau staat nu op niveau: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "De SNLINE lijst is leeggemaakt."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "The SQLINE lijst is leeggemaakt."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "The SZLINE lijst is leeggemaakt."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "De volgende optie-/functienamen worden begrepen. Let op dat\n"
 "de niveaus voor AUTODEOP en NOJOIN maximale niveaus zijn,\n"
 "terwijl alle andere minimale niveaus zijn."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "De host %s heeft momenteel %d sessies met een limiet van %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "De laatste memo die je naar %s gestuurd hebt (op %s) is gelezen."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "De laatste memo die je naar %s gestuurd hebt (op %s) is nog niet gelezen."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "De memo limiet voor %s mag niet worden veranderd."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "De nieuwe weergave is nu %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "De nick %s wordt nu veranderd in %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Er zijn %d memo's op kanaal %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10874,7 +10481,7 @@ msgstr ""
 "Er zijn momenteel geen bots beschikbaar.\n"
 "Vraag een Services beheerder er een te maken!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10884,12 +10491,12 @@ msgstr ""
 "Type /msg %s HELP GLIST en/msg %s HELP DROP \n"
 "voor meer informatie."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Er is %d memo op kanaal %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10897,28 +10504,28 @@ msgstr ""
 "Er is een nieuwe memo op kanaal %s.\n"
 "Type /msg %s READ %s %d om deze te lezen."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Er is geen bot meer toegewezen aan %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Er is geen login nieuws."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Er is geen opernieuws."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Er is geen willekeurig nieuws."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10934,32 +10541,28 @@ msgstr ""
 "    PRIVATE          Zorg dat een bot alleen door IRC operators\n"
 "                        kan worden toegevoegd"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Dit kanaal is verboden."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Dit kanaal is geregistreerd met %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Dit kanaal is tijdelijk buiten werking gesteld."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Dit kanaal mag niet gebruikt worden."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Dit kanaal zal niet verlopen."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -10967,7 +10570,7 @@ msgstr ""
 "Deze nick is al aangevraagd. Controleer je e-mail adres voor een "
 "verificatiecode."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -10975,7 +10578,7 @@ msgstr ""
 "Deze nick wacht nog op een e-mail verificatie code coor de registratie is "
 "voltooid."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -10983,20 +10586,20 @@ msgstr ""
 "Deze nick is eigendom van iemand anders.  Kies een andere.\n"
 "(Als dit jouw nick is, type /msg %s IDENTIFY wachtwoord.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Deze nickname is geregistreerd; je mag hem niet gebruiken."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Deze nick is tijdelijk buiten werking gesteld"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Deze nick is tijdelijk buiten werking gesteld, reden: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11006,15 +10609,15 @@ msgstr ""
 "nick is, type /msg %s IDENTIFY wachtwoord.  Zo niet,\n"
 "kies een andere nick."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Deze nickname mag niet gebruikt worden.  Kies een andere."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Deze nick zal niet verlopen."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11023,44 +10626,35 @@ msgstr ""
 "worden naar de kanaalnaam zonder het #-teken ervoor (anope\n"
 "in plaats van #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Topicslot"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Topicbehoud"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Topic lock option for %s is now OFF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Topic lock option for %s is now ON."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Topic retention option for %s is now OFF."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Topic retention option for %s is now ON."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Zet caps lock UIT!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Type /msg %S HELP commando voor hulp bij een van\n"
@@ -11070,7 +10664,7 @@ msgstr ""
 "    10 de kanaalmemo's lezen. Dit kan aangepast worden met\n"
 "    het %s LEVELS commando."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11080,7 +10674,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11088,7 +10682,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11096,7 +10690,7 @@ msgstr ""
 "Type /msg %S HELP option voor meer informatie over een\n"
 "specifieke optie."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11106,127 +10700,108 @@ msgstr ""
 "Je privacy wordt gerespecteerd; deze e-mail wordt niet aan\n"
 "een derde partij doorgegeven."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Type /msg %s LIST NEW om ze weer te geven."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Type /msg %s READ %d om deze te lezen."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Type /msg %s READ LAST om deze te lezen."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modes"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN kanaal"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN kanaal [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND kanaal"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nick"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Laden van de module %s is gefaald"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Het verwijderen van module %s is gefaald"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Onbekende SET optie %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Onbekende STATS optie %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Onbekend commando %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Onbekend commando %s.  \"/msg %s HELP\" voor help."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Onbekend mode karakter %c genegeerd."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Onbekende optie %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Onbekende optie %s.\n"
-"Type /msg %S HELP KICK voor meer informatie."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Onbekende optie %s.\n"
 "Type /msg %S HELP SET voor meer informatie."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Bijwerken databases."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "Gebruiker %s niet gevonden in de nickserv database."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Gebruiker     : %6d records, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11234,11 +10809,11 @@ msgstr ""
 "Gebruiker die je nick claimde is gekilld.\n"
 "/msg %s RELEASE %s om deze voor de %s timeout terug te krijgen."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "Gebruiker komt overeen met kanaal-uitzondering."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11246,66 +10821,77 @@ msgstr ""
 "Gebruikers lijst:\n"
 "Nick                 Mask"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Voices bescherming"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"VOP lijst for %s:\n"
-"  Num  Nick"
+"Waarschuwing: Je hebt je maximum aantal memo's overschreden (%d).  Je kan "
+"geen nieuwe memo's ontvangen totdat je enkele van je huidige memo's "
+"verwijdert."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Voices bescherming"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Waarschuwing: Je hebt je maximum aantal memo's bereikt (%d).  Je kan geen "
+"nieuwe memo's ontvangen totdat je enkele van je huidige memo's verwijdert."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Let op je taal!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Je bent al lid van de group van %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Je bent al geidentificeerd."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Je bent geen SuperAdministrator meer"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Je hebt geen toestemming om op dit kanaal te zijn."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Je het geen toestemming je memo limiet te veranderen."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Je bent nu een SuperAdministrator"
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Je bent nu een IRC Operator."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11313,38 +10899,43 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Je zit nu in de group van %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Je kan geen ontvangstbevestiging aanvragen voor een\n"
 "memo die je naar jezelf stuurt."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Je kan jezelf niet ghosten!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Kan %s niet uitloggen omdat hij een service administrator is."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Je kan jezelf niet herstellen!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11354,7 +10945,7 @@ msgstr ""
 "Gebruik de AOP, SOP en VOP commando's in plaats van deze.\n"
 "Type /msg %s HELP command voor meer informatie."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11364,7 +10955,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11372,66 +10963,66 @@ msgstr ""
 "Je kan dit commando niet gebruiken. Gebruik het ACCESS commando.\n"
 "Type /msg %s HELP ACCESS voor meer informatie."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Je kan de memo limiet voor %s niet hoger dan %d zetten."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Je kan je memo limiet niet hoger dan %d zetten."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Je kan je e-mail adres niet verwijderen op dit netwerk."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Je hebt momenteel %d memo's, waarvan er %d ongelezen zijn."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Je hebt momenteel %d memo's, waarven er 1 ongelezen is."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Je hebt momenteel %d memo's."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Je hebt momenteel %d memo's; allemaal zijn ze ongelezen."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Je hebt momenteel 1 memo, en deze is nog niet gelezen."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Je hebt momenteel 1 memo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Je hebt momenteel geen memo's."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Je hebt %d nieuwe memo's."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Je hebt 1 nieuwe memo."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11439,33 +11030,37 @@ msgstr ""
 "Je hebt een nieuwe memo van %s.\n"
 "Type /msg %s READ %d om deze te lezen."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Bans met betrekking tot jou op %s zijn opgeheven."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Er staat geen limiet op het aantal memo's dat je mag hebben."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Je hebt geen memo's."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Je hebt geen nieuwe memo's."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Je moet een geldig nummer als tijd invoeren."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11473,24 +11068,16 @@ msgstr ""
 "Je moet een bot aan een kanaal toewijzen voordat je dit commando gebruikt.\n"
 "Type /msg %S HELP ASSIGN voor meer informatie."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Je moet een operator zijn op het kanaal om deze te registreren."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Je moet ook mode +i forceren als je mode +K forceert."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Je moet ook mode +l forceren als je mode +L forceert."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11500,41 +11087,41 @@ msgstr ""
 "Dit stelt je in staat je wachtwoord terug te halen in\n"
 "het geval dat je het vergeet."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Je wordt geinformeerd over nieuwe memo's wanneer je inlogt en wanneer deze "
 "arriveren."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Je wordt geinformeerd over nieuwe memo's wanneer je inlogt."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Je wordt geinformeerd over nieuwe memo's wanneer deze arriveren."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Je kan niet langer memo's ontvangen."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Je wordt niet geinformeerd over nieuwe memo's."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11542,34 +11129,54 @@ msgstr ""
 "Je IRCD ondersteunt geen vIdent's. Als dit niet klopt, rapporteer dit dan "
 "als een mogelijke bug"
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "%s autokick lijst is leeg."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Negeer-lijst is leeg."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Je memo limiet is uitgeschakeld."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Je memo limiet is veranderd in %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Je memo limiet is %d, en mag niet worden veranderd."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Je memo limiet is %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Je memo limiet is 0; Je zal geen memo's ontvangen."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11577,179 +11184,727 @@ msgstr ""
 "Je memo limiet is 0; Je zal geen memo's ontvangen.  Je kan deze limiet niet "
 "veranderen."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Je nick is uitgelogd."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Je nick is al geregistreerd; type eerst /msg %s DROP."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Je nick is niet geregistreerd."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Je nickname is gedropped."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Je nickname wordt nu veranderd in %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Je toegangscode is opnieuw gestuurd naar %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Je wachtwoord is %s - onthoudt dit voor later gebruik."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 "Je wachtwoord is te lang. Probeer het opnieuw met een korter wachtwoord."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Je vhost van %s is nu geactiveerd."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Je vhost van %s@%s is nu geactiveerd."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Login Nieuws - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Oper Nieuws - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Willekeurig Nieuws - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "uitgeschakeld"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "verloopt niet"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "ingeschakeld"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "verloopt bij de volgende database update"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "verloopt over %d dag"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "verloopt over %d dagen"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "verloopt over %d uur, %d minuut"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "verloopt over %d uur, %d minuten"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "verloopt over %d uur, %d minuut"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "verloopt over %d uur, %d minuten"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "verloopt over %d minuut"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "verloopt over %d minuten"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost voor %s verwijderd."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost voor %s gezet op %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost voor %s gezet op %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost voor groep %s gezet op %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost voor groep %s gezet op %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts voor group %s zijn verwijderd."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "xOP lijsten systeem"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "xOP lists system for %s is now OFF."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "xOP lists system for %s is now ON."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | kanaal} memo-text"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s toegevoegd aan %s AOP lijst."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s toegevoegd aan %s HOP lijst."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s toegevoegd aan %s SOP lijst."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s toegevoegd aan %s VOP lijst."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s verwijderd van %s HOP lijst."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s verwijderd van %s SOP lijst."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s verwijderd van %s VOP lijst."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s verplaatst naar %s HOP lijst."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s verplaatst naar %s SOP lijst."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s verplaatst %s VOP lijst."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s niet gevonden op %s HOP lijst."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s niet gevonden op %s SOP lijst."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s niet gevonden op %s VOP lijst."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Zorgt ervoor dat je nick niet verschijnt in een\n"
+#~ "                   /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d dagen"
+
+#~ msgid "%d hours"
+#~ msgstr "%d uren"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minuten"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d secondes"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "%s HOP lijst is leeg."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "%s SOP lijst is leeg."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "%s VOP lijst is empty."
+
+#~ msgid "1 day"
+#~ msgstr "1 dag"
+
+#~ msgid "1 hour"
+#~ msgstr "1 uur"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuut"
+
+#~ msgid "1 second"
+#~ msgstr "1 seconde"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Toegestaan om CLEAR te gebruiken"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Toegestaan om HALFOP/DEHALFOP te gebruiken"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Kanaal %s HOP lijst is leeggemaakt."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Kanaal %s SOP lijst is leeggemaakt."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Kanaal %s VOP lijst is leeggemaakt."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "%d HOPs verwijderd van de %s HOP lijst."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "%d SOPs verwijderd van %s SOP lijst."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "%d VOPs verwijderd van %s VOP lijst."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "1 HOP verwijderd van de %s HOP lijst."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "1 SOP verwijderd van %s SOP lijst."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "1 VOP verwijderd van %s VOP lijst."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "E-mail adres verwijderd."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Einde van gebruikers lijst."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Welkomstbericht voor %s verwijderd."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Bot is niet in kanaal %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr " Toegangsbericht: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Access list for %s is empty."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Toegangslijst voor %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Welkomstbericht voor %s veranderd."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Fantasie mode staat nu UIT op kanaal %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Begroetingsmode staat nu UIT op kanaal %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "HOP lijst voor %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators.\t"
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Interne fout - onmogelijk om aanvraag af te handelen."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Login nieuwsbericht #%d verwijderd."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Nickname Registratie (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Nick wachtwoord (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Geen # gevonden aan het begin van de kanaalnaam."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Geen Bot mode staat nu UIT op kanaal %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Geen overeenkomsten op %s HOP lijst."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Geen overeenkomsten op %s SOP lijst."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Geen overeenkomsten op %s VOP lijst."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "#%d bestaat niet op %s AOP lijst."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "#%d bestaat niet op %s HOP lijst."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "#%d bestaat niet op %s SOP lijst."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "#%d bestaat niet op %s VOP lijst."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Op-notice option for %s is now OFF."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Peace option for %s is now OFF."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr "Wacht %d seconden voor het opnieuw gebruiken van het SEND commando."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Prive mode van bot %s staat nu UIT."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Private option for %s is now OFF."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Protectie staat nu AAN, zonder vertraging."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER wachtwoord [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Restricted access option for %s is now OFF."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "SOP lijst voor %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Channel %s not registered"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND kanaal [reden]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Secure founder option for %s is now OFF."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Secure ops option for %s is now OFF."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Secure option for %s is now OFF."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Services kan geen modes veranderen.  Zijn je server goed geconfigureerd?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Services draaien %d dagen, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Services draaien %d uur, %d minuut"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Services draaien %d uur, %d minuten"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Services draaien %d uur, %d minuut"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Services draaien %d minuut, %d seconde"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Services draaien %d minuut, %d seconden"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Services draaien %d minuten, %d seconde"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Signed kick option for %s is now OFF."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr "Sorry, kanaal HOP lijst wijzigen is tijdelijk uitgeschakeld."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr "Sorry, kanaal SOP lijst wijzigen is tijdelijk uitgeschakeld."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr "Sorry, kanaal VOP lijst wijzigen is tijdelijk uitgeschakeld."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr "Sorry, je kan maar %d AOPs/SOPs/VOPs in dit kanaal hebben."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Symbiose mode staat nu UIT op kanaal %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Gebruik: RANDOMNEWS ADD text"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR kanaal wat"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Gebruik: OPERNEWS ADD text"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "GEBRUIK: SET DEBUG {ON | OFF | nummer}\n"
+#~ "\n"
+#~ "Zet debug mode aan of uit. In debug mode zal alle data die\n"
+#~ "naar en van Services verzonden worden, alsmede een aantal\n"
+#~ "debug-berichten, naar het log-bestand geschreven worden.\n"
+#~ "Als nummer is gegeven zal debug mode worden geactiveerd met\n"
+#~ "het debug-niveau op nummer\n"
+#~ "Deze optie komt overeen met de commandline-optie -debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Gebruik: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Topic lock option for %s is now OFF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Topic retention option for %s is now OFF."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Onbekend commando %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Onbekende optie %s.\n"
+#~ "Type /msg %S HELP KICK voor meer informatie."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "Gebruiker %s niet gevonden in de nickserv database."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "VOP lijst for %s:\n"
+#~ "  Num  Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Bot %s is verwijderd."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Laatste memo naar %s is ge-annuleerd."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Je vhost van %s is nu geactiveerd."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Bot %s is verwijderd."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/lang/anope.pl_PL.po b/language/anope.pl_PL.po
index 874899096..ad19ddf03 100644
--- a/lang/anope.pl_PL.po
+++ b/language/anope.pl_PL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 20:57-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Polish\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "Napisz /msg %s HELP %s aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
 "/msg %S HELP komenda"
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -55,14 +55,15 @@ msgstr ""
 "Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
 "/msg %S HELP komenda"
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S umo¿liwia rejestracjê kana³u, zmianê\n"
@@ -73,12 +74,12 @@ msgstr ""
 "Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
 "/msg %S HELP komenda"
 
-#: language.cpp:4183
+#: modules/core/ms_help.cpp:33
 #, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -94,124 +95,108 @@ msgstr ""
 "Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
 "/msg %S HELP komenda"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s zmieniono poziom DEFCON na %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s dodano do listy AOP kana³u %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s dodano do listy HOP kana³u %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s dodano do listy SOP kana³u %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s dodano do listy VOP kana³u %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr ""
 "%s dodano do listy dostêpu kana³u %s z\n"
 "poziomem %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s dodano do listy AKICK kana³u %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s dodano do listy zakazanych s³ów kana³u %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s dodano do listy AKILL."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s dodano do listy SNLINE."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s dodano do listy SQLINE."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s dodano do listy SZLINE."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s dodano do Twojej listy dostêpu."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s dodano do Twojej listy dostêpu."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s ju¿ istnieje na li¶cie zakazanych s³ów kana³u %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s ju¿ istnieje w li¶cie AKICK kana³u %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s ju¿ istnieje na li¶cie AKILL."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s ju¿ istnieje na li¶cie wyj±tków."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s ju¿ istnieje na li¶cie SNLINE."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s ju¿ istnieje na li¶cie SQLINE."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s ju¿ istnieje na li¶cie SZLINE."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s nie mo¿e byæ wziêty jako ilo¶æ wykroczeñ do za³o¿enia bana."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s zmienia Twoje flagi u¿ytkownika."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -220,132 +205,113 @@ msgstr ""
 "Lista kana³ów %s:\n"
 "Nazwa                Tryby u¿yt.   Temat"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s usuniêto z listy AOP kana³u %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s usuniêto z listy HOP kana³u %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s usuniêto z listy SOP kana³u %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s usuniêto z listy VOP kana³u %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s usuniêto z listy dostêpu kana³u %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s usuniêto z listy AKICK %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s usuniêto z listy zakazanych s³ów kana³u %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s usuniêto z listy wyj±tków limitów sesji."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s usuniêto z listy AKILL."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s usuniêto z listy SNLINE."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s usuniêto z listy SQLINE."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s usuniêto z listy SZLINE."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s usuniêto z Twojej listy dostêpu."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s wy³±czono na kanale %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s posiada za du¿o zarejestrowanych kana³ów."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s ju¿ jest obejmowane przez %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s dodano do Twojej listy dostêpu."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s nie jest prawid³owym rodzajem bana."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s nie jest prawid³ow± nazw± bota lub kana³u."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s nie jest prawid³owym adresem e-mail."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s nie jest ju¿ zawsze aktywny na %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s nie jest aktualnie na kanale %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s jest od teraz ca³y czas aktywny na %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s nie znaleziono na li¶cie ignorowanych."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -353,107 +319,72 @@ msgid ""
 msgstr ""
 "%s posiada wyj±tek na %s i nie mo¿e byæ zbanowany póki nie zostanie usuniêty."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s przeniesiono do listy AOP kana³u %s."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s przeniesiono do listy HOP kana³u %s."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s przeniesiono do listy SOP kana³u %s."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s przeniesiono do listy VOP kana³u %s."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s nie znaleziono na li¶cie AOP kana³u %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s nie znaleziono na li¶cie HOP kana³u %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s nie znaleziono na li¶cie SOP kana³u %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s nie znaleziono na li¶cie VOP kana³u %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s nie znaleziono na li¶cie dostêpu kana³u %s."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s nie znaleziono na li¶cie AKICK kana³u %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s nie znaleziono na li¶cie zakazanych s³ów kana³u %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s nie znaleziono na li¶cie sesji."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s nie znaleziono na li¶cie wyj±tków limitów sesji."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s nie znaleziono na li¶cie AKILL."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s nie znaleziono na li¶cie SNLINE."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s nie znaleziono na li¶cie SQLINE."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s nie znaleziono na li¶cie SZLINE."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s nie znaleziono na Twojej li¶cie dostêpu."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s usuniêto z Twojej listy dostêpu."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -462,32 +393,32 @@ msgstr ""
 "Lista u¿ytkowników %s:\n"
 "Nick                 Maska"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "Nick %s nie bêdzie ignorowany."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "Nick %s bêdzie ignorowany przez %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "Nick %s bêdzie stale ignorowany."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Uwaga: Wszystkie komendy odbierane przez %S s± logowane!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Uwaga: Serwisy s± w trybie tylko do odczytu - zmiany nie bêd± zapisywane!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -495,11 +426,11 @@ msgstr ""
 "Uwaga: maska AKILL nie mo¿e zawieraæ nicków.\n"
 "Upewnij siê, ¿e nie dodajesz czê¶ci nicka."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Uwaga: mo¿esz dodawaæ jedynie maski IP do listy SZLINE."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -546,42 +477,38 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji wpisz:\n"
 "/msg %S HELP LEVELS"
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Uwaga: Maksymalny limit wiadomo¶ci (%d) zosta³ osi±gniêty.\n"
-"Nie bêdziesz otrzymywaæ nowych wiadomo¶ci je¶li kilku nie usuniesz."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Uwaga: Osi±gniêto ju¿ limit wiadomo¶ci (%d).\n"
-"Nie bêdziesz otrzymywaæ nowych wiadomo¶ci dopóki\n"
-"nie usuniesz kilku starych."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ zosta³a przeczytana."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ do %s zosta³a przeczytana."
 
-#: language.cpp:2650
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER has³o email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER has³o email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP nazwa has³o"
+
+#: modules/core/ns_help.cpp:51
 #, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -591,7 +518,7 @@ msgstr ""
 "z³o¶liwych akcji. Nadu¿ycia bêd± skutkowa³y co najmniej\n"
 "utrat± zarejestrowanego nicka."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -604,7 +531,7 @@ msgstr ""
 "Mog± przegl±daæ listê dostêpu ka¿dego kana³u,\n"
 "listê AKICK, ustawienia poziomów dostêpu itd."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -617,367 +544,383 @@ msgstr ""
 "oraz przegl±daæ listê dostêpu do ka¿dego nicka\n"
 "(/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "             Inne opcje: %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "         vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "         vhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "       Przydzielony bot: %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "       Przydzielony bot: (brak)"
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "         Opcje: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "       Kopanie za capsa: %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "       Kopanie za capsa: %s (%d kop(y) do bana; minimum %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "       Kopanie za capsa: %s (minimum %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "     W³a¶ciciel: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Typ bana: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr " Kopanie za pogrubienia: %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr " Kopanie za pogrubienia: %s (%d kop(y) do bana)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kopanie za flood: %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Kopanie za flood: %s (%d kop(y) do bana; %d linii w %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kopanie za flood: %s (%d linii w %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "\tMaska: %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Kopanie za kolory: %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Kopanie za kolory: %s (%d kop(y) do bana)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "         Wygasa: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "       Typ bana: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "        U¿ywano: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "Blokowane tryby: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr " Kopanie za powtarzanie: %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr " Kopanie za powtarzanie: %s (%d kop(y) do bana; %d czasu)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr " Kopanie za powtarzanie: %s (%d czasu)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "       Zastêpca: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "     Zawieszony: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "       Kopanie za capsa: %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr " Kopanie za pogrubienia: %s (%d kop(y) do bana)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "        Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "        Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "  Ostatni temat: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr " Zarejestrowano: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (wy³±czony)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (tylko w³a¶ciciel)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS      Zarz±dza list± dostêpu"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS      Zarz±dza list± dostêpu"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr "    ACT            Wyra¿a przez bota akcjê (komenda /me)"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK       Zarz±dza list± AKICK"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK       Zarz±dza list± AKICK"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Zarz±dza list± AKILL"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST       Listuje kana³y na których masz uprawnienia"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP         Zarz±dza list± AOP (operatorów)"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "    ASSIGN         Przydziela bota na kana³"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     W³±cza lub wy³±cza automatyczne opowanie"
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     W³±cza lub wy³±cza automatyczne opowanie"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "    BADWORDS       Zarz±dza list± zakazanych s³ów"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN         Banuje wskazan± osobê na kanale"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       Ustawia sposób banowania przez serwisy"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "    BOT            Zarz±dza sieciow± list± botów"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "    BOTLIST        Listuje dostêpne boty"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL      Wycofuje ostatni± wys³an± wiadomo¶æ"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL wszystkich u¿ytkowników na kanale"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Listuje wszystkie kana³y"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK       Sprawdza czy ostatnia wiadomo¶æ zosta³a przeczytana"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR       Usuwa wskazane obiekty z kana³u"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Usuwa wszystkie flagi z kana³u"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN       Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM     Potwierdza rejestracjê nicka"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "    Utworzony: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Modyfikuje poziom systemu DefCon"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP    Odbiera wskazanej osobie uprawnienia pó³-operatora"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Usuwa vhost wskazanego u¿ytkownika"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL         Kasuje jedn± lub wiêcej wiadomo¶ci"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Usuwa vhosty wszystkich nicków w grupie"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP        Odbiera wskazanej osobie uprawnienia operatora"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER     Usuwa twój status w³a¶ciciela kana³u"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT   Wy³±cza ochronê wskazanej osoby"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Ustawia opis kana³u"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE     Odbiera wskazanej osobie prawo g³osu"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Ustawia nick reprezentuj±cy grupê nicków"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Ustawia nick reprezentuj±cy grupê nicków"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP        Usuwa kana³"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP        Usuwa nicka"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "           Opis: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Ustawia wiadomo¶æ, która bêdzie wysy³ana\n"
-"                  do u¿ytkowników wchodz±cych na kana³"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Zarz±dza list± wyj±tków dla limitów sesji"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID      Blokuje podany kana³"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID      Blokuje podany nick"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Ustawia nick w³a¶ciciela kana³u"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -985,68 +928,73 @@ msgstr ""
 "    GETEMAIL    Wy¶wietla u¿ytkowników zarejestrowanych z\n"
 "                podanym adresem e-mail"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY      Podaje klucz do wskazanego kana³u"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr "    GETPASS     Podaje has³o do wskazanego nicka"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST       Od³±cza wskazany nick od serwera"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST       Wy¶wietla wszystkie nicki w Twojej grupie"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Wysy³a wiadomo¶æ do wszystkich u¿ytkowników"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Przypisuje komunikat powitalny do nicka"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Przypisuje komunikat powitalny do nicka"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Synchronizuje vhosty wszystkich nicków w grupie"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP       Do³±cza nick do wskazanej grupy"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "     Powitanie: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP      Nadaje wskazanej osobie uprawnienia pó³-operatora"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Ukrywa poszczególne informacje o nicku"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP         Zarz±dza list± HOP (pó³-operatorów)"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY    Identyfikuje w³a¶ciciela nicka"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Zarz±dza list± ignorowanych przez serwisy"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Zarz±dza list± ignorowanych przez serwisy"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1054,47 +1002,47 @@ msgstr ""
 "    INFO           Pokazuje informacje i ustawienia BotServa\n"
 "                   dotycz±ce bota lub kana³u"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO        Pokazuje informacje o zarejestrowanym nicku"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO        Pokazuje informacje o zarejestrowanym kanale"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO        Wy¶wietla informacje o wiadomo¶ciach"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE      Zaprasza osobê wydaj±c± polecenie na kana³"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        Blokuje pod³±czanie podanego serwera"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr "    KEEPTOPIC     Zapamiêtuje temat kiedy kana³ jest pusty"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "    KICK           Konfiguruje opcje kopania"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Wyrzuca u¿ytkownika z kana³u"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK        Wyrzuca wskazany nick z kana³u"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       W³±cza lub wy³±cza ochronê nicka"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1102,508 +1050,495 @@ msgstr ""
 "    LANGUAGE   Ustawia jêzyk w którym serwisy bêd±\n"
 "               wysy³a³y komunikaty"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Ustawia jêzyk w którym serwisy bêd±\n"
-"               wysy³a³y komunikaty"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS      Zarz±dza poziomami dostêpu"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Listuje vhosty"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr "    LIST        Listuje zarejestrowane nicki pasuj±ce do wzorca"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr "    LIST        Listuje zarejestrowane kana³y pasuj±ce do wzorca"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST        Wy¶wietla wszystkie wiadomo¶ci"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr "    LOGONNEWS   Zarz±dza wiadomo¶ciami powitalnymi"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT      Odwraca dzia³anie komendy IDENTIFY"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Blokuje zdejmowanie lub zak³adanie flag"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Zmienia flagi kana³u"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Usuwa wszystkie flagi z kana³u"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Wy¶wietla informacja o podanym module"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Listuje za³adowane modu³y"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     £aduje modu³"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     £aduje modu³"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Wy³adowuje modu³"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Zmienia sposób komunikacji serwisów"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Zapobiega wyga¶niêciu nicka"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
 msgstr "    NOOP        Tymczasowo usuwa wszystkie O:linie na serwerze"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Deaktywuje przypisanego vhosta"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Daje flagi operatora wybranemu u¿ytkownikowi"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Aktywuje przypisanego vhosta"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP          Nadaje wskazanej osobie uprawnienia operatora"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr "    OPERNEWS    Zarz±dza wiadomo¶ciami dla operatorów"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Wysy³a powiadomienie kiedy zostaj± u¿yte\n"
 "                  komendy OP/DEOP"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER       Nadaje Tobie status w³a¶ciciela kana³u"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "\tOpcje: %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Ustawia has³o do nicka"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Ustawia has³o do nicka"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Reguluje u¿ycie krytycznych komend"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr ""
 "    PRIVATE       Zapobiega wy¶wietlaniu kana³u po wydaniu\n"
 "                  polecenia LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Zapobiega wy¶wietlaniu nicka po wydaniu\n"
-"               polecenia: /msg %S LIST"
-
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Zapobiega wy¶wietlaniu nicka po wydaniu\n"
 "               polecenia: /msg %S LIST"
 
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT     Chroni wskazan± osobê"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Wy³±cza serwisy bez zapisywania baz"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
 msgstr "    RANDOMNEWS  Zarz±dza losowymi wiadomo¶ciami"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ        Wy¶wietla jedn± lub wiêcej wiadomo¶ci"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER     Od³±cza u¿ytkownika, który u¿ywa Twojego nicka"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER    Rejestruje nicka"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER    Rejestruje nicka"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr "    RELEASE     Zwalnia nick po u¿yciu komendy RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      £aduje na nowo plik konfiguracyjny"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND      Wysy³a ponownie kod autoryzuj±cy"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords"
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Zapisuje bazy i restartuje serwisy"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Ogranicza dostêp do kana³u"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND       Wysy³a wiadomo¶æ z ¿±daniem potwierdzenia odbioru"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr " Kopanie za odw kolorów: %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr " Kopanie za odw kolorów: %s (%d kop(y) do bana)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET       Ustawia opcje wskazanemu nickowi"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr "    SAY            Wypowiada przez bota tekst na kanale"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, fuzzy, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        W³±cza lub wy³±cza bezpieczeñstwo kana³u"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     W³±cza lub wy³±cza bezpieczeñstwo nicka"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER ¦ci¶le kontroluje status w³a¶ciciela"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     ¦ci¶le kontroluje status operatorów"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND        Wysy³a wiadomo¶æ do u¿ytkownika/kana³u"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr ""
 "    SENDALL     Wysy³a wiadomo¶æ do wszystkich\n"
 "                zarejestrowanych u¿ytkowników"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS    Pomaga odzyskaæ utracone has³o"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Wy¶wietla listê sesji"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "    SET            Konfiguruje bota"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Zmienia vhost wskazanemu u¿ytkownikowi"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Ustawia ró¿ne globalne opcje serwisów"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET         Modyfikuje ustawienia kana³u"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET         Modyfikuje ustawienia nicka"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET         Ustawia opcje zwi±zane z wiadomo¶ciami"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Zmienia vhosty wszystkich nicków w grupie"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Wy³±cza serwisy z zapisaniem baz"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Podpisuje kicki kiedy u¿yto komendy KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Zarz±dza list± SNLINE"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP         Zarz±dza list± SOP (super-operatorów)"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Zarz±dza list± SQLINE"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Wy¶wietla ekipê serwisów oraz jej status"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr ""
 "    STAFF       Wysy³a wiadomo¶æ do wszystkich\n"
 "                operatorów/administratorów"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Pokazuje informacje o serwisach i sieci"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS      Zwraca aktualny poziom dostêpu do\n"
 "                kana³u wskazanego u¿ytkownika"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS      Podaje status w³a¶ciciela podanego nicka"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Ustawia nick spadkobiercy kana³u"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND     Blokuje podany kana³ z zachowaniem\n"
 "                wszelkich jego danych i ustawieñ"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr ""
 "    SUSPEND     Blokuje podany nick z zachowaniem\n"
 "                wszelkich jego danych i ustawieñ"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Wymusza zmianê nicka danego u¿ytkownika"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Zarz±dza list± SZLINE"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC       Zmienia temat podanego kana³u"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     Ogranicza mo¿liwo¶æ zmiany tematu"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Modyfikuje flagi wskazanego u¿ytkownika"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "    UNASSIGN       Usuwa bota z kana³u"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN       Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND   Uwalnia zawieszony kana³"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND   Uwalnia zawieszonego nicka"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
 msgstr "    UPDATE      Wymusza natychmiastowy zapis baz na dysku"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE      Aktualizuje twój obecny status np.\n"
 "                sprawdza nowe wiadomo¶ci"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Listuje wszystkich u¿ytkowników"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    Obecny na: %d kana³ach"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE       Nadaje wskazanej osobie prawo g³osu"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP         Zarz±dza list± VOP (osób z prawem g³osu)"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr ""
 "    XOP           W³±cza system uprawnieñ xOP\n"
 "                  (u¿ycie komend SOP, AOP, HOP, VOP)"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (wygasa za %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "       Kopanie za s³owa: %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "       Kopanie za s³owa: %s (%d kop(y) do bana)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "  Adres e-mail: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr " Jest online z: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "      Widziano: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "Ustawiony przez: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1612,17 +1547,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1631,97 +1566,101 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "      Powitanie: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "\tNazwa: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "Zarejestrowano: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Kopanie za podkre¶lenia: %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Kopanie za podkre¶lenia: %s (%d kop(y) do bana)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Nr   Nadawca            Data/Czas"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr "\"/msg %s\" nie jest ju¿ obs³ugiwane. U¿yj \"/msg %s@%s\" lub \"/%s\"."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1730,7 +1669,7 @@ msgstr ""
 "%3d  %s (przez %s na %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1739,25 +1678,16 @@ msgstr ""
 "%3d %s (przez %s na %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (zablokowany) (przez %s na %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (przez %s na %s; %s)\n"
 "    Limit: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1766,257 +1696,263 @@ msgstr ""
 "%5d (%s przez %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Komendy %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s nie otrzymuje powiadomieñ o nowych wiadomo¶ciach."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "Za³adowanych modu³ów: %d."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d boty(ów) dostêpnych."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d dni"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (przez %s na %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d godzin(y)"
+msgid "%d Modules loaded."
+msgstr "Za³adowanych modu³ów: %d."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minut(y)"
+msgid "%d bots available."
+msgstr "%d boty(ów) dostêpnych."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicków w grupie."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund(y)"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "Lista AOP kana³u %s jest pusta."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "Lista HOP kana³u %s jest pusta."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "Lista SOP kana³u %s jest pusta."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "Lista VOP kana³u %s jest pusta."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "Lista dostêpu kana³u %s jest pusta."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Lista AKICK kana³u %s jest pusta."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "Lista zakazanych s³ów dla kana³u %s jest pusta."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
 "%s nie mo¿e byæ zastêpc± na kanale %s, poniewa¿ jest jego w³a¶cicielem."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s nie mo¿e odbieraæ wiadomo¶ci."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Komendy %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "%s jest za ogólna; u¿yj bardziej szczegó³owej maski."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s ma aktualnie %d wiadomo¶ci, z czego %d jest nieprzeczytanych."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s ma aktualnie %d wiadomo¶ci, w tym jedn± nieprzeczytan±."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s ma aktualnie %d wiadomo¶ci."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s ma aktualnie %d nieprzeczytanych wiadomo¶ci."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s ma aktualnie jedn± wiadomo¶æ, która jest nieprzeczytana."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s aktualnie ma jedn± wiadomo¶æ."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s aktualnie nie ma wiadomo¶ci."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s ma zbyt du¿o wiadomo¶ci i nie mo¿e otrzymywaæ nowych."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s nie ma limitu wiadomo¶ci."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s nie ma wiadomo¶ci."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s nie ma nowych wiadomo¶ci."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s to %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s jest operatorem serwisów typu %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s jest obecnie offline."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s jest teraz online."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s jest wy³±czone"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s jest w³±czone"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s nie jest ju¿ d³u¿ej super-administratorem"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s nie otrzymuje powiadomieñ o nowych wiadomo¶ciach."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s otrzymuje powiadomienia o nowych wiadomo¶ciach\n"
 "podczas logowania i w momencie ich nadej¶cia."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s otrzymuje powiadomienia o nowych wiadomo¶ciach podczas logowania."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr ""
 "%s otrzymuje powiadomienia o nowych wiadomo¶ciach w momencie ich nadej¶cia."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s jest teraz super-administratorem"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Lista AOP kana³u %s:\n"
+"  Nr   Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s nie znaleziono na li¶cie AKICK kana³u %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s usuniêto z listy AKICK %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s nie bêdzie powiadamia³ Ciê o nowych wiadomo¶ciach."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr ""
 "%s bêdzie powiadamia³ Ciê o nowych wiadomo¶ciach w momencie ich nadej¶cia."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2025,233 +1961,219 @@ msgstr ""
 "%s powiadomi Ciê o wiadomo¶ciach podczas logowania i w momencie ich "
 "nadej¶cia."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s powiadomi Ciê o wiadomo¶ciach podczas logowania oraz po wy³±czeniu /away."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) dodano do listy botów."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s ma limit wiadomo¶ci %d i nie mo¿e byæ zmieniony."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s ma limit wiadomo¶ci %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILLuje wszystkich nowych klientów"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Wymusza ustawienie flag (%s) na wszystkich kana³ach"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignoruje zwyk³ych u¿ytkowników (informuje ich o tym)"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killuje wszystkich nowych klientów"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Flagi kana³ów nie bêd± wymuszane (MLOCK)"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Wy³±cza rejestrowanie kana³ów"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Nowe wiadomo¶ci nie bêd± wysy³ane"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Wy³±cza rejestrowanie nicków"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Cicho ignoruje zwyk³ych u¿ytkowników"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* U¿ywa zredukowanego limitu sesji: %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 dzieñ"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 godzina"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minuta"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 sekunda"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<nieznane>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Wiadomo¶æ zosta³a wys³ana do wszystkich zarejestrowanych u¿ytkowników."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 msgstr "Powiadomienie o przeczytaniu wiadomo¶ci zosta³o wys³ane do %s."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "Kod zosta³ wys³any na adres %s.\n"
 "Napisz /msg %s CONFIRM <kod>, aby dokoñczyæ procedurê rejestracji."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "Ident vhosta musi mieæ format prawid³owego identa."
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Vhost musi mieæ format prawid³owej maski hosta."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS kana³ {ADD|DEL|LIST|VIEW|CLEAR} [nick [poziom] | pozycja]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [maska]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT kana³ tekst"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [maska]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK kana³ {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-lub-maska] [powód]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 "Egzekucja listy AKICK kana³u %s zakoñczona.\n"
 "Dotyczy³a %d u¿ytkowników."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "Lista AKILL jest pusta."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista AOP kana³u %s:\n"
-"  Nr   Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN kana³ nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Odmowa dostêpu."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr ""
 "Poziom dostêpu dla %s na kanale %s\n"
 "zmieniono na %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr ""
 "Poziom dostêpu dla %s na kanale %s jest\n"
 "nadany od %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Poziom dostêpu musi byæ pomiêdzy %d a %d w³±cznie."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Poziom dostêpu nie mo¿e byæ zerem."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Ustawienia poziomów dostêpu kana³u %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Poziomy dostêpu kana³u %s zosta³y zresetowane do domy¶lnych."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Lista dostêpu dla %s jest pusta."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lista dostêpu dla %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Lista dostêpu kana³u %s:\n"
 "  Nr   Poz  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista dostêpu:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2260,22 +2182,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s dodano do listy AKICK kana³u %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Dodano now± wiadomo¶æ powitaln± (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Dodano now± wiadomo¶æ dla operatorów (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Dodano now± losow± wiadomo¶æ (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2283,237 +2210,230 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Wszystkie O:linie %s zosta³y usuniête."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Wszystkie O:linie %s zosta³y zresetowane."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Wszystkie bany z kana³u %s zosta³y usuniête."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Wszystkie wyj±tki z kana³u %s zosta³y usuniête."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Wszystkie zaproszenia z kana³u %s zosta³y usuniête."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Wszystkie wiadomo¶ci powitalne zosta³ skasowane."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Wszystkie wiadomo¶ci kana³u %s zosta³y usuniête."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Wszystkie tryby zosta³y wyczyszczone na kanale %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Wszystkie flagi kana³u %s zosta³y zresetowane."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Wszystkie Twoje wiadomo¶ci zosta³y usuniête."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Wszystkie wiadomo¶ci dla operatorów zosta³y skasowane."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Wszystkie losowe wiadomo¶ci zosta³y skasowane."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Wszyscy u¿ytkownicy zostali usuniêci z kana³u %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Pozwala u¿ywaæ komend HALFOP i DEHALFOP na sobie"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Pozwala u¿ywaæ komend OP i DEOP na sobie"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Pozwala u¿ywaæ komend PROTECT i DEPROTECT na sobie"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Pozwala u¿ywaæ komend VOICE i DEVOICE na sobie"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Pozwala przydzielaæ i usuwaæ bota"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Pozwala u¿ywaæ komendy BAN na sobie"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Pozwala u¿ywaæ komendy KICK na sobie"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Pozwala listowaæ i czytaæ kana³owe wiadomo¶ci"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Pozwala modyfikowaæ listê dostêpu"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Pozwala u¿ywaæ komendy AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Pozwala u¿ywaæ komendy BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Pozwala u¿ywaæ komendy BAN na innych osobach"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Pozwala u¿ywaæ komendy CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Pozwala u¿ywaæ komendy GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Pozwala u¿ywaæ komend HALFOP i DEHALFOP na innych osobach"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Pozwala u¿ywaæ opcji ALL w komendzie INFO"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Pozwala u¿ywaæ komendy INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Pozwala u¿ywaæ komendy KICK na innych osobach"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Pozwala u¿ywaæ komend OP i DEOP na innych osobach"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Pozwala u¿ywaæ komend PROTECT i DEPROTECT na innych osobach"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Pozwala u¿ywaæ komend SAY i ACT"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Pozwala modyfikowaæ ustawienia kana³u"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Pozwala u¿ywaæ komendy TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Pozwala u¿ywaæ komendy UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Pozwala u¿ywaæ komend VOICE i DEVOICE na innych osobach"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Pozwala u¿ywaæ publicznych komend FANTASY"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Pozwala przegl±daæ listê dostêpu"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "AUTOOP"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista AKICK dla kana³u %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Automatyczne nadawanie statusu operatora (+o)"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Automatyczne nadawanie ochrony (+a)"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Automatyczne nadawanie statusu pó³-operatora (+h)"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Automatyczne nadawanie prawa g³osu (+v)"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS kana³ {ADD|DEL|LIST|CLEAR} [s³owo | pozycja] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #kana³ nick [powód]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2523,7 +2443,7 @@ msgstr ""
 "BOT CHANGE stary-nick nowy-nick [user [host [real]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2532,111 +2452,109 @@ msgstr ""
 "Lista zakazanych s³ów dla %s:\n"
 "  Nr    S³owo                          Typ"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Lista zakazanych s³ów zosta³a wyczyszczona."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Rodzajem bana dla kana³u %s jest teraz #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Tryby i bany zosta³y wyczyszczone na kanale %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s ju¿ istnieje."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Bot %s nie istnieje."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s zosta³ przypisany do %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Bot %s zosta³ zmieniony na %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Bot %s zosta³ usuniêty."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s jest ju¿ postawiony na %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot bêdzie teraz kopa³ operatorów na kanale %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot bêdzie kopa³ voiców na kanale %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot nie bêdzie kopa³ operatorów na kanale %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot nie bêdzie kopa³ voiców na kanale %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Host bota mo¿e siê sk³adaæ maksymalnie z %d znaków."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Host bota mo¿e zawieraæ tylko prawid³owe znaki."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Ident bota mo¿e siê sk³adaæ maksymalnie z %d znaków."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Ident bota mo¿e zawieraæ tylko prawid³owe znaki."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Nick bota mo¿e zawieraæ tylko prawid³owe znaki."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Nie ma bota na kanale %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Lista botów:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Bot wejdzie na kana³ je¶li przebywa na nim\n"
-"przynajmniej %d u¿ytkownik(ów)."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2647,7 +2565,7 @@ msgstr ""
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana.\n"
 "U¿yj komendy BADWORDS, aby modyfikowaæ listê."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2655,20 +2573,20 @@ msgstr ""
 "Bot bêdzie kopa³ za zakazane s³owa.\n"
 "U¿yj komendy BADWORDS, aby modyfikowaæ listê s³ów."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Bot bêdzie kopa³ za pogrubienia,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Bot bêdzie kopa³ za pogrubienia."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2679,7 +2597,7 @@ msgstr ""
 "musz± stanowiæ %d znaków %d%% ca³ej wiadomo¶ci).\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2688,49 +2606,49 @@ msgstr ""
 "Bot bêdzie kopa³ za CAPSa (du¿e litery\n"
 "musz± stanowiæ %d znaków %d%% ca³ej wiadomo¶ci)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot bêdzie kopa³ za kolory,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Bot bêdzie kopa³ za kolory."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Bot bêdzie kopa³ za flood (%d linii w %d sekund),\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr ""
 "Bot bêdzie kopa³ za flood\n"
 "(%d linii w %d sekund)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2741,7 +2659,7 @@ msgstr ""
 "(u¿ytkowników, którzy napisz± %d razy to samo),\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2750,137 +2668,153 @@ msgstr ""
 "Bot bêdzie kopa³ za powtórzenia\n"
 "(u¿ytkowników, którzy napisz± %d razy to samo)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot bêdzie kopa³ za odwracanie kolorów,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Bot bêdzie kopa³ za odwracanie kolorów."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot bêdzie kopa³ za podkre¶lenia,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Bot bêdzie kopa³ za podkre¶lenia."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Bot bêdzie kopa³ za kolory."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Bot nie bêdzie kopa³ za zakazane s³owa."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Bot nie bêdzie kopa³ za pogrubienia."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Bot nie bêdzie kopa³ za CAPSa."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Bot nie bêdzie kopa³ za kolory."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Bot nie bêdzie kopa³ za flood."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Bot nie bêdzie kopa³ za powtórzenia."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot nie bêdzie kopa³ za odwracanie kolorów."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot nie bêdzie kopa³ za podkre¶lenia."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Bot nie bêdzie kopa³ za CAPSa."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d rekordów, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Boty zarezerwowane dla IRC operatorów:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Odebrano      : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Wys³ano       : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | kana³}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+czas-trwania] {#kana³} [powód]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nick"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR kana³ co"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES kana³ [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Nie mogê wylogowaæ %s, bo to administrator serwisów."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR kana³ co"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Nie mogê wys³aæ teraz maila. Spróbuj za chwilê."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d rekordów, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Zmieniono flagi u¿ytkownika dla %s."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Kana³ %s nie istnieje."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Kana³ %s zosta³ odrejestrowany."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2889,142 +2823,103 @@ msgstr ""
 "Kana³ %s zosta³ zablokowany przez %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Kana³ %s jest ju¿ zarejestrowany!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Kana³ %s zosta³ zablokowany."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Kana³ %s zosta³ uwolniony."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Kana³ %s zosta³ zawieszony."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Kana³ %s nie jest zarejestrowany."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Kana³u %s nie mo¿na rejestrowaæ ani u¿ywaæ."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Kana³u %s nie mo¿na rejestrowaæ."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr ""
 "Kana³ %s zosta³ teraz zarejestrowany.\n"
 "Jako %s jeste¶ od teraz jego w³a¶cicielem."
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Kana³         : %6d rekordów, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Kana³ %s od teraz podlega prawu wygasania."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Kana³ %s nie wyga¶nie."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Lista AOP kana³u %s zosta³a wyczyszczona."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Lista HOP kana³u %s zosta³a wyczyszczona."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Lista SOP kana³u %s zosta³a wyczyszczona."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Lista VOP kana³u %s zosta³a wyczyszczona."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Lista dostêpu kana³u %s zosta³a wyczyszczona."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Lista AKICK kana³u %s zosta³a wyczyszczona."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Kana³ %s zosta³ uwolniony."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "%s nie jest prawid³owym kana³em."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Kana³owa lista AOP mo¿e zawieraæ jedynie zarejestrowane nicki."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Kana³owa lista HOP mo¿e zawieraæ jedynie zarejestrowane nicki."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Kana³owa lista SOP mo¿e zawieraæ jedynie zarejestrowane nicki."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr "Kana³owe SQLINE nie jest obs³ugiwane przez Twoje ircd."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Kana³owa lista VOP mo¿e zawieraæ jedynie zarejestrowane nicki."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Kana³owa lista dostêpu mo¿e zawieraæ tylko zarejestrowane nicki."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3032,11 +2927,7 @@ msgstr ""
 "Lista kana³ów:\n"
 "Nazwa                Tryby u¿yt.   Temat"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Automatyczne odbieranie statusu operatora (-o)"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3045,7 +2936,7 @@ msgstr ""
 "Kana³y, na których %s jest na li¶cie dostêpu:\n"
 "  Nr   Kana³              Poziom    Opis"
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3053,31 +2944,16 @@ msgstr ""
 "Kana³y, na których jeste¶ na li¶cie dostêpu:\n"
 "  Nr   Kana³              Poziom    Opis"
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Nie mogê zablokowaæ kana³u %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Nie mogê zablokowaæ nicka %s!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Nie mogê uwolniæ kana³u %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Zawieszenie kana³u %s nie powiod³o siê!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Aktualna lista AKILL:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3085,15 +2961,15 @@ msgstr ""
 "Aktualna lista AKILL:\n"
 "  Nr    Maska                             Powód"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Aktualna lista modu³ów:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Aktualna lista SNLINE:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3101,11 +2977,11 @@ msgstr ""
 "Aktualna lista SNLINE:\n"
 "  Nr    Maska                             Powód"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Aktualna lista SQLINE:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3113,11 +2989,11 @@ msgstr ""
 "Aktualna lista SQLINE:\n"
 "  Nr    Maska                             Powód"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Aktualna lista SZLINE:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3125,725 +3001,612 @@ msgstr ""
 "Aktualna lista SZLINE:\n"
 "  Nr    Maska                             Powód"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Aktualna lista wyj±tków limitów sesji:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Aktualna ilo¶æ wpisów AKILL: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Aktualna ilo¶æ wpisów SNLINE: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Aktualna ilo¶æ wpisów SQLINE: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Aktualna ilo¶æ wpisów SZLINE: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "U¿ytkowników  : %d (%d operatorów)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #kana³ [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [kana³] {numer | list | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #kana³ [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #kana³"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #kana³ [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #kana³ [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #kana³ [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP kana³"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Domy¶lny czas wygasania AKILL: %d dni"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Domy¶lny czas wygasania AKILL: %d godzin(y)"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Domy¶lny czas wygasania AKILL: %d minut(y)"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Domy¶lny czas wygasania AKILL: 1 dzieñ"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Domy¶lny czas wygasania AKILL: 1 godzina"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Domy¶lny czas wygasania AKILL: 1 minuta"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Domy¶lny czas wygasania AKILL: nie wygasa"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Domy¶lny czas wygasania SNLINE: %d dni"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Domy¶lny czas wygasania SNLINE: %d godzin(y)"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Domy¶lny czas wygasania SNLINE: %d minut(y)"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Domy¶lny czas wygasania SNLINE: 1 dzieñ"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Domy¶lny czas wygasania SNLINE: 1 godzina"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Domy¶lny czas wygasania SNLINE: 1 minuta"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Domy¶lny czas wygasania SNLINE: nie wygasa"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Domy¶lny czas wygasania SQLINE: %d dni"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Domy¶lny czas wygasania SQLINE: %d godzin(y)"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Domy¶lny czas wygasania SQLINE: %d minut(y)"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Domy¶lny czas wygasania SQLINE: 1 dzieñ"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Domy¶lny czas wygasania SQLINE: 1 godzina"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Domy¶lny czas wygasania SQLINE: 1 minuta"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Domy¶lny czas wygasania SQLINE: nie wygasa"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Domy¶lny czas wygasania SZLINE: %d dni"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Domy¶lny czas wygasania SZLINE: %d godzin(y)"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Domy¶lny czas wygasania SZLINE: %d minut(y)"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Domy¶lny czas wygasania SZLINE: 1 dzieñ"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Domy¶lny czas wygasania SZLINE: 1 godzina"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Domy¶lny czas wygasania SZLINE: 1 minuta"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Domy¶lny czas wygasania SZLINE: nie wygasa"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "Usuniêto %d wpisów(y) z listy AOP kana³u %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "Usuniêto %d wpisów(y) z listy HOP kana³u %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "Usuniêto %d wpisów(y) z listy SOP kana³u %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "Usuniêto %d wpisów(y) z listy VOP kana³u %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "Usuniêto %d wpisów(y) z listy dostêpu kana³u %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Usuniêto %d wpisów z listy AKICK kana³u %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr ""
 "Usuniêto %d wpisów z listy zakazanych s³ów\n"
 "kana³u %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "Usuniêto %d wpisy(ów) z listy wyj±tków limitów sesji."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "Usuniêto %d wpisy(ów) z listy AKILL."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "Usuniêto %d wpisy(ów) z listy SNLINE."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "Usuniêto %d wpisy(ów) z listy SQLINE."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "Usuniêto %d wpisy(ów) z listy SZLINE."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "Usuniêto 1 wpis z listy AOP kana³u %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "Usuniêto 1 wpis z listy HOP kana³u %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "Usuniêto 1 wpis z listy SOP kana³u %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "Usuniêto 1 wpis z listy VOP kana³u %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "Usuniêto 1 wpis z listy dostêpu kana³u %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Usuniêto 1 wpis z listy AKICK kana³u %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "Usuniêto 1 wpis z listy zakazanych s³ów kana³u %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "Usuniêto 1 wpis z listy wyj±tków limitów sesji."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "Usuniêto 1 wpis z listy AKILL."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "Usuniêto 1 wpis z listy SNLINE."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "Usuniêto 1 wpis z listy SQLINE."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "Usuniêto 1 wpis z listy SZLINE."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "Usuniêto 1 wpis z listy AOP kana³u %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Opis kana³u %s zosta³ zmieniony na %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "wy³±czone"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Wy¶wietlono wszystkie wpisy (Liczba: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Wy¶wietlono wpisy od %d do %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Wy¶wietlono pasuj±ce wpisy %s (Liczba: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Nie pogrubiaj tekstu na tym kanale!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Nie u¿ywaj kolorów na tym kanale!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Nie u¿ywaj odwracania kolorów!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Nie u¿ywaj s³owa \"%s\" na tym kanale!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Nie u¿ywaj podkre¶leñ na tym kanale!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Adres e-mail osoby %s zosta³ zmieniony na %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Adres e-mail osoby %s zosta³ usuniêty."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Adres e-mail zosta³ usuniêty."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "Adres e-mail dla %s nie jest prawid³owy."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametry]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Adresy e-mail %s pasuj±ce do %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "w³±czone"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Koniec listy %s."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Koniec listy dostêpu."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Koniec listy kana³ów."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Koniec listy - %d/%d kana³ów pokazano."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Koniec listy - %d/%d wpisów wy¶wietlono."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Koniec listy u¿ytkowników."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Polski"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Wiadomo¶æ powitalna kana³u %s zosta³a zmieniona."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Wiadomo¶æ powitalna kana³u %s zosta³a usuniêta."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr "B³±d! Ident jest za d³ugi, u¿yj identa krótszego ni¿ %d znaków."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr "B³±d! Vhost jest za d³ugi, u¿yj vhosta krótszego ni¿ %d znaków."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Wyj±tek dla %s (#%d) przeniesiono na pozycjê %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Wyj±tek dla %s zosta³ zaktualizowany do %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "        Wygasa: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Zmieniono czas wygasania %s."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID kana³ powód"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID kana³ [powód]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nick powód"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [powód]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "FANTASY"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Komendy fantasy na kanale %s zosta³y w³±czone."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Komendy fantasy na kanale %s zosta³y wy³±czone."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Komendy fantasy na kanale %s zosta³y w³±czone."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "Nick %s nie bêdzie ignorowany."
 
-#: language.cpp:846
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "W³a¶cicielem kana³u %s jest teraz %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Bez symboli wieloznacznych!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY kana³"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "Komenda GETPASS nie dzia³a, bo has³a s± szyfrowane."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [has³o]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL tre¶æ wiadomo¶ci"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP nazwa has³o"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Nick zosta³ usuniêty z sieci."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "GREET"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Wy¶wietla wiadomo¶æ powitaln± (greet)"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Wiadomo¶æ powitalna osoby %s zosta³a zmieniona na %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Wiadomo¶æ powitalna osoby %s zosta³a usuniêta."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Witanie u¿ytkowników na kanale %s zosta³o wy³±czone."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Witanie u¿ytkowników na kanale %s zosta³o w³±czone."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #kana³ [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista HOP kana³u %s:\n"
-"  Nr   Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d rekordów, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosty z przynajmniej %d sesjami:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY has³o"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [czas] [nick | maska]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO kana³"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {kana³ | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE kana³"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Masz 20 sekund na zmianê nicka, potem zostanie zmieniony si³±."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Masz jedn± minutê na zmianê nicka, potem zostanie zmieniony si³±."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Opcja IGNORE zosta³a w³±czona."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Opcja IGNORE zosta³a wy³±czona."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Lista ignorowanych zosta³a wyczyszczona."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Lista ignorowanych jest pusta."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Lista botów:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3859,42 +3622,38 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %S HELP SET opcja"
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Podano nieprawid³owy zakres. Poprawny zapis to #od-do."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informacje o bocie %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informacje o kanale %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "B³±d wewnêtrzny - nie mogê obs³u¿yæ ¿±dania."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Nieprawid³owy czas wygasania."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
 msgstr ""
 "Nieprawid³owa maska. Tylko rzeczywiste maski s± prawid³owe jako wyj±tki."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Podano nieprawid³owy kod, sprawd¼ wiadomo¶æ e-mail i spróbowaæ ponownie."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3902,303 +3661,317 @@ msgid ""
 msgstr ""
 "Nieprawid³owy limit sesji. Musi byæ liczb± nieujemn± i mniejsz± ni¿ %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Nieprawid³owa warto¶æ progu. Musi byæ liczb± ca³kowit± wiêksz± ni¿ 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE serwer [powód]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #kana³ nick [powód]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK kana³ opcja {ON|OFF} [ustawienia]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK kana³ nick powód"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Kluczem do kana³u %s jest %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS kana³ {SET | DIS[ABLE] | LIST | RESET} [element [poziom]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST wzorzec"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST wzorzec [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [kana³] [lista | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 "LOGONNEWS {ADD|DEL|LIST} [tekst|numer]\n"
 "LOGONNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Jêzyk zosta³ zmieniony na Polski."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ostatnia wiadomo¶æ do %s zosta³a odwo³ana."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "  Ostatni QUIT: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "  Ostatni host: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr ""
 "Wymagany poziom dla %s\n"
 "na kanale %s zmieniono teraz na %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Poziom musi byæ pomiêdzy %d a %d w³±cznie."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Modyfikowanie poziomów nie jest dostêpne w trybie XOP."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista pasuj±cych wpisów %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista nicków grupy %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Lista nicków w grupie:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Lokalne kana³y nie mog± byæ rejestrowane."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Wiadomo¶æ powitalna #%d zosta³a skasowana."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Wiadomo¶æ powitalna #%d nie zosta³a znaleziona!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Wiadomo¶ci powitalne:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE kana³ flagi"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO nazwa-pliku"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD nazwa-pliku"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD nazwa-pliku"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD nazwa-pliku"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Maska %s jest ju¿ w Twojej li¶cie dostêpu."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Maska musi mieæ format ident@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Rekord u¿ytk. : %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Wiadomo¶æ %d od %s (%s). Aby usun±æ, napisz: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Wiadomo¶æ %d od %s (%s). Aby usun±æ, napisz: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Wiadomo¶æ %d zosta³a usuniêta."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limit wiadomo¶ci dla %s jest wy³±czony."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limit wiadomo¶ci dla %s zmieniono na %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limit wiadomo¶ci dla %s ustawiono na 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Limit wiadomo¶ci jest za du¿y. Limituj do %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Wiadomo¶æ zosta³a wys³ana do %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ numer"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ %s numer"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ numer"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ %s numer"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "MSG"
 
-#: language.cpp:866
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Flaga %c zosta³a zignorowana, bo nie mo¿na jej blokowaæ."
-
-#: language.cpp:1314
-#, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Flagi +o zosta³y wyczyszczone na kanale %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Blokada trybów kana³u %s zosta³a zmieniona na: %s"
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "Blokowane tryby: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modu³ %s zosta³ za³adowany."
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modu³ %s zosta³ za³adowany."
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modu³ %s zosta³ wy³adowany."
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modu³: %s Wersja: %s Autor: %s Za³adowano: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modu³: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} serwer"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliasy NS     : %6d rekordów, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grupy NS      : %6d rekordów, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Ochrona przed kopaniem za pomoc± komendy KICK"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Nowa wiadomo¶æ"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr ""
 "Nowe wiadomo¶ci dla %s. Aby przeczytaæ,\n"
 "napisz: /msg %s READ numer"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr ""
 "Nowe wiadomo¶ci dla %s. Aby przeczytaæ,\n"
 "napisz: /msg %s READ %s numer"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Lista wiadomo¶ci powitalnych jest pe³na!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4207,146 +3980,132 @@ msgstr ""
 "Nick %s zosta³ zablokowany przez %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s jest nieprawid³owy i nie mo¿e byæ u¿ywany."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s jest aktualnie w u¿yciu."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Nick %s zosta³ zablokowany."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s jest serwisem!"
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Nick %s nie jest zajêty przez serwisy."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Nick %s nie jest aktualnie u¿ywany."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Nick %s nie jest zarejestrowany."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Nick %s nie mo¿e byæ rejestrowany ani u¿ywany."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s nie znaleziono na li¶cie ignorowanych."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s zosta³ skrócony do %d znaków."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s od teraz podlega zasadom wygasania."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s nie wyga¶nie."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "%s nie posiada wiadomo¶ci od Ciebie."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Nick %s zosta³ wylogowany."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s jest obecnie zawieszony."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s zosta³ uwolniony."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s zosta³ zawieszony."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick nie zosta³ zarejestrowany. Proszê spróbowaæ pó¼niej."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nick %s potwierdzony."
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Nick %s zosta³ odrejestrowany."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Nick %s jest ju¿ zarejestrowany!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Nick %s nie mo¿e byæ rejestrowany."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nick %s nie jest zarejestrowany."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Nick %s zosta³ zarejestrowany z mask±: %s."
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nick %s zosta³ zarejestrowany."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Rejestracja nicka %s"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Has³o do nicka %s"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4357,161 +4116,116 @@ msgstr ""
 "usuwane po %d dniach od ostatniej identyfikacji.\n"
 "Wszelkie ustawienia oraz uprawnienia zostaj± usuniête."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Nie znaleziono znaku # na pocz±tku nazwy kana³u."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Opcja NOBOT zosta³a wy³±czona na kanale %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Opcja NOBOT zosta³a w³±czona na kanale %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nie ma u¿ytkowników z adresem e-mail %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "NOBOT"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Brak dostêpnej pomocy dla %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Informacje o module %s nie s± dostêpne."
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Nie ma wiadomo¶ci powitalnych do skasowania!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Nie znaleziono wpisów w li¶cie AOP kana³u %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Nie znaleziono wpisów w li¶cie HOP kana³u %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Nie znaleziono wpisów w li¶cie SOP kana³u %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Nie znaleziono wpisów w li¶cie VOP kana³u %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nie znaleziono wpisów na li¶cie dostêpu kana³u %s."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nie znaleziono wpisów na li¶cie AKICK kana³u %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie zakazanych s³ów kana³u %s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "Nie znaleziono wpisów na li¶cie wyj±tków limitów sesji."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie AKILL."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie SNLINE."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie SQLINE."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie SZLINE."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Brak wiadomo¶ci do odwo³ania."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Aktualnie nie ma za³adowanych modu³ów."
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nie ma wiadomo¶ci dla operatorów do skasowania!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Nie ma losowych wiadomo¶ci do skasowania!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Bez powodu"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Nie podpisze kicka, gdy SIGNKICK LEVEL jest u¿ywany"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Brak wpisu (#%d) na li¶cie AOP kana³u %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Brak wpisu (#%d) na li¶cie HOP kana³u %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Brak wpisu (#%d) na li¶cie SOP kana³u %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Brak wpisu (#%d) na li¶cie VOP kana³u %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Brak"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Nie pozwala wej¶æ na kana³ w trybie RESTRICTED"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4523,95 +4237,93 @@ msgstr ""
 "na li¶cie dostêpu kana³u w tym czasie) zostanie\n"
 "automatycznie odrejestrowany."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Nr   Limit  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flagi"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #kana³ [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "OPNOTICE"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #kana³ [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #kana³"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #kana³ [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Nic siê nie zmieni³o."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr " Na Poziom Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Opcja OPNOTICE dla kana³u %s zosta³a wy³±czona."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Opcja OPNOTICE dla kana³u %s zosta³a w³±czona."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Wiadomo¶æ dla operatorów #%d zosta³a skasowana."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Wiadomo¶æ dla operatorów #%d nie zosta³a znaleziona!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Wiadomo¶ci dla operatorów:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d rekordów, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Flagi operatora %s zosta³y przyznane dla %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "DONTKICKOPS"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opcja %s nie jest dostêpna w tej sieci."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #kana³ [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Kod rejestracyjny dla %s to %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Has³o przyjête - jeste¶ zidentyfikowany(a)."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4619,60 +4331,56 @@ msgstr ""
 "Aby u¿yæ tej komendy musisz siê zidentyfikowaæ.\n"
 "Napisz /msg %s IDENTIFY has³o, a pó¼niej ponów próbê."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Has³o dla %s zosta³o zmienione na %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Has³o dla %s zosta³o zmienione."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Has³o dla %s to %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Nieprawid³owe has³o."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Has³o do nicka %s zosta³o wys³ane."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "PEACE"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Opcja PEACE dla kana³u %s zosta³a wy³±czona."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Opcja PEACE dla kana³u %s zosta³a w³±czona."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr "Skontaktuj siê z operatorem, aby uzyskaæ vhosta na ten nick."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4680,169 +4388,130 @@ msgstr ""
 "Has³o powinno mieæ minimum 5 znaków oraz powinno\n"
 "zawieraæ cyfry i litery."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Proszê u¿yæ prawid³owej nazwy serwera."
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "U¿yj symboli # lub & podczas rejestracji"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Proszê odczekaæ %d sekund(y) i ponowiæ próbê."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Odczekaj %d sekund przed ponownym u¿yciem komendy GROUP."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Odczekaj %d sekund przed ponownym u¿yciem komendy REGISTER."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Odczekaj %d sekund przed ponownym u¿yciem komendy RSEND."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Odczekaj %d sekund(y) przed ponownym u¿yciem komendy SEND."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "PRIVATE"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Opcja PRIVATE bota %s zosta³a wy³±czona."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Opcja PRIVATE bota %s zosta³a w³±czona."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Opcja PRIVATE dla kana³u %s zosta³a wy³±czona."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Opcja PRIVATE dla kana³u %s zosta³a w³±czona."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Opcja prywatno¶ci dla %s zosta³a wy³±czona."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Opcja prywatno¶ci dla %s zosta³a w³±czona."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "KILL"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Ochrona dla %s jest teraz wy³±czona."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Ochrona dla %s ze zredukowanym opó¼nieniem jest teraz w³±czona."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Natychmiastowa ochrona dla %s jest teraz w³±czona"
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Ochrona dla %s jest teraz w³±czona."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Natychmiastowa ochrona jest teraz w³±czona."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Dodane komendy: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [kana³] {lista | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [has³o]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER kana³ opis"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER has³o email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER has³o [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [has³o]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | kana³} tre¶æ"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Losowa wiadomo¶æ #%d zosta³a skasowana."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Losowa wiadomo¶æ #%d nie zosta³a znaleziona!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Losowe wiadomo¶ci:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4851,296 +4520,307 @@ msgstr ""
 "Napisz: /msg %s REGISTER <has³o> <email>,\n"
 "aby znowu zacz±æ rejestracje."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "RESTRICTED"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Dostêp do kana³u %s nie jest ju¿ ograniczony."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Dostêp do kana³u %s jest teraz ograniczony."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASAET nick PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nick opcja parametry"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nick AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SASET nick HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nick KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nick KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nick LANGUAGE numer"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nick NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nick PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nick SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SASET nick HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY kana³ tekst"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | kana³} tre¶æ"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF tre¶æ wiadomo¶ci"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "Komenda SENDPASS nie dzia³a, bo has³a s± szyfrowane."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limit"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <maska-hosta>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET (kana³ | bot) opcja ustawienie"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET nick-bota NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET nick-bota PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET kana³ opcja parametry"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET kana³ DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET kana³ DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET kana³ FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET kana³ GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET kana³ KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET kana³ OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET kana³ NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET kana³ OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET kana³ PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET kana³ PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET kana³ RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET kana³ SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET kana³ SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET kana³ SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET kana³ SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET kana³ SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET kana³ TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET kana³ XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET opcja parametry"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET opcja ustawienie"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numer"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [kana³] limit"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [nick | kana³] {limit | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <maska-hosta>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "Lista SNLINE jest pusta."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5148,342 +4828,328 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista SOP kana³u %s:\n"
-"  Nr   Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "Lista SQLINE jest pusta."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF tre¶æ wiadomo¶ci"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS kana³ item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Kana³ %s nie jest zarejestrowany"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s nie jest online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND kana³ powód"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND kana³ [powód]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND kana³ powód"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick powód"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nowy-nick"
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "Lista SZLINE jest pusta."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "SECURE"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "SECUREFOUNDER"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "SECUREOPS"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Status w³a¶ciciela kana³u %s nie bêdzie ju¿ chroniony."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Status w³a¶ciciela kana³u %s bêdzie teraz chroniony."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Status operatora kana³u %s nie bêdzie ju¿ chroniony."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Status operatora kana³u %s bêdzie teraz chroniony."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Opcja bezpieczeñstwa dla kana³u %s zosta³a wy³±czona."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Opcja bezpieczeñstwa dla kana³u %s zosta³a w³±czona."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Opcja bezpieczeñstwa dla %s zosta³a wy³±czona."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Opcja bezpieczeñstwa dla %s zosta³a w³±czona."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "SECURE"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Serwerów      : %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "Serwisy s± w trybie defcon, spróbuj ponownie pó¼niej."
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Serwisy s± teraz w systemie DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Serwisy s± teraz w trybie wygasania."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Serwisy nie s± ju¿ w trybie wygasania."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Serwisy s± teraz w trybie tylko-do-odczytu."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Serwisy s± teraz w trybie odczyt-zapis."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Serwisy s± teraz w trybie debugowania (poziom %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Serwisy s± teraz w trybie debugowania."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Serwisy nie s± ju¿ w trybie debugowania."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Serwisy zosta³y skonfigurowane tak, aby nie wysy³aæ poczty."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Lista ignorowanych przez serwisy:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Serwisy nie mog± zmieniaæ trybów. Czy serwery s± dobrze skonfigurowane?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Serwisy nie mog± zmieniaæ trybów. Czy U-linie serwerów s± dobrze "
 "skonfigurowane?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Serwisy dzia³aj± %d dzieñ, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Serwisy dzia³aj± %d dni, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Serwisy dzia³aj± %d godzinê i %d minutê."
+msgid "Services up %d hours, %d minutes"
+msgstr "Serwisy dzia³aj± %d godzin i %d minut(y)."
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Serwisy dzia³aj± %d godzinê i %d minut(y)."
+msgid "Services up %d minutes, %d seconds"
+msgstr "Serwisy dzia³aj± %d minut(y) i %d sekund(y)."
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Serwisy dzia³aj± %d godzin(y) i %d minutê."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Serwisy dzia³aj± %d godzin i %d minut(y)."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Serwisy dzia³aj± %d minutê i %d sekundê."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Serwisy dzia³aj± %d minutê i %d sekund(y)."
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Serwisy dzia³aj± %d minut(y) i %d sekundê."
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Serwisy dzia³aj± %d minut(y) i %d sekund(y)."
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/os_stats.cpp:163
+#, c-format
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
+
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr ""
 "Serwisy nie bêd± ju¿ automatycznie nadawa³y uprawnieñ dla u¿ytkownika %s."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Serwisy bêd± automatycznie nadawa³y uprawnienia dla u¿ytkownika %s."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Serwisy bêd± teraz wysy³aæ do %s wiadomo¶ci."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Serwisy bêd± teraz wysy³aæ do %s powiadomienia."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Plik konfiguracyjny serwisów zosta³ prze³adowany."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Serwisy w³a¶nie zwolni³y twojego nicka."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Limit sesji dla %s zmieniono na %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Limitowanie sesji jest wy³±czone."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sesji         : %6d rekordów, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sesje   Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Nieznane ustawienie %s.\n"
 "Napisz /msg %s HELP LEVELS DESC, aby uzyskaæ listê dostêpnych mo¿liwo¶ci."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "Parametrem opcji DEBUG musi byæ ON, OFF albo liczba dodatnia."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Parametrem opcji IGNORE musi byæ ON albo OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Parametrem opcji NOEXPIRE musi byæ ON albo OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "Parametrem opcji READONLY musi byæ ON albo OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 "Parametrem dla opcji SuperAdmin musi byæ ON lub OFF (musi byæ w³±czona w "
 "pliku konfiguracyjnym)"
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Podpisywanie komendy KICK na kanale %s zosta³o wy³±czone."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5492,209 +5158,181 @@ msgstr ""
 "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone, ale\n"
 "bêdzie zale¿a³o od poziomu dostêpu jaki posiada u¿ytkownik."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "SIGNKICK"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Komenda RSEND nie jest dostêpna w tej sieci."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Przydzielanie botów jest tymczasowo wy³±czone."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "B³±d, nie uda³o siê utworzyæ bota."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Modyfikacja botów jest tymczasowo wy³±czona."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Konfigurowanie bota jest tymczasowo wy³±czone."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Modyfikacja listy AOP jest tymczasowo wy³±czona."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Modyfikacja listy HOP jest tymczasowo wy³±czona."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Modyfikacja listy SOP jest tymczasowo wy³±czona."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Modyfikacja listy VOP jest tymczasowo wy³±czona."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Modyfikacja listy dostêpu jest tymczasowo wy³±czona."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Modyfikacja listy AKICK jest tymczasowo wy³±czona."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Modyfikacja listy zakazanych s³ów jest tymczasowo wy³±czona."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Usuwanie kana³ów jest tymczasowo wy³±czone."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "Modyfikacja ustawieñ kana³u jest tymczasowo wy³±czona."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Rejestracja kana³ów jest tymczasowo wy³±czona."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Zmiana has³a dla %s nie powiod³a siê."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Grupowanie nie powiod³o siê."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Identyfikacja nie powiod³a siê."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Konfigurowanie kopów jest tymczasowo wy³±czone."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Ustawianie opcji wiadomo¶ci jest tymczasowo wy³±czone."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Wysy³anie wiadomo¶ci jest tymczasowo wy³±czone."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Usuwanie nicków jest tymczasowo wy³±czone."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Grupowanie nicków jest tymczasowo wy³±czone."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "Modyfikacja ustawieñ nicka jest tymczasowo wy³±czona."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Rejestracja nicków jest tymczasowo wy³±czona."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Rejestracja nicka nie powiod³a siê."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Mo¿esz mieæ tylko %d wpisów na listach xOP."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Mo¿esz mieæ tylko %d wpisów na kana³owej li¶cie dostêpu."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Mo¿esz mieæ tylko %d wpisy(ów) na li¶cie dostêpu."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Mo¿esz mieæ tylko %d wpisów na kana³owej li¶cie dostêpu."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Mo¿esz mieæ jedynie %d wpisów w li¶cie AKICK."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "B³±d, mo¿esz mieæ tylko %d wpisów na li¶cie zakazanych s³ów."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "B³±d, ju¿ masz przekroczony limit %d kana³ów."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "B³±d, ju¿ masz osi±gniêty limit %d kana³ów."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statystyki zosta³y zresetowane."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status zaktualizowany (wiadomo¶ci, vhosty, flagi)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Przestañ floodowaæ!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Nie powtarzaj siê!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Zastêpcê dla kana³u %s usuniêto."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Zastêpcê dla kana³u %s zmieniono na %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "Opcja SuperAdmin nie jest w³±czona w pliku konfiguracyjnym."
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "SYMBIOSIS"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Opcja SYMBIOSIS zosta³a wy³±czona na kanale %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Opcja SYMBIOSIS zosta³a w³±czona na kanale %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sk³adnia: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5721,7 +5359,7 @@ msgstr ""
 "2: ban w postaci *!*@host\n"
 "3: ban w postaci *!*ident@*.domena"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5733,27 +5371,12 @@ msgstr ""
 "\n"
 "Ustawia opis kana³u widoczny po wydaniu polecenia LIST oraz INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Sk³adnia: %s kana³ ENTRYMSG [tre¶æ]\n"
-"\n"
-"Ustawia tekst powiadomienia wysy³anego poprzez /notice\n"
-"do u¿ytkowników wchodz±cych na kana³. Komenda wywo³ana\n"
-"bez parametru usuwa wcze¶niej ustawion± wiadomo¶æ."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Sk³adnia: %s kana³ FOUNDER nick\n"
@@ -5761,7 +5384,7 @@ msgstr ""
 "Zmienia w³a¶ciciela kana³u.\n"
 "Nowy nick musi byæ zarejestrowany."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5779,78 +5402,7 @@ msgstr ""
 "temat za ka¿dym razem, gdy na kana³ bêdzie wchodziæ\n"
 "pierwsza osoba."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Sk³adnia: %s kana³ MLOCK flagi\n"
-"\n"
-"Ustawia blokadê flag kana³owych. %S pozwala na \n"
-"definiowanie, które flag kana³owe maj± byæ zawsze \n"
-"w³±czone, wy³±czone lub ustawiane dowolnie przez \n"
-"operatorów kana³u.\n"
-"\n"
-"Sk³adnia polecenia jest identyczna jak w komendzie \n"
-"/MODE, tzn. flagi poprzedzone znakiem+ \n"
-"zostan± za³o¿one na kana³, natomiast poprzedzone \n"
-"znakiem - bêd± zdejmowane z kana³u. W odró¿nieniu \n"
-"od komendy /MODE, ka¿de u¿ycie SET MLOCK, \n"
-"usunie wszystkie wcze¶niej zdefiniowane mody!\n"
-"\n"
-"UWAGA: W przypadku ustawiania klucza dostêpu do \n"
-"kana³u (drugi przyk³ad poni¿ej), powinna równie¿ \n"
-"zostaæ aktywowana opcja RESTRICTED (zobacz \n"
-"HELP SET RESTRICTED), w przeciwnym wypadku, \n"
-"u¿ytkownik wchodz±cy na pusty kana³, bêdzie móg³ \n"
-"odczytaæ za³o¿ony klucz!\n"
-"\n"
-"Przyk³ady:\n"
-"\n"
-"    SET #kana³ MLOCK +nt-iklps\n"
-"        Wymusza w³±czenie flag n oraz t, wy³±czenie flag\n"
-"        i, k, l, p, s; flaga m nie jest zmieniana.\n"
-"\n"
-"    SET #kana³ MLOCK +knst-ilmp my-key\n"
-"        Wymusza w³±czenie flag k, n, s, oraz t, wy³±czenie\n"
-"        i, l, m, oraz p. Wymusza tak¿e ustawienie klucza \n"
-"        na warto¶æ \"my-key\".\n"
-"\n"
-"    SET #kana³ MLOCK +\n"
-"        Wy³±cza blokowanie flag - mog± byæ zmieniane dowolnie."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5867,7 +5419,7 @@ msgstr ""
 "informowa³ u¿ytkowników przebywaj±cych na kanale,\n"
 "kiedy zostanie u¿yta komenda OP lub DEOP."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5885,7 +5437,7 @@ msgstr ""
 "który ma poziom uprawnieñ wy¿szy lub równy\n"
 "korzystaj±c z poleceñ serwisu %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5930,7 +5482,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5945,13 +5497,13 @@ msgstr ""
 "umieszczany na listach wy¶wietlanych komend±:\n"
 "/msg %S LIST"
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Sk³adnia: %s kana³ RESTRICTED {ON | OFF}\n"
@@ -5961,7 +5513,7 @@ msgstr ""
 "li¶cie dostêpu bêd± mog³y przebywaæ na kanale. Pozostali\n"
 "u¿ytkownicy bêd± banowani, a nastêpnie usuwani z kana³u."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5980,7 +5532,7 @@ msgstr ""
 "otrzymywaæ od serwisu %S uprawnienia\n"
 "wynikaj±ce z wpisów na li¶cie dostêpu."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6001,52 +5553,12 @@ msgstr ""
 "w³a¶ciciela oraz zastêpcy bêd± dostêpne tylko\n"
 "dla jednego u¿ytkownika."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Sk³adnia: %s kana³ SECUREOPS {ON | OFF}\n"
-"\n"
-"W³±cza lub wy³±cza opcjê SECUREOPS dla kana³u.\n"
-"Kiedy ta opcja jest w³±czona u¿ytkownicy bez wpisu\n"
-"na li¶cie dostêpu kana³u (ACCESS LIST) nie bêd±\n"
-"mogli posiadaæ statusu operatora."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Sk³adnia: %s kana³ SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"W³±cza lub wy³±cza podpisywanie komend kick.\n"
-"W³±czenie tej opcji powoduje dodawanie nicka osoby \n"
-"wydaj±cej polecenie do uzasadnienia kicka.\n"
-"\n"
-"Je¶li poziomy dostêpu by³y konfigurowane z u¿yciem LEVEL\n"
-"osoby maj±ce poziom wiêkszy lub równy SIGNKICK nie bêd±\n"
-"podpisywane. Aby uzyskaæ wiêcej informacji wpisz:\n"
-"/msg %S HELP LEVELS"
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6062,24 +5574,7 @@ msgstr ""
 "Je¿eli spadkobierca jest w³a¶cicielem zbyt du¿ej\n"
 "liczby kana³ów (%d) to kana³ zostanie odrejestrowany."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sk³adnia: %s kana³ TOPICLOCK {ON | OFF}\n"
-"\n"
-"W³±cza lub wy³±cza opcjê blokowania tematu kana³u.\n"
-"\n"
-"Je¶li ta opcja jest w³±czona, %S pozwoli na\n"
-"zmianê tematu tylko poprzez wydanie komendy TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6125,10 +5620,11 @@ msgstr ""
 "kana³u zosta³y wcze¶niej zmodyfikowane przy pomocy \n"
 "polecenia LEVELS."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6141,18 +5637,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6213,7 +5713,7 @@ msgstr ""
 "\n"
 "Polecenie ACCESS CLEAR usuwa wszystkie wpisy z listy."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6261,7 +5761,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Wy¶wietla aktualn± listê dostêpu."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6273,12 +5773,18 @@ msgstr ""
 "Sprawia, ¿e bot u¿yje komendy akcji (/me) przy\n"
 "wypowiadaniu podanego tekstu na kanale."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6299,15 +5805,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6376,7 +5873,8 @@ msgstr ""
 "\n"
 "Polecenie AKICK CLEAR usuwa wszystkie wpisy z listy."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6384,21 +5882,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6458,7 +5956,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR usuwa wszystkie wpisy z listy AKILL."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6494,7 +5992,7 @@ msgstr ""
 "        10. lub wy¿szy.\n"
 "Kana³y z opcj± NOEXPIRE bêd± oznaczone wykrzyknikiem."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6513,10 +6011,11 @@ msgstr ""
 "Parametr nick jest przeznaczony tylko dla\n"
 "administratorów serwisów."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6594,7 +6093,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %S HELP SET XOP"
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6606,7 +6105,8 @@ msgstr ""
 "\n"
 "Przydziela bota o wskazanym nicku na kana³."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6638,7 +6138,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6674,7 +6174,7 @@ msgstr ""
 "\n"
 "BADWORDS CLEAR usuwa wszystkie wpisy z listy."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6690,7 +6190,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6732,7 +6232,7 @@ msgstr ""
 "bota bêdzie u¿ywany przez innego u¿ytkownika,\n"
 "zostanie on wtedy skillowany."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6742,7 +6242,7 @@ msgstr ""
 "\n"
 "Listuje dostêpne w sieci boty."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6754,7 +6254,7 @@ msgstr ""
 "Wycofuje ostatni± wys³an± wiadomo¶æ,\n"
 "o ile nie zosta³a przeczytana."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6767,7 +6267,7 @@ msgstr ""
 "Na listê zostaj± dodane prawdziwe adresy (ident@host),\n"
 "po czym AKILL zostaje wykonany."
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6788,7 +6288,7 @@ msgstr ""
 "wskazany u¿ytkownik. Dodanie parametru SECRET ogranicza\n"
 "listê do kana³ów z flag± +s lub +p."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6800,63 +6300,32 @@ msgstr ""
 "Sprawdza, czy ostatnia wiadomo¶æ wys³ana do nick\n"
 "zosta³a przeczytana. Ta komenda nie dzia³a dla kana³ów."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Sk³adnia: CLEAR kana³ opcje\n"
-"\n"
-"Umo¿liwia kompleksowe usuniêcie niektórych ustawieñ na\n"
-"kanale poprzez %S. Dostêpne opcje:\n"
+"Sk³adnia: DEOWNER kana³\n"
 "\n"
-"   MODES     Usuwa tryby z kana³u\n"
-"   BANS      Usuwa bany z kana³u\n"
-"   EXCEPTS   Usuwa wyj±tki od banów z kana³u\n"
-"   INVITES   Usuwa zaproszenia z kana³u\n"
-"   OPS       Odbiera wszystkim status operatora\n"
-"   HOPS      Odbiera wszystkim status pó³-operatora\n"
-"   VOICES    Odbiera wszystkim prawo g³osu\n"
-"   USERS     Usuwa u¿ytkowników z kana³u\n"
+"Odbiera uprawnienia w³a¶ciciela kana³u.\n"
 "\n"
-"Standardowo ta komenda jest dostêpna dla w³a¶ciciela kana³u."
+"Standardowo ta komenda jest dostêpna tylko dla w³a¶ciciela kana³u."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Sk³adnia: CLEARMODES kana³ [ALL]\n"
-"\n"
-"Usuwa wszystkie binarne flagi (i,k,l,m,n,p,s,t) oraz bany\n"
-"ustawione na wskazanym kanale. Dodanie parametru ALL\n"
-"odbiera tak¿e uprawnienia (+o, +v)."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6880,7 +6349,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6893,12 +6362,14 @@ msgstr ""
 "zdefiniowanych ograniczeñ dla serwisów podczas\n"
 "próby ataku na sieæ."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6916,7 +6387,7 @@ msgstr ""
 "posiadaj±ce 4. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6926,11 +6397,12 @@ msgstr ""
 "\n"
 "Usuwa vhosta przypisanego do wskazanego nicka."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -6962,22 +6434,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Kasuje wiadomo¶ci od numeru 2 do 5 oraz od 7 do 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Sk³adnia: DELALL <nick>.\n"
 "\n"
 "Usuwa wszystkie vhosty grupy, do której nale¿y wskazany nick."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -6992,29 +6467,37 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sk³adnia: DEOWNER kana³\n"
+"Sk³adnia: DEOP kana³ [nick]\n"
 "\n"
-"Odbiera uprawnienia w³a¶ciciela kana³u.\n"
+"Odbiera status operatora wskazanemu u¿ytkownikowi.\n"
+"Je¶li nie zostanie podany nick operacja bêdzie\n"
+"przeprowadzona na osobie wydaj±cej t± komendê.\n"
 "\n"
-"Standardowo ta komenda jest dostêpna tylko dla w³a¶ciciela kana³u."
+"Standardowo ta komenda jest dostêpna dla u¿ytkowników\n"
+"wpisanych na listê AOP lub posiadaj±cych poziom\n"
+"dostêpu 5 lub wy¿szy."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Sk³adnia: DEPROTECT kana³ [nick]\n"
 "\n"
@@ -7026,12 +6509,14 @@ msgstr ""
 "wpisanych na listê SOP lub posiadaj±cych przynajmniej\n"
 "10. poziom dostêpu."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7049,7 +6534,7 @@ msgstr ""
 "posiadaj±ce 3. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7061,7 +6546,7 @@ msgstr ""
 "Usuwa podany kana³. Komenda mo¿e zostaæ u¿yta\n"
 "jedynie przez w³a¶ciciela kana³u."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7073,9 +6558,10 @@ msgstr ""
 "Usuwa wskazany kana³. Tylko administratorzy serwisów\n"
 "mog± usun±æ kana³, którego nie s± w³a¶cicielami."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7083,6 +6569,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7099,7 +6589,7 @@ msgstr ""
 "has³a. Aby uzyskaæ wiêcej informacji wpisz:\n"
 "/msg %S HELP IDENTIFY"
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7122,7 +6612,7 @@ msgstr ""
 "w jego grupie bez specjalnych uprawnieñ. Usuwanie\n"
 "dowolnego nicka jest ograniczone do administratorów."
 
-#: language.cpp:2395
+#: modules/core/os_session.cpp:456
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -7134,7 +6624,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7156,7 +6646,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7195,7 +6685,7 @@ msgstr ""
 "pierwszego wyj±tku o pasuj±cej masce. Du¿a lista wyj±tków i\n"
 "zbyt ogólne maski powoduj± pogorszenie wydajno¶ci serwisów."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7211,7 +6701,7 @@ msgstr ""
 "\n"
 "W niektórych sieciach wymagane jest podanie powodu."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7227,7 +6717,7 @@ msgstr ""
 "\n"
 "W niektórych sieciach wymagane jest podanie powodu."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7241,7 +6731,7 @@ msgstr ""
 "Uwaga: nie mo¿na u¿ywaæ symboli wieloznacznych (* lub ?).\n"
 "Ka¿dy przypadek u¿ycia tej komendy jest logowany."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7251,16 +6741,15 @@ msgstr ""
 "\n"
 "Zwraca has³o wstêpu do wskazanego kana³u."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Sk³adnia: GETPASS nick\n"
 "\n"
@@ -7270,14 +6759,14 @@ msgstr ""
 "\n"
 "Ta komenda jest niedostêpna kiedy has³a s± szyfrowane."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7305,7 +6794,7 @@ msgstr ""
 "   do której nale¿y wskazany nick,\n"
 "3. podasz prawid³owe has³o do nicka."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7315,7 +6804,7 @@ msgstr ""
 "\n"
 "Listuje wszystkie nicki z Twojej grupy."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7334,7 +6823,7 @@ msgstr ""
 "Administratorzy serwisów mog± jako parametr podaæ\n"
 "nick osoby, której nicki chc± sprawdziæ."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7347,7 +6836,7 @@ msgstr ""
 "Pozwala administratorom wysy³aæ wiadomo¶ci do wszystkich\n"
 "u¿ytkowników. Wiadomo¶æ zostanie wys³ana z nicka %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7360,7 +6849,7 @@ msgstr ""
 "To polecenie pozwala ustawiæ vhost bie¿±cego nicka\n"
 "dla wszystkich nicków w grupie."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7426,16 +6915,17 @@ msgstr ""
 "\n"
 "Uwaga: wszystkie nicki w grupie maj± to samo has³o."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Sk³adnia: HALFOP kana³ [nick]\n"
 "\n"
@@ -7449,10 +6939,11 @@ msgstr ""
 "posiadaj±ce 4. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7526,7 +7017,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %S HELP SET XOP"
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7544,9 +7035,20 @@ msgstr ""
 "przed ich u¿yciem. Has³em jest to samo has³o, \n"
 "którego u¿yto przy komendzie REGISTER."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7576,7 +7078,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7597,7 +7099,7 @@ msgstr ""
 "Domy¶lnie parametr ALL jest dostêpny dla osób z\n"
 "uprawnieniami w³a¶ciciela kana³u."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7614,7 +7116,7 @@ msgstr ""
 "parametrem ALL otrzyma wszystkie mo¿liwe\n"
 "informacje - nawet je¶li zosta³y one ukryte."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7630,7 +7132,7 @@ msgstr ""
 "wiadomo¶ci. Je¶li podany zostanie kana³ wy¶wietlone \n"
 "informacje bêd± odnosi³y siê do wskazanego kana³u."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7656,7 +7158,7 @@ msgstr ""
 "Administratorzy serwisów mog± obejrzeæ informacje \n"
 "dot. dowolnych u¿ytkowników podaj±c parametr nick."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7676,12 +7178,12 @@ msgstr ""
 "pokazane informacje takie jak: data utworzenia,\n"
 "ilo¶æ obs³ugiwanych kana³ów itp."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7694,14 +7196,15 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7716,7 +7219,7 @@ msgstr ""
 "powód bêdzie on wy¶wietlany w polu informacyjnym serwera,\n"
 "w przeciwnym wypadku wy¶wietlane bêdzie \"Juped by <nick>\"."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7733,7 +7236,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7758,7 +7261,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7781,12 +7284,14 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7821,14 +7326,14 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji wpisz:\n"
 "/msg %S HELP KICK opcja"
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7842,7 +7347,25 @@ msgstr ""
 "\n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7859,7 +7382,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7887,7 +7410,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7904,7 +7427,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7928,7 +7451,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7944,7 +7467,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7961,7 +7484,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7978,8 +7501,8 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -7989,17 +7512,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8031,7 +7554,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8059,7 +7582,7 @@ msgstr ""
 "Maksymalna d³ugo¶æ listy wy¶wietlanej operatorowi podczas\n"
 "jednego zapytania jest okre¶lona przez ustawienie NSListMax."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8075,7 +7598,7 @@ msgstr ""
 "Poprzedzenie znakiem '#' powoduje podawanie zakresu,\n"
 "nazwy kana³ów powinny byæ pisane bez znaku '#'."
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8116,7 +7639,8 @@ msgstr ""
 "        Lista wszystkich nicków z mask± domeny\n"
 "        ircnet.pl"
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8144,7 +7668,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Sk³adnia: LIST wzorzec [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8175,13 +7698,14 @@ msgstr ""
 "        Lista wszystkich nicków z mask± domeny\n"
 "        ircnet.pl"
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8196,11 +7720,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Wy¶wietli wiadomo¶ci od numeru 2 do 5 oraz od 7 do 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "LOGONNEWS ADD tekst"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8228,11 +7752,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "LOGONNEWS DEL {numer | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8247,7 +7771,7 @@ msgstr ""
 "tego polecenia nie bêdziesz rozpoznawany jako\n"
 "w³a¶ciciel nicka."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8270,12 +7794,13 @@ msgstr ""
 "REVALIDATE powoduje informowanie przez serwisy\n"
 "u¿ytkownika o potrzebie ponownej identyfikacji."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Sk³adnia: MODE kana³ flagi\n"
@@ -8283,7 +7808,34 @@ msgstr ""
 "Pozwala operatorom serwisów na zmianê flag dla wskazanego\n"
 "kana³u. Parametry s± identyczne jak dla komendy /MODE."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8293,7 +7845,7 @@ msgstr ""
 "\n"
 "To polecenie wy¶wietla informacje na temat za³adowanego modu³u"
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8303,7 +7855,7 @@ msgstr ""
 "\n"
 "Listuje za³adowane modu³y."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8314,7 +7866,7 @@ msgstr ""
 "\n"
 "To polecenie ³aduje wskazany modu³ z katalogu modu³ów."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8325,7 +7877,7 @@ msgstr ""
 "\n"
 "To polecenie ³aduje wskazany modu³ z katalogu modu³ów."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8336,10 +7888,12 @@ msgstr ""
 "\n"
 "To polecenie wy³aduje wskazany modu³."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8362,7 +7916,7 @@ msgstr ""
 "\n"
 "Uwaga: Serwisy nie sprawdzaj± warto¶ci serwer."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8375,7 +7929,7 @@ msgstr ""
 "Po u¿yciu tego polecenia ka¿dy bêdzie móg³ sprawdziæ Twój\n"
 "prawdziwy adres u¿ywaj±c polecenia /WHOIS."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8390,7 +7944,7 @@ msgstr ""
 "flagami. Flagi powinny byæ poprzedzone znakami \"+\" lub \"-\". \n"
 "Aby usun±æ wszystkie flagi wystarczy podaæ \"-\"."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8403,12 +7957,14 @@ msgstr ""
 "Po u¿yciu tego polecenia Twój prawdziwy adres zostanie \n"
 "zast±piony vhostem."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8423,11 +7979,11 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "OPERNEWS ADD tekst"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8455,30 +8011,39 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "OPERNEWS DEL {numer | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sk³adnia: OWNER kana³\n"
+"Sk³adnia: OP kana³ [nick]\n"
 "\n"
-"Nadaje uprawnienia w³a¶ciciela kana³u.\n"
+"Nadaje status operatora wskazanemu u¿ytkownikowi.\n"
+"Je¶li nie zostanie podany nick operacja bêdzie\n"
+"przeprowadzona na osobie wydaj±cej t± komendê.\n"
 "\n"
-"Standardowo ta komenda jest dostêpna tylko dla w³a¶ciciela kana³u."
+"Standardowo ta komenda jest dostêpna dla u¿ytkowników\n"
+"wpisanych na listê AOP lub posiadaj±cych poziom\n"
+"dostêpu 5 lub wy¿szy."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8493,10 +8058,11 @@ msgstr ""
 "wpisanych na listê SOP lub posiadaj±cych przynajmniej\n"
 "10. poziom dostêpu."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8569,7 +8135,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8587,11 +8153,11 @@ msgstr ""
 "przechowuj± w pamiêci. Do normalnego zakoñczenia pracy\n"
 "serwisów nale¿y u¿yæ polecenia SHUTDOWN."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "RANDOMNEWS ADD tekst"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8613,18 +8179,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "RANDOMNEWS DEL {numer | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8641,7 +8208,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Wy¶wietli wiadomo¶ci od numeru 2 do 5 oraz od 7 do 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8687,7 +8254,8 @@ msgstr ""
 "   do której nale¿y wskazany nick,\n"
 "3. podasz prawid³owe has³o do nicka."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8698,7 +8266,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8729,24 +8297,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8794,15 +8363,15 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji napisz: \n"
 "/msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8824,7 +8393,7 @@ msgstr ""
 "   do której nale¿y wskazany nick,\n"
 "3. podasz prawid³owe has³o do nicka."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8838,7 +8407,7 @@ msgstr ""
 "Niektóre opcje wci±¿ wymagaj± restartu serwisów\n"
 "(zmiana nicków serwisów, aktywacja limitów sesji itd.)."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8850,7 +8419,7 @@ msgstr ""
 "To polecenie powoduje ponowne wys³anie kodu autoryzuj±cego\n"
 "na adres e-mail u¿ytkownika, który wydaje polecenie."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8861,7 +8430,7 @@ msgstr ""
 "Sends a code key to the nickname with the instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8872,13 +8441,14 @@ msgstr ""
 "\n"
 "Wymusza zapisanie baz, a nastêpnie restartuje serwisy."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8894,31 +8464,33 @@ msgstr ""
 "automatyczne potwierdzenie odbioru zostanie wys³ane\n"
 "do nadawcy."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Sk³adnia: SASET nick opcja parametry.\n"
 "\n"
 "Ustawia ró¿ne opcje nicka wskazanemu u¿ytkownikowi.\n"
 "Dostêpne opcje to:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Sk³adnia: SASET nick AUTOOP {ON | OFF}\n"
 "\n"
 "W³±cza lub wy³±cza automatyczne nadawanie uprawnieñ\n"
 "wskazanemu u¿ytkownikowi przy wchodzeniu na kana³."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8931,7 +8503,7 @@ msgstr ""
 "u¿ytkownika na now±. Nazwa MUSI byæ jednym z nicków\n"
 "nale¿±cych do tej grupy."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8941,7 +8513,7 @@ msgstr ""
 "\n"
 "Przypisuje wskazanemu u¿ytkownikowi adres e-mail."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8957,7 +8529,7 @@ msgstr ""
 "oraz u¿ytkownik ma odpowiedni poziom dostêpu to\n"
 "wtedy ta wiadomo¶æ bêdzie wysy³ana na kana³ przez bota."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8980,22 +8552,22 @@ msgstr ""
 "dostêpu do serwisów. Drugi argument okre¶la, czy dana \n"
 "informacja bêdzie pokazywana (OFF), czy ukrywana (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sk³adnia: SASET nick KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9015,7 +8587,7 @@ msgstr ""
 "nale¿y stosowaæ z rozwag±). Administrator sieci \n"
 "mo¿e wy³±czyæ korzystanie z IMMED."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9032,7 +8604,7 @@ msgstr ""
 "listy obs³ugiwanych jêzyków, która jest dostêpna\n"
 "po wydaniu polecenia /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9047,7 +8619,7 @@ msgstr ""
 "w³±czona serwisy bêd± wysy³aæ wiadomo¶ci prywatne\n"
 "w przeciwnym wypadku bêd± wysy³aæ powiadomienia."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9059,17 +8631,18 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne usuniêcie nicka,\n"
 "je¶li nie bêdzie on u¿ywany."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Sk³adnia: SASET nick PASSWORD nowe-has³o\n"
 "\n"
 "Zmienia has³o wskazanemu u¿ytkownikowi."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9088,16 +8661,16 @@ msgstr ""
 "Jednak ka¿dy, kto zna nick mo¿e uzyskaæ o nim\n"
 "informacje u¿ywaj±c polecenia INFO."
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9111,7 +8684,7 @@ msgstr ""
 "znajduje siê na li¶cie %S nie skilluje\n"
 "u¿ytkownika niezale¿nie od ustawienia opcji KILL."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9121,13 +8694,14 @@ msgstr ""
 "\n"
 "Wypowiada przez bota podany tekst na kanale."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sk³adnia: SEND {nick | kana³} tre¶æ-wiadomo¶ci\n"
@@ -9137,16 +8711,18 @@ msgstr ""
 "wiadomo¶ci (o ile ma w³±czone powiadomienia).\n"
 "Adresatem musi byæ zarejestrowany nick lub kana³."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Sk³adnia: SENDALL tre¶æ-wiadomo¶ci\n"
 "\n"
 "Wysy³a wiadomo¶æ do wszystkich zarejestrowanych u¿ytkowników."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9165,7 +8741,7 @@ msgstr ""
 "Ta komenda w niektórych sieciach mo¿e byæ dostêpna\n"
 "jedynie dla osób z uprawnieniami IRC operatora."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9197,7 +8773,7 @@ msgstr ""
 "Wiêcej informacji na temat ograniczania liczby sesji\n"
 "znajduje siê w pomocy polecenia EXCEPTION."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9212,7 +8788,66 @@ msgstr ""
 "polecenia SET <nick> <ident>@<vhost>\n"
 "mo¿na zmieniaæ tak¿e ident."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Sk³adnia: %s kana³ SECUREOPS {ON | OFF}\n"
+"\n"
+"W³±cza lub wy³±cza opcjê SECUREOPS dla kana³u.\n"
+"Kiedy ta opcja jest w³±czona u¿ytkownicy bez wpisu\n"
+"na li¶cie dostêpu kana³u (ACCESS LIST) nie bêd±\n"
+"mogli posiadaæ statusu operatora."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Sk³adnia: %s kana³ SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"W³±cza lub wy³±cza podpisywanie komend kick.\n"
+"W³±czenie tej opcji powoduje dodawanie nicka osoby \n"
+"wydaj±cej polecenie do uzasadnienia kicka.\n"
+"\n"
+"Je¶li poziomy dostêpu by³y konfigurowane z u¿yciem LEVEL\n"
+"osoby maj±ce poziom wiêkszy lub równy SIGNKICK nie bêd±\n"
+"podpisywane. Aby uzyskaæ wiêcej informacji wpisz:\n"
+"/msg %S HELP LEVELS"
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sk³adnia: %s kana³ TOPICLOCK {ON | OFF}\n"
+"\n"
+"W³±cza lub wy³±cza opcjê blokowania tematu kana³u.\n"
+"\n"
+"Je¶li ta opcja jest w³±czona, %S pozwoli na\n"
+"zmianê tematu tylko poprzez wydanie komendy TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9223,6 +8858,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9245,7 +8881,7 @@ msgstr ""
 "Informacja: dostêp do tej komendy jest kontrolowany\n"
 "przez poziom SET."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9257,7 +8893,7 @@ msgstr ""
 "wskazanego bota dla u¿ytkowników nie bêd±cych\n"
 "IRC operatorami."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9273,7 +8909,7 @@ msgstr ""
 "\n"
 "Dostêpne opcje:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9287,7 +8923,7 @@ msgstr ""
 "posiadaj±cych status operatora nawet je¶li nie\n"
 "przys³uguje im poziom dostêpu NOKICK."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9301,7 +8937,7 @@ msgstr ""
 "posiadaj±cych prawo g³osu nawet je¶li nie\n"
 "przys³uguje im poziom dostêpu NOKICK."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9330,7 +8966,7 @@ msgstr ""
 "do wydania danego polecenia (np. aby u¿ywac !deop\n"
 "trzeba posiadaæ poziom dostêpu OPDEOP)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9345,7 +8981,22 @@ msgstr ""
 "ich w³asn± wiadomo¶ci± powitaln±. U¿ytkownik zostanie\n"
 "powitany, je¶li bêdzie mia³ odpowiedni poziom dostêpu."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9359,7 +9010,7 @@ msgstr ""
 "nie wolno przypisywaæ botów. Je¶li w danej chwili\n"
 "bot jest przypisany do kana³u, zostanie usuniêty."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9371,7 +9022,7 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne usuniêcie kana³u,\n"
 "je¶li nie bêdzie on u¿ywany."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9388,25 +9039,17 @@ msgstr ""
 "które wykonywa³ %s (np. opowanie) bêd±\n"
 "wykonywane przez bota."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Sk³adnia: SET opcja parametry\n"
-"\n"
-"Ustawia ró¿ne opcje nicka. Dostêpne opcje to:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9423,7 +9066,17 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %S HELP SET opcja"
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Sk³adnia: SET opcja parametry\n"
+"\n"
+"Ustawia ró¿ne opcje nicka. Dostêpne opcje to:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9433,7 +9086,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Sk³adnia: SET opcja warto¶æ\n"
@@ -9448,7 +9100,7 @@ msgstr ""
 "    IGNORE     W³±cza lub wy³±cza tryb ignorowania\n"
 "    LIST       Listuje aktualne ustawienia"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9460,29 +9112,7 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne nadawanie uprawnieñ\n"
 "przy wchodzeniu na kana³."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Sk³adnia: SET DEBUG {ON | OFF | poziom}\n"
-"\n"
-"W³±cza lub wy³±cza tryb debugowania. W tym trybie wszystkie\n"
-"dane wysy³ane do serwisów i przez nie oraz wiele innych\n"
-"komunikatów zapisywane s± do loga. Je¶li zostanie podany \n"
-"numer poziomu poziom tryb debugowania jest aktywowany\n"
-"ze wskazanym poziomem.\n"
-"\n"
-"Ta opcja ma taki sam efekt jak argument linii poleceñ -debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9495,7 +9125,7 @@ msgstr ""
 "serwisach na now±. Nazwa MUSI byæ jednym z nicków\n"
 "nale¿±cych do Twojej grupy."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9509,7 +9139,7 @@ msgstr ""
 "bêdzie wy¶wietlany przy opisie Twojego nicka\n"
 "dostêpnym przy u¿yciu komendy INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9525,7 +9155,7 @@ msgstr ""
 "u¿ytkowników oraz masz odpowiedni poziom dostêpu to\n"
 "wtedy ta wiadomo¶æ bêdzie wysy³ana na kana³ przez bota."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9548,18 +9178,8 @@ msgstr ""
 "dostêpu do serwisów. Drugi argument okre¶la, czy dana \n"
 "informacja bêdzie pokazywana (OFF), czy ukrywana (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Sk³adnia: SET IGNORE {ON | OFF}\n"
-"\n"
-"To ustawienie pozwala w³±czaæ/wy³±czaæ system ignorowania."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9573,7 +9193,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sk³adnia: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9593,7 +9213,7 @@ msgstr ""
 "nale¿y stosowaæ z rozwag±). Administrator sieci \n"
 "mo¿e wy³±czyæ korzystanie z IMMED."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9610,7 +9230,7 @@ msgstr ""
 "wys³an± przez Ciebie komendê). Numer mo¿e byæ \n"
 "wybrany z poni¿szej listy obs³ugiwanych jêzyków:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9627,7 +9247,7 @@ msgstr ""
 "przyjmowanie wiadomo¶ci zostanie wy³±czone. Limit \n"
 "nie mo¿e byæ wiêkszy ni¿ %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9667,7 +9287,7 @@ msgstr ""
 "limitu, a tak¿e ustaliæ jego warto¶ci powy¿ej %d \n"
 "oraz u¿yæ parametru HARD."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9677,7 +9297,7 @@ msgstr ""
 "\n"
 "Listuje aktualne ustawienia serwisu %S."
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9692,10 +9312,11 @@ msgstr ""
 "wysy³aæ wiadomo¶ci prywatne (query), w przeciwnym\n"
 "wypadku bêd± wysy³aæ powiadomienia (notice)."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9709,7 +9330,7 @@ msgstr ""
 "\n"
 "Ta opcja ma taki sam efekt jak argument linii poleceñ -noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9748,7 +9369,7 @@ msgstr ""
 "\n"
 "Opcja ON jest kombinacj± opcji LOGON oraz NEW."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9759,7 +9380,7 @@ msgstr ""
 "\n"
 "Zmienia Twoje has³o do nicka."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9778,7 +9399,7 @@ msgstr ""
 "Jednak ka¿dy, kto zna nick mo¿e uzyskaæ o nim\n"
 "informacje u¿ywaj±c polecenia INFO."
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9807,16 +9428,16 @@ msgstr ""
 "\n"
 "Ta opcja ma taki sam efekt jak argument linii poleceñ -readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9830,7 +9451,7 @@ msgstr ""
 "znajduje siê na li¶cie %S nie skilluje\n"
 "u¿ytkownika niezale¿nie od ustawienia opcji KILL."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9847,14 +9468,15 @@ msgstr ""
 "Ta opcja powinna byæ u¿ywana tylko wtedy, kiedy\n"
 "jest taka potrzeba. Nale¿y j± pó¼niej wy³±czyæ."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Sk³adnia: SETALL <nick> <vhost>.\n"
@@ -9867,7 +9489,7 @@ msgstr ""
 "UWAGA: to polecenie nie spowoduje zmiany vhosta\n"
 "dla nicka, który pó¼niej zostanie dodany do grupy."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9877,10 +9499,11 @@ msgstr ""
 "\n"
 "Wymusza zapisanie baz danych, a nastêpnie wy³±cza serwisy."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -9916,7 +9539,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -9962,10 +9585,11 @@ msgstr ""
 "\n"
 "SNLINE CLEAR usuwa wszystkie wpisy z listy."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10040,7 +9664,8 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %S HELP SET XOP"
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10056,31 +9681,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10127,21 +9752,7 @@ msgstr ""
 "datê wyga¶niêcia, maskê oraz powód.\n"
 "SQLINE CLEAR usuwa wszystkie wpisy z listy."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10151,9 +9762,11 @@ msgstr ""
 "\n"
 "Wy¶wietla nicki obs³ugi serwisów, poziom i status online."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Sk³adnia: STAFF tre¶æ-wiadomo¶ci\n"
@@ -10163,7 +9776,7 @@ msgstr ""
 "wpisani jednocze¶nie na kilka list otrzymaj±\n"
 "wiadomo¶ci kilka razy."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10210,7 +9823,7 @@ msgstr ""
 "\n"
 "Parametr ALL wy¶wietla wszystkie dostêpne informacje."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10236,12 +9849,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR informacja-o-b³êdzie"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10280,7 +9894,7 @@ msgstr ""
 "Reszta bêdzie ignorowana. Je¶li nie zostanie podany\n"
 "¿aden nick zostanie zwrócony twój status."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10298,7 +9912,7 @@ msgstr ""
 "\n"
 "W niektórych sieciach wymagane jest podanie powodu."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10308,7 +9922,8 @@ msgstr ""
 "\n"
 "Zmienia nick wskazanemu u¿ytkownikowi."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10321,31 +9936,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10388,7 +10003,7 @@ msgstr ""
 "datê wyga¶niêcia, maskê oraz powód.\n"
 "SZLINE CLEAR usuwa wszystkie wpisy z listy."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10411,7 +10026,7 @@ msgstr ""
 "\n"
 "Standardowo ta komenda jest dostêpna dla w³a¶ciciela kana³u."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10425,7 +10040,7 @@ msgstr ""
 "innym u¿ytkownikom. Parametry s± identyczne jak\n"
 "dla komendy /MODE."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10441,7 +10056,7 @@ msgstr ""
 "Bêdzie mo¿na go ponownie przydzieliæ w ka¿dej\n"
 "chwili, bez potrzeby ponownego konfigurowania."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10461,7 +10076,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10478,7 +10093,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10490,7 +10105,7 @@ msgstr ""
 "Uwalnia zawieszony kana³. Wszystkie dane i ustawienia\n"
 "s± odtworzone sprzed zawieszenia."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10501,7 +10116,7 @@ msgstr ""
 "\n"
 "Wymusza natychmiastowy zapis baz danych na dysku."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10523,12 +10138,14 @@ msgstr ""
 "listuje u¿ytkowników przebywaj±cych na wskazanym kanale.\n"
 "Dodanie parametru INVISIBLE listuje tylko u¿ytkowników z flag± +i."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10546,10 +10163,11 @@ msgstr ""
 "posiadaj±ce 3. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10624,7 +10242,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %S HELP SET XOP"
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10640,7 +10258,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10649,7 +10267,7 @@ msgstr ""
 "\n"
 "Zawiesza nick uniemo¿liwiaj±c identyfikacjê."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10658,7 +10276,7 @@ msgstr ""
 "\n"
 "Uwalnia zawieszony nick."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10671,143 +10289,144 @@ msgstr ""
 "wiadomo¶ci, ustawia odpowiednie uprawnienia na kana³ach,\n"
 "aktualizuje vhosta oraz flagi u¿ytkownika."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC kana³ [temat]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "Opcja IMMED nie jest jest dostêpna w tej sieci."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "Lista AKILL zosta³a wyczyszczona."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Defcon jest teraz na poziomie: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "Adres e-mail osoby %s bêdzie ukrywany w informacjach %s."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "Adres e-mail osoby %s bêdzie pokazywany w informacjach %s."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "Lista SNLINE zosta³a wyczyszczona."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "Lista SQLINE zosta³a wyczyszczona."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "Lista SZLINE zosta³a wyczyszczona."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Kana³ %s nie posiada klucza."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Poni¿ej znajduje siê lista wszystkich dostêpnych uprawnieñ.\n"
 "Poziomy dla AUTODEOP oraz NOJOIN to poziomy maksymalne,\n"
 "reszta uprawnieñ ma poziomy minimalne."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Host %s aktualnie posiada %d sesji z limitem %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "Ostatnia wiadomo¶æ wys³ana do %s (w %s) zosta³a przeczytana."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Ostatnia wys³ana przez Ciebie wiadomo¶æ\n"
 "do %s (w %s) jest wci±¿ nieprzeczytana."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "Ostatnia wiadomo¶æ QUIT osoby %s bêdzie ukrywana w informacjach %s."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "Ostatnia wiadomo¶æ QUIT osoby %s bêdzie pokazywana w informacjach %s."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr "Ostatnia maska ident@host osoby %s bêdzie ukrywana w informacjach %s."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "Ostatnia maska ident@host osoby %s bêdzie pokazywana w informacjach %s."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Limit wiadomo¶ci dla %s nie mo¿e byæ zmieniany."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "Nowa nazwa dla %s MUSI byæ jednym z nicków w grupie!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Now± nazw± jest %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Nick %s zostaje zmieniony na %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr "Status dostêpu do serwisów osoby %s bêdzie ukrywany w informacjach %s."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Status dostêpu do serwisów osoby %s bêdzie pokazywany w informacjach %s."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Jest %d wiadomo¶ci dla kana³u %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10815,7 +10434,7 @@ msgstr ""
 "Obecnie nie ma ¿adnych botów dostêpnych.\n"
 "Popro¶ administratora serwisów o dodanie."
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10825,12 +10444,12 @@ msgstr ""
 "Napisz /msg %s HELP GLIST i /msg %s HELP DROP,\n"
 "aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Jest %d wiadomo¶æ dla kana³u %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10838,28 +10457,28 @@ msgstr ""
 "Jest nowa wiadomo¶æ dla kana³u %s.\n"
 "Napisz /msg %s READ %s %d aby j± przeczytaæ."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Nie ma ¿adnych botów przydzielonych do %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Nie ma wiadomo¶ci powitalnych."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Nie ma wiadomo¶ci dla operatorów."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Nie ma losowych wiadomo¶ci."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Twój nick nie ma ustawionego adresu e-mail."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10874,38 +10493,34 @@ msgstr ""
 "   PRIVATE   Zastrzega przypisywanie bota tylko dla IRC\n"
 "             Operatorów"
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Ten kana³ zosta³ zablokowany."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ten kana³ zosta³ zarejestrowany z %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Ten kana³ zosta³ zawieszony."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Ten kana³ nie mo¿e byæ u¿ywany."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Ten kana³ nie wyga¶nie."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "Ten modu³ nie mo¿e zostaæ wy³adowany."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 msgstr "Ten nick zosta³ ju¿ zarejestrowany. Sprawd¼ swoj± pocztê."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -10913,7 +10528,7 @@ msgstr ""
 "Ten nick czeka na e-mail z kodem weryfikacyjnym przed zakoñczeniem "
 "rejestracji."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -10921,20 +10536,20 @@ msgstr ""
 "Ten nick jest zarejestrowany. Je¶li to Twój nick,\n"
 "wpisz: /msg %s IDENTIFY has³o"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Ten nick zosta³ zarejestrowany i nie mo¿esz go u¿ywaæ."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Ten nick jest obecnie zawieszony"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Ten nick jest obecnie zawieszony, powód: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -10944,15 +10559,15 @@ msgstr ""
 "Zidentyfikuj siê pisz±c: /msg %s IDENTIFY has³o\n"
 "je¶li nick nale¿y do Ciebie, w przeciwnym razie zmieñ go."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Ten nick nie mo¿e byæ u¿ywany. Wybierz inny nick."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Ten nick nie wyga¶nie."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10960,44 +10575,35 @@ msgstr ""
 "Aby wyszukaæ kana³y o nazwach zaczynaj±cych siê znakiem #\n"
 "nale¿y ten znak pomin±æ (anope zamiast #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "TOPICLOCK"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "KEEPTOPIC"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Blokada tematu na kanale %s zosta³a wy³±czona."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Blokada tematu na kanale %s zosta³a w³±czona."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Temat kana³u %s nie bêdzie ju¿ utrzymywany."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Temat kana³u %s bêdzie teraz utrzymywany."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Wy³±cz CAPS LOCKa!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Napisz /msg %S HELP polecenie aby uzyskaæ pomoc\n"
@@ -11006,7 +10612,7 @@ msgstr ""
 "    poziom dostêpu na kanale mo¿e czytaæ wiadomo¶ci,\n"
 "    ale mo¿na to zmieniæ komend± LEVELS serwisu %s."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11015,7 +10621,7 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %S HELP SASET opcja"
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11023,7 +10629,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11031,7 +10637,7 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %S HELP SET opcja"
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11040,129 +10646,110 @@ msgstr ""
 "Napisz /msg %S SET EMAIL e-mail, aby ustawiæ adres e-mail.\n"
 "Twoja prywatno¶æ bêdzie uszanowana - nie bêdzie podawany osobom trzecim,"
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr ""
 "Napisz /msg %s LIST NEW,\n"
 "aby zobaczyæ listê nowych wiadomo¶ci."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Napisz /msg %s READ %d aby przeczytaæ."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Napisz /msg %s READ LAST aby przeczytaæ."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick flagi"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN kana³"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN kana³ [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND kana³"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nick"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Nie mo¿na za³adowaæ modu³u %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Nie mo¿na wy³adowaæ modu³u %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Nieznana opcja komendy SASET %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Nieznana opcja komendy SET %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Nieznana opcja STATS %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Nieznana komenda %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Nieznana komenda %s. Napisz \"/msg %s HELP\" aby uzyskaæ pomoc."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Nieznany flaga %c zostaje zignorowana."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Nieznana opcja %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Nieznana opcja %s.\n"
-"Napisz /msg %S HELP KICK, aby uzyskaæ wiêcej informacji."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Nieznana opcja %s.\n"
 "Napisz /msg %S HELP SET, aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Aktualizacja baz danych."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab  : %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Pod³±czony do: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "Nie znaleziono %s w bazie serwisu NickServ."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "U¿ytkownicy   : %6d rekordów, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11171,11 +10758,11 @@ msgstr ""
 "Napisz /msg %s RELEASE %s, je¶li nie chcesz czekaæ %s sekund na jego "
 "automatyczne zwolnienie."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "U¿ytkownik posiada wyj±tek na kanale."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11183,66 +10770,77 @@ msgstr ""
 "Lista u¿ytkowników:\n"
 "Nick                 Maska"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #kana³ [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "DONTKICKVOICES"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Lista VOP kana³u %s:\n"
-"  Nr   Nick"
+"Uwaga: Maksymalny limit wiadomo¶ci (%d) zosta³ osi±gniêty.\n"
+"Nie bêdziesz otrzymywaæ nowych wiadomo¶ci je¶li kilku nie usuniesz."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "DONTKICKVOICES"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Uwaga: Osi±gniêto ju¿ limit wiadomo¶ci (%d).\n"
+"Nie bêdziesz otrzymywaæ nowych wiadomo¶ci dopóki\n"
+"nie usuniesz kilku starych."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Uwa¿aj co piszesz!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Nale¿ysz ju¿ do grupy %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Jeste¶ ju¿ zidentyfikowany(a)."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "Przebywasz ju¿ na kanale %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Nie jeste¶ ju¿ d³u¿ej super-administratorem."
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Nie masz pozwolenia, aby przebywaæ na tym kanale."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Nie mo¿esz zmieniaæ swojego limitu wiadomo¶ci."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Jeste¶ teraz super-administratorem."
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Jeste¶ teraz IRC operatorem."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11250,36 +10848,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Nale¿ysz teraz do grupy %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "Nie mo¿na wykluczyæ samych serwisów lub uplinka serwisów."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "Nie mo¿esz wysy³aæ wiadomo¶ci z potwierdzeniem odbioru do siebie!"
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Nie mo¿esz usun±æ samego siebie!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Nie mogê wylogowaæ %s, bo to administrator serwisów."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Nie mo¿esz odzyskaæ nicka, którego w³a¶nie u¿ywasz!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11289,7 +10892,7 @@ msgstr ""
 "Musisz u¿yæ poleceñ VOP, AOP lub SOP.\n"
 "Napisz /msg %s HELP komenda, aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11299,7 +10902,7 @@ msgstr ""
 "Musisz u¿yæ poleceñ VOP, HOP, AOP lub SOP.\n"
 "Napisz /msg %s HELP komenda, aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11307,66 +10910,66 @@ msgstr ""
 "Nie mo¿esz u¿yæ tej komendy. U¿yj komendy ACCESS.\n"
 "Napisz /msg %s HELP ACCESS, aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Nie mo¿esz ustawiæ limitu wiadomo¶ci dla %s wiêkszego ni¿ %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Nie mo¿esz ustawiæ swojego limitu wiadomo¶ci wiêkszego ni¿ %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Nie mo¿esz usuwaæ adresu e-mail w tej sieci."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Aktualnie masz %d wiadomo¶ci, z czego %d jest nieprzeczytanych."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Aktualnie masz %d wiadomo¶ci, w tym jedn± nieprzeczytan±."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Aktualnie masz %d wiadomo¶ci."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Aktualnie masz %d nieprzeczytanych wiadomo¶ci."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Aktualnie masz jedn± wiadomo¶æ i jest ona nieprzeczytana."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Aktualnie masz jedn± wiadomo¶æ."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Aktualnie nie masz wiadomo¶ci."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Masz %d nowe(ych) wiadomo¶ci."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Masz jedn± now± wiadomo¶æ."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11374,33 +10977,37 @@ msgstr ""
 "Nasz now± wiadomo¶æ od %s.\n"
 "Napisz /msg %s READ %d aby j± przeczytaæ."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Zosta³e¶ zaproszony do %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Ban na kanale %s zosta³ zdjêty."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Nie masz limitu wiadomo¶ci, które mo¿esz trzymaæ."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Nie masz wiadomo¶ci."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Nie masz nowych wiadomo¶ci."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Musisz podaæ prawid³ow± liczbê dla czasu."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11408,25 +11015,17 @@ msgstr ""
 "Musisz najpierw przydzieliæ bota do kana³u.\n"
 "Napisz /msg %S HELP ASSIGN, aby uzyskaæ wiêcej informacji."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Aby zarejestrowaæ kana³ musisz byæ jego operatorem."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Musisz byæ po³±czony(a) d³u¿ej ni¿ %d sekund(y), aby móc zarejestrowaæ nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Musisz za³o¿yæ +i równie¿, aby móc za³o¿yæ +K."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Musisz za³o¿yæ +l zanim za³o¿ysz +L."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11435,77 +11034,97 @@ msgstr ""
 "Teraz ustaw adres e-mail dla Twojego nicka.\n"
 "Gdy zapomnisz has³a, zostanie ono wys³ane na e-mail."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Bêdziesz powiadomienie informacje o nowych wiadomo¶ciach\n"
 "podczas logowania i w momencie ich nadej¶cia."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr ""
 "Bêdziesz otrzymywaæ powiadomienie o nowych wiadomo¶ciach podczas logowania."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Bêdziesz otrzymywaæ powiadomienie o nowych wiadomo¶ciach."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Nie bêdziesz ju¿ d³u¿ej odbieraæ wiadomo¶ci."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr ""
 "Powiadomienie o nowych wiadomo¶ciach nie bêd± wysy³ane na adres e-mail."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Nie bêdziesz otrzymywaæ informacji o nowych wiadomo¶ciach."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "Powiadomienie o nowych wiadomo¶ciach bêd± wysy³ane na adres e-mail."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
 msgstr ""
 "Twoje IRCD nie obs³uguje vIdentów, je¶li nie jest to prawda zg³o¶ b³±d."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Twoja lista dostêpu jest pusta."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "Lista AKICK kana³u %s jest pusta."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Lista ignorowanych jest pusta."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Twój limit wiadomo¶ci zosta³ wy³±czony."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Twój limit wiadomo¶ci zosta³ zmieniony na %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Twój limit wiadomo¶ci wynosi %d i nie mo¿e byæ zmieniony."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Twój limit wiadomo¶ci wynosi %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Twój limit wiadomo¶ci wynosi 0, nie bêdziesz otrzymywaæ nowych."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11513,179 +11132,730 @@ msgstr ""
 "Twój limit wiadomo¶ci wynosi 0, nie bêdziesz odbieraæ nowych i nie mo¿esz "
 "zmieniæ tego limitu."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Twój nick zosta³ pomy¶lnie wylogowany."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Twój nick jest ju¿ zarejestrowany. Napisz najpierw: /msg %s DROP"
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Twój nick nie jest zarejestrowany."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Twój nick zosta³ odrejestrowany."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Twój nick zosta³ zmieniony na %s."
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Twój kod rejestracyjny zosta³ ponownie wys³any na %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Twoje has³o do nicka to %s"
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Twoje has³o jest za d³ugie. Spróbuj ponownie z krótszym has³em."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Twój vhost %s jest teraz aktywny."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Twój vhost %s@%s jest teraz aktywny."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr ""
 "Twój vhost zosta³ usuniêty i zosta³o w³±czone normalne ukrywanie hosta."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Wiadomo¶æ powitalna - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Wiadomo¶æ dla operatorów - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Losowa wiadomo¶æ - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "wy³±czone"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "nie wygasa"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "w³±czone"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "wygasa przy nastêpnej aktualizacji baz"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "wygasa za %d dzieñ"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "wygasa za %d dni"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "wygasa za %d godzinê i %d minutê"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "wygasa za %d godzinê i %d minut(y)"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "wygasa za %d godzinê i %d minut(y)"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "wygasa za %d godzin(y) i %d minut(y)"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "wygasa za %d minutê"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "wygasa za %d minut(y)"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Vhost dla %s zosta³ usuniêty."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Vhost dla %s zosta³ zmieniony na %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Vhost dla %s zosta³ zmieniony na %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Vhosty dla grupy %s zosta³y zmienione na %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Vhosty dla grupy %s zosta³y zmienione na %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "Vhosty dla grupy %s zosta³y usuniête."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "XOP"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "System list xOP na kanale %s zosta³ wy³±czony."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "System list xOP na kanale %s zosta³ w³±czony."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "System xOP nie jest dostêpny."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | kana³} tre¶æ"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s dodano do listy AOP kana³u %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s dodano do listy HOP kana³u %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s dodano do listy SOP kana³u %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s dodano do listy VOP kana³u %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s usuniêto z listy HOP kana³u %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s usuniêto z listy SOP kana³u %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s usuniêto z listy VOP kana³u %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s przeniesiono do listy HOP kana³u %s."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s przeniesiono do listy SOP kana³u %s."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s przeniesiono do listy VOP kana³u %s."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s nie znaleziono na li¶cie HOP kana³u %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s nie znaleziono na li¶cie SOP kana³u %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s nie znaleziono na li¶cie VOP kana³u %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Ustawia jêzyk w którym serwisy bêd±\n"
+#~ "               wysy³a³y komunikaty"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Zapobiega wy¶wietlaniu nicka po wydaniu\n"
+#~ "               polecenia: /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d dni"
+
+#~ msgid "%d hours"
+#~ msgstr "%d godzin(y)"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minut(y)"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d sekund(y)"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "Lista HOP kana³u %s jest pusta."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "Lista SOP kana³u %s jest pusta."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "Lista VOP kana³u %s jest pusta."
+
+#~ msgid "1 day"
+#~ msgstr "1 dzieñ"
+
+#~ msgid "1 hour"
+#~ msgstr "1 godzina"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuta"
+
+#~ msgid "1 second"
+#~ msgstr "1 sekunda"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Pozwala u¿ywaæ komendy CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Pozwala u¿ywaæ komend HALFOP i DEHALFOP na innych osobach"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Lista HOP kana³u %s zosta³a wyczyszczona."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Lista SOP kana³u %s zosta³a wyczyszczona."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Lista VOP kana³u %s zosta³a wyczyszczona."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "Usuniêto %d wpisów(y) z listy HOP kana³u %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "Usuniêto %d wpisów(y) z listy SOP kana³u %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "Usuniêto %d wpisów(y) z listy VOP kana³u %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "Usuniêto 1 wpis z listy HOP kana³u %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "Usuniêto 1 wpis z listy SOP kana³u %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "Usuniêto 1 wpis z listy VOP kana³u %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Adres e-mail zosta³ usuniêty."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Koniec listy u¿ytkowników."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Wiadomo¶æ powitalna kana³u %s zosta³a usuniêta."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Nie ma bota na kanale %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "      Powitanie: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Lista dostêpu dla %s jest pusta."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Lista dostêpu dla %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Wiadomo¶æ powitalna kana³u %s zosta³a zmieniona."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Komendy fantasy na kanale %s zosta³y wy³±czone."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Witanie u¿ytkowników na kanale %s zosta³o wy³±czone."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista HOP kana³u %s:\n"
+#~ "  Nr   Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "B³±d wewnêtrzny - nie mogê obs³u¿yæ ¿±dania."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Wiadomo¶æ powitalna #%d zosta³a skasowana."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nick %s nie jest zarejestrowany."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Rejestracja nicka %s"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Has³o do nicka %s"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Nie znaleziono znaku # na pocz±tku nazwy kana³u."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Opcja NOBOT zosta³a wy³±czona na kanale %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Nie znaleziono wpisów w li¶cie HOP kana³u %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Nie znaleziono wpisów w li¶cie SOP kana³u %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Nie znaleziono wpisów w li¶cie VOP kana³u %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Brak wpisu (#%d) na li¶cie AOP kana³u %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Brak wpisu (#%d) na li¶cie HOP kana³u %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Brak wpisu (#%d) na li¶cie SOP kana³u %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Brak wpisu (#%d) na li¶cie VOP kana³u %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Opcja OPNOTICE dla kana³u %s zosta³a wy³±czona."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Opcja PEACE dla kana³u %s zosta³a wy³±czona."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr "Odczekaj %d sekund(y) przed ponownym u¿yciem komendy SEND."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Opcja PRIVATE bota %s zosta³a wy³±czona."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Opcja PRIVATE dla kana³u %s zosta³a wy³±czona."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Opcja prywatno¶ci dla %s zosta³a wy³±czona."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Ochrona dla %s jest teraz wy³±czona."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Natychmiastowa ochrona jest teraz w³±czona."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER has³o [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Dostêp do kana³u %s nie jest ju¿ ograniczony."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista SOP kana³u %s:\n"
+#~ "  Nr   Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Kana³ %s nie jest zarejestrowany"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND kana³ [powód]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Status w³a¶ciciela kana³u %s nie bêdzie ju¿ chroniony."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Status operatora kana³u %s nie bêdzie ju¿ chroniony."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Opcja bezpieczeñstwa dla kana³u %s zosta³a wy³±czona."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Opcja bezpieczeñstwa dla %s zosta³a wy³±czona."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Serwisy nie mog± zmieniaæ trybów. Czy serwery s± dobrze skonfigurowane?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Serwisy dzia³aj± %d dzieñ, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Serwisy dzia³aj± %d godzinê i %d minutê."
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Serwisy dzia³aj± %d godzinê i %d minut(y)."
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Serwisy dzia³aj± %d godzin(y) i %d minutê."
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Serwisy dzia³aj± %d minutê i %d sekundê."
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Serwisy dzia³aj± %d minutê i %d sekund(y)."
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Serwisy dzia³aj± %d minut(y) i %d sekundê."
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Podpisywanie komendy KICK na kanale %s zosta³o wy³±czone."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr "Modyfikacja listy HOP jest tymczasowo wy³±czona."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr "Modyfikacja listy SOP jest tymczasowo wy³±czona."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr "Modyfikacja listy VOP jest tymczasowo wy³±czona."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr "Mo¿esz mieæ tylko %d wpisów na listach xOP."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Opcja SYMBIOSIS zosta³a wy³±czona na kanale %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "RANDOMNEWS ADD tekst"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR kana³ co"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "OPERNEWS ADD tekst"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Sk³adnia: SET DEBUG {ON | OFF | poziom}\n"
+#~ "\n"
+#~ "W³±cza lub wy³±cza tryb debugowania. W tym trybie wszystkie\n"
+#~ "dane wysy³ane do serwisów i przez nie oraz wiele innych\n"
+#~ "komunikatów zapisywane s± do loga. Je¶li zostanie podany \n"
+#~ "numer poziomu poziom tryb debugowania jest aktywowany\n"
+#~ "ze wskazanym poziomem.\n"
+#~ "\n"
+#~ "Ta opcja ma taki sam efekt jak argument linii poleceñ -debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Sk³adnia: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Wiadomo¶æ powitalna osoby %s zosta³a usuniêta."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "Ten modu³ nie mo¿e zostaæ wy³adowany."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Blokada tematu na kanale %s zosta³a wy³±czona."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Temat kana³u %s nie bêdzie ju¿ utrzymywany."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Nieznana komenda %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Nieznana opcja %s.\n"
+#~ "Napisz /msg %S HELP KICK, aby uzyskaæ wiêcej informacji."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "Nie znaleziono %s w bazie serwisu NickServ."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista VOP kana³u %s:\n"
+#~ "  Nr   Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Bot %s zosta³ usuniêty."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr ""
+#~ "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ do %s zosta³a przeczytana."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr ""
+#~ "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ do %s zosta³a przeczytana."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Ostatnia wiadomo¶æ do %s zosta³a odwo³ana."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Twój vhost %s jest teraz aktywny."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Bot %s zosta³ usuniêty."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "System list xOP na kanale %s zosta³ wy³±czony."
diff --git a/lang/anope.pot b/language/anope.pot
index f10edf948..ca75edec5 100644
--- a/lang/anope.pot
+++ b/language/anope.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr ""
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -30,7 +30,7 @@ msgid ""
 "%R%S HELP command."
 msgstr ""
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -41,424 +41,354 @@ msgid ""
 "%S HELP command."
 msgstr ""
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 
-#: language.cpp:4183
+#: modules/core/ms_help.cpp:33
 #, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
 msgstr ""
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr ""
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr ""
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr ""
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr ""
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr ""
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr ""
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr ""
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr ""
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr ""
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr ""
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr ""
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr ""
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr ""
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr ""
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, c-format
+msgid "%s added to your ignore list."
+msgstr ""
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr ""
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr ""
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr ""
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr ""
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr ""
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr ""
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr ""
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr ""
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr ""
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
 "Name                 Users Modes   Topic"
 msgstr ""
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
-msgstr ""
-
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr ""
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr ""
-
-#: language.cpp:1067
+#: modules/core/cs_xop.cpp:252
 #, c-format
-msgid "%s deleted from %s SOP list."
+msgid "%s deleted from %s %s list."
 msgstr ""
 
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr ""
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr ""
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr ""
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr ""
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr ""
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr ""
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr ""
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr ""
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr ""
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr ""
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr ""
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr ""
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr ""
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr ""
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
 #, c-format
-msgid "%s is not a valid ban type."
+msgid "%s is already on your ignore list."
 msgstr ""
 
-#: language.cpp:1673
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
-msgid "%s is not a valid bot or registered channel."
+msgid "%s is not a valid ban type."
 msgstr ""
 
-#: language.cpp:216
+#: modules/core/bs_info.cpp:217
 #, c-format
-msgid "%s is not a valid e-mail address."
+msgid "%s is not a valid bot or registered channel."
 msgstr ""
 
-#: language.cpp:1180
+#: include/language.h:35
 #, c-format
-msgid "%s is not always active anymore on channel %s."
+msgid "%s is not a valid e-mail address."
 msgstr ""
 
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr ""
 
-#: language.cpp:1178
+#: modules/core/ms_ignore.cpp:69
 #, c-format
-msgid "%s is now always active on channel %s."
+msgid "%s is not on your ignore list."
 msgstr ""
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
 "removed."
 msgstr ""
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
-msgstr ""
-
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr ""
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr ""
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr ""
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr ""
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
-msgstr ""
-
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr ""
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr ""
-
-#: language.cpp:1063
+#: modules/core/cs_xop.cpp:189
 #, c-format
-msgid "%s not found on %s SOP list."
+msgid "%s moved to %s %s list."
 msgstr ""
 
-#: language.cpp:1092
+#: modules/core/cs_xop.cpp:240
 #, c-format
-msgid "%s not found on %s VOP list."
+msgid "%s not found on %s %s list."
 msgstr ""
 
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr ""
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr ""
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr ""
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr ""
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr ""
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr ""
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr ""
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr ""
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr ""
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr ""
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, c-format
+msgid "%s removed from your ignore list."
+msgstr ""
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
 "Nick                 Mask"
 msgstr ""
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr ""
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr ""
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr ""
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr ""
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
 msgstr ""
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr ""
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -481,42 +411,40 @@ msgid ""
 "information."
 msgstr ""
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
+#: src/memoserv.cpp:370
+msgid "[auto-memo] The memo you sent has been viewed."
 msgstr ""
 
-#: language.cpp:1390
+#: src/memoserv.cpp:368
 #, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
+msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr ""
 
-#: language.cpp:1586
-msgid "[auto-memo] The memo you sent has been viewed."
+#: modules/core/ns_register.cpp:350
+msgid "password email"
 msgstr ""
 
-#: language.cpp:1588
-#, c-format
-msgid "[auto-memo] The memo you sent to %s has been viewed."
+#: modules/core/ns_register.cpp:352
+msgid "password [email]"
+msgstr ""
+
+#: modules/core/ns_group.cpp:173
+msgid "target password"
 msgstr ""
 
-#: language.cpp:2650
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -524,7 +452,7 @@ msgid ""
 "and level setting lists for any channel."
 msgstr ""
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -532,1942 +460,1923 @@ msgid ""
 "any nickname (%R%S ACCESS LIST nick)."
 msgstr ""
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr ""
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr ""
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr ""
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr ""
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr ""
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr ""
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr ""
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr ""
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr ""
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr ""
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr ""
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr ""
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr ""
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr ""
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr ""
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr ""
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr ""
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr ""
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, c-format
+msgid "      Fantasy reply : %s"
+msgstr ""
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr ""
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr ""
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr ""
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr ""
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr ""
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr ""
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr ""
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, c-format
+msgid "     AMSG kicker    : %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:168
+#, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr ""
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr ""
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr ""
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr ""
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr ""
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr ""
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr ""
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr ""
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr ""
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr ""
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+msgid "    AJOIN      Manage your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr ""
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr ""
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr ""
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr ""
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr ""
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr ""
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr ""
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr ""
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr ""
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr ""
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr ""
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr ""
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr ""
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr ""
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr ""
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr ""
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
+#: modules/core/cs_clone.cpp:170
+msgid "    CLONE      Copy all settings from one channel to another"
 msgstr ""
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr ""
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr ""
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr ""
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr ""
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr ""
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr ""
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr ""
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr ""
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr ""
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr ""
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr ""
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr ""
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr ""
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr ""
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr ""
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr ""
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr ""
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr ""
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr ""
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 msgstr ""
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr ""
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr ""
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr ""
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr ""
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr ""
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr ""
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr ""
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr ""
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr ""
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr ""
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr ""
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr ""
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr ""
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+msgid "    IGNORE Manage your memo ignore list"
+msgstr ""
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
 msgstr ""
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr ""
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr ""
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr ""
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr ""
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr ""
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr ""
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr ""
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr ""
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr ""
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr ""
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
 msgstr ""
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr ""
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr ""
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr ""
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr ""
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr ""
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
+#: modules/core/os_mode.cpp:61
+msgid "    MODE        Change a channel's modes"
 msgstr ""
 
-#: language.cpp:4345
-msgid "    MODE        Change a channel's modes"
+#: modules/core/cs_mode.cpp:312
+msgid "    MODE       Control modes and mode locks on a channel"
 msgstr ""
 
-#: language.cpp:4410
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr ""
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr ""
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr ""
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 msgid "    MODRELOAD   Reload a module"
 msgstr ""
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr ""
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr ""
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr ""
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr ""
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
 msgstr ""
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr ""
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr ""
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr ""
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr ""
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr ""
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr ""
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr ""
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr ""
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr ""
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr ""
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr ""
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr ""
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
 msgstr ""
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr ""
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr ""
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+msgid "    REGISTER   Register a channel"
+msgstr ""
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr ""
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr ""
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr ""
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr ""
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr ""
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr ""
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr ""
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr ""
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr ""
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr ""
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr ""
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr ""
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr ""
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr ""
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr ""
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr ""
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr ""
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr ""
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr ""
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr ""
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr ""
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr ""
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr ""
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr ""
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr ""
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr ""
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr ""
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr ""
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr ""
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr ""
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr ""
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr ""
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr ""
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr ""
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr ""
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr ""
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr ""
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr ""
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr ""
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr ""
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr ""
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr ""
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr ""
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr ""
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr ""
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr ""
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
 msgstr ""
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr ""
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr ""
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr ""
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr ""
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr ""
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr ""
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr ""
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr ""
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr ""
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr ""
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr ""
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr ""
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr ""
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr ""
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 msgstr ""
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr ""
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr ""
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 msgstr ""
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr ""
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr ""
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr ""
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr ""
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr ""
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr ""
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr ""
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr ""
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr ""
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr ""
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr ""
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr ""
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr ""
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr ""
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr ""
 
-#: language.cpp:2366
+#: include/language.h:91
+#, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr ""
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
 "      %s"
 msgstr ""
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
 "    %s"
 msgstr ""
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-
-#: language.cpp:2370
+#: modules/core/os_session.cpp:117
 #, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
 "    %s"
 msgstr ""
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr ""
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr ""
 
-#: language.cpp:1448
-#, c-format
-msgid "%c%3d  %-16s  %s"
-msgstr ""
-
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr ""
-
-#: language.cpp:1652
-#, c-format
-msgid "%d bots available."
-msgstr ""
-
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr ""
-
-#: language.cpp:232
+#: modules/core/cs_mode.cpp:107
 #, c-format
-msgid "%d hours"
+msgid "%c is not locked on %s."
 msgstr ""
 
-#: language.cpp:236
+#: modules/core/ms_list.cpp:49
 #, c-format
-msgid "%d minutes"
-msgstr ""
-
-#: language.cpp:578
-#, c-format
-msgid "%d nicknames in the group."
+msgid "%c%3d  %-16s  %s"
 msgstr ""
 
-#: language.cpp:240
+#: modules/core/cs_mode.cpp:104
 #, c-format
-msgid "%d seconds"
+msgid "%c%c%s has been unlocked from %s."
 msgstr ""
 
-#: language.cpp:1456
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%s"
+msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: language.cpp:1015
+#: modules/core/cs_mode.cpp:135
 #, c-format
-msgid "%s AOP list is empty."
+msgid "%c%c%s, by %s on %s"
 msgstr ""
 
-#: language.cpp:1044
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%s HOP list is empty."
+msgid "%d Modules loaded."
 msgstr ""
 
-#: language.cpp:986
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%s QOP list is empty."
+msgid "%d bots available."
 msgstr ""
 
-#: language.cpp:1073
+#: modules/core/ns_group.cpp:278
 #, c-format
-msgid "%s SOP list is empty."
+msgid "%d nicknames in the group."
 msgstr ""
 
-#: language.cpp:1102
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
 #, c-format
-msgid "%s VOP list is empty."
+msgid "%s %s list is empty."
 msgstr ""
 
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr ""
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr ""
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr ""
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr ""
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, c-format
+msgid "%s commands"
+msgstr ""
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr ""
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr ""
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr ""
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr ""
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr ""
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr ""
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr ""
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr ""
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr ""
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr ""
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr ""
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr ""
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr ""
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr ""
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr ""
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr ""
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr ""
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr ""
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr ""
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr ""
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr ""
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr ""
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr ""
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr ""
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr ""
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:63
+#, c-format
+msgid "%s was not found on your auto join list."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:69
+#, c-format
+msgid "%s was removed from your auto join list."
+msgstr ""
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr ""
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr ""
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
 "you."
 msgstr ""
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr ""
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr ""
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr ""
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr ""
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr ""
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr ""
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr ""
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr ""
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr ""
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr ""
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr ""
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr ""
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr ""
 
-#: language.cpp:226
-msgid "1 day"
-msgstr ""
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr ""
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr ""
-
-#: language.cpp:238
-msgid "1 second"
-msgstr ""
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr ""
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr ""
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 msgstr ""
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr ""
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr ""
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr ""
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr ""
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:559
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr ""
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr ""
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr ""
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr ""
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr ""
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr ""
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr ""
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr ""
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr ""
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr ""
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr ""
 
-#: language.cpp:1147
+#: include/language.h:81
 #, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr ""
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 msgstr ""
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, c-format
+msgid "Added %s to your auto join list."
+msgstr ""
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr ""
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr ""
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr ""
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 msgstr ""
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr ""
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr ""
 
-#: language.cpp:1308
+#: modules/core/cs_clone.cpp:114
 #, c-format
-msgid "All bans on channel %s have been removed."
+msgid "All access entries from %s have been transferred to %s"
 msgstr ""
 
-#: language.cpp:1310
+#: modules/core/cs_clone.cpp:128
 #, c-format
-msgid "All excepts on channel %s have been removed."
+msgid "All akick entries from %s have been transferred to %s"
 msgstr ""
 
-#: language.cpp:1318
+#: modules/core/cs_clone.cpp:139
 #, c-format
-msgid "All invites on channel %s have been removed."
+msgid "All badword entries from %s have been transferred to %s"
 msgstr ""
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr ""
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr ""
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr ""
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr ""
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr ""
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr ""
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr ""
 
-#: language.cpp:1316
+#: modules/core/cs_clone.cpp:103
+#, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr ""
+
+#: modules/core/cs_clearusers.cpp:47
 #, c-format
-msgid "All users have been kicked from channel %s."
+msgid "All users have been kicked from %s."
 msgstr ""
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr ""
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr ""
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr ""
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr ""
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr ""
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr ""
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr ""
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr ""
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr ""
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr ""
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr ""
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr ""
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr ""
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr ""
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr ""
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr ""
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr ""
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr ""
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr ""
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr ""
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr ""
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr ""
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+msgid "Allowed to use MODE command"
+msgstr ""
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr ""
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr ""
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr ""
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr ""
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr ""
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr ""
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr ""
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr ""
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr ""
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr ""
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr ""
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr ""
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr ""
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr ""
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr ""
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr ""
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr ""
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr ""
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
 "BOT DEL nick"
 msgstr ""
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
 "  Num   Word                           Type"
 msgstr ""
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr ""
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr ""
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr ""
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr ""
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr ""
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr ""
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr ""
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr ""
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr ""
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr ""
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr ""
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr ""
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr ""
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr ""
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr ""
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr ""
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr ""
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr ""
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr ""
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr ""
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2475,24 +2384,24 @@ msgid ""
 "to add or remove a bad word."
 msgstr ""
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
 msgstr ""
 
-#: language.cpp:1822
+#: modules/core/bs_kick.cpp:105
 #, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr ""
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2500,48 +2409,48 @@ msgid ""
 "place a ban after %d kicks for the same user."
 msgstr ""
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
 "%d characters and %d%% of the entire message)."
 msgstr ""
 
-#: language.cpp:1838
+#: modules/core/bs_kick.cpp:186
 #, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr ""
 
-#: language.cpp:1845
+#: modules/core/bs_kick.cpp:234
 #, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr ""
 
-#: language.cpp:1875
+#: modules/core/bs_kick.cpp:367
 #, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr ""
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2549,1049 +2458,911 @@ msgid ""
 "kicks for the same user."
 msgstr ""
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
 "the same thing)."
 msgstr ""
 
-#: language.cpp:1861
+#: modules/core/bs_kick.cpp:307
 #, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr ""
 
-#: language.cpp:1868
+#: modules/core/bs_kick.cpp:337
 #, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr ""
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+msgid "Bot will now kick for amsgs"
+msgstr ""
+
+#: modules/core/bs_kick.cpp:396
+#, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr ""
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr ""
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr ""
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr ""
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr ""
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr ""
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr ""
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr ""
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr ""
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+msgid "Bot won't kick for amsgs anymore."
+msgstr ""
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr ""
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr ""
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr ""
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr ""
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr ""
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr ""
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr ""
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+msgid "CLEARUSERS channel"
 msgstr ""
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
+#: modules/core/cs_clone.cpp:165
+msgid "CLONE channel target"
 msgstr ""
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr ""
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr ""
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr ""
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
 "%s"
 msgstr ""
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr ""
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr ""
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr ""
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr ""
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr ""
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr ""
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr ""
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr ""
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr ""
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr ""
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr ""
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr ""
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
-msgstr ""
-
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr ""
-
-#: language.cpp:991
+#: modules/core/cs_xop.cpp:357
 #, c-format
-msgid "Channel %s QOP list has been cleared."
+msgid "Channel %s %s list has been cleared."
 msgstr ""
 
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr ""
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr ""
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr ""
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr ""
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
 #, c-format
-msgid "Channel %s is not a valid channel."
-msgstr ""
-
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr ""
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
+msgid "Channel %s has no mode locks."
 msgstr ""
 
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr ""
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
+#: include/language.h:70
+#, c-format
+msgid "Channel %s is not a valid channel."
 msgstr ""
 
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr ""
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr ""
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
 msgstr ""
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr ""
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description"
 msgstr ""
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
 msgstr ""
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr ""
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr ""
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr ""
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr ""
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr ""
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr ""
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr ""
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr ""
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr ""
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr ""
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr ""
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr ""
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr ""
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr ""
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr ""
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr ""
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+msgid "DEHALFOP [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr ""
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr ""
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr ""
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+msgid "DEOP [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+msgid "DEOWNER [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+msgid "DEROTECT [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+msgid "DEVOICE [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr ""
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr ""
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr ""
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr ""
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr ""
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr ""
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr ""
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr ""
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr ""
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr ""
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr ""
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr ""
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr ""
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr ""
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr ""
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr ""
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr ""
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr ""
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr ""
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr ""
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr ""
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr ""
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr ""
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr ""
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr ""
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr ""
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr ""
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr ""
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr ""
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
-msgstr ""
-
-#: language.cpp:1042
+#: modules/core/cs_xop.cpp:85
 #, c-format
-msgid "Deleted %d entries from %s HOP list."
+msgid "Deleted %d entries from %s %s list."
 msgstr ""
 
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr ""
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr ""
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr ""
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr ""
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr ""
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr ""
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr ""
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr ""
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr ""
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr ""
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr ""
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr ""
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr ""
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr ""
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr ""
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr ""
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr ""
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr ""
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr ""
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr ""
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr ""
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr ""
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr ""
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr ""
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr ""
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr ""
 
-#: language.cpp:5156
+#: include/language.h:109
+msgid "Disabled"
+msgstr ""
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr ""
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr ""
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr ""
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr ""
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr ""
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr ""
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr ""
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr ""
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr ""
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr ""
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr ""
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr ""
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr ""
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr ""
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr ""
 
-#: language.cpp:262
+#: include/language.h:108
+msgid "Enabled"
+msgstr ""
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr ""
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr ""
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr ""
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr ""
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr ""
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr ""
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr ""
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr ""
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr ""
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr ""
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr ""
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr ""
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr ""
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr ""
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr ""
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr ""
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr ""
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr ""
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr ""
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr ""
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr ""
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr ""
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr ""
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr ""
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr ""
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr ""
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr ""
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr ""
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr ""
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr ""
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr ""
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr ""
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr ""
-
-#: language.cpp:1780
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
 #, c-format
-msgid "Greet mode is now ON on channel %s."
+msgid "Greet mode is now  on channel %s."
 msgstr ""
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+msgid "HALFOP [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr ""
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr ""
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr ""
+
+#: modules/core/os_ignore.cpp:279
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr ""
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr ""
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr ""
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr ""
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr ""
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr ""
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr ""
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr ""
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr ""
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+msgid "Ignore list:"
+msgstr ""
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3601,480 +3372,473 @@ msgid ""
 "on a specific option."
 msgstr ""
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr ""
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr ""
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr ""
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr ""
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr ""
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
 msgstr ""
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
 "zero and less than %d."
 msgstr ""
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr ""
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr ""
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+msgid "KICK channel option {ON|} [settings]"
 msgstr ""
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr ""
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr ""
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr ""
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr ""
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr ""
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr ""
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr ""
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr ""
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr ""
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr ""
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr ""
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr ""
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr ""
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr ""
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr ""
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr ""
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr ""
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr ""
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr ""
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr ""
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr ""
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr ""
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr ""
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr ""
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr ""
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 msgid "MODRELOAD FileName"
 msgstr ""
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr ""
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr ""
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr ""
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr ""
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr ""
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr ""
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr ""
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr ""
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr ""
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr ""
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr ""
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr ""
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr ""
 
-#: language.cpp:542
-msgid "Message mode"
+#: modules/core/ms_list.cpp:134
+msgid "Memos for %s. To read, type: %R%s READ num"
 msgstr ""
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
+#: modules/core/ms_list.cpp:132
+msgid "Memos for %s. To read, type: %R%s READ %s num"
 msgstr ""
 
-#: language.cpp:1314
+#: modules/core/ns_info.cpp:125
+msgid "Message mode"
+msgstr ""
+
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
+msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: language.cpp:872
+#: modules/core/cs_mode.cpp:121
 #, c-format
-msgid "Mode lock on channel %s changed to %s."
+msgid "Mode locks for %s:"
 msgstr ""
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr ""
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr ""
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr ""
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, c-format
 msgid "Module %s reloaded"
 msgstr ""
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr ""
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr ""
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr ""
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr ""
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr ""
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr ""
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr ""
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr ""
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr ""
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
 "%s"
 msgstr ""
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr ""
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr ""
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr ""
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr ""
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr ""
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr ""
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr ""
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr ""
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr ""
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr ""
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr ""
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr ""
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr ""
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr ""
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr ""
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr ""
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr ""
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr ""
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr ""
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr ""
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr ""
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr ""
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr ""
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr ""
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr ""
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
-msgstr ""
-
-#: language.cpp:677
+#: modules/core/ns_register.cpp:57
 #, c-format
-msgid "Nickname Registration (%s)"
+msgid "Nickname %s registered."
 msgstr ""
 
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr ""
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4082,161 +3846,116 @@ msgid ""
 "after %d days if not used."
 msgstr ""
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr ""
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr ""
-
-#: language.cpp:1786
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
 #, c-format
-msgid "No Bot mode is now ON on channel %s."
+msgid "No Bot mode is now  on channel %s."
 msgstr ""
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr ""
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr ""
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr ""
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr ""
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr ""
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
-msgstr ""
-
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr ""
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr ""
-
-#: language.cpp:1065
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
 #, c-format
-msgid "No matching entries on %s SOP list."
+msgid "No matching entries on %s %s list."
 msgstr ""
 
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr ""
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr ""
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr ""
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr ""
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr ""
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr ""
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr ""
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr ""
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr ""
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr ""
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr ""
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr ""
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr ""
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr ""
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr ""
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr ""
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr ""
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr ""
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr ""
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr ""
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4244,1148 +3963,1054 @@ msgid ""
 "for that period of time) will be automatically dropped."
 msgstr ""
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr ""
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr ""
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
+#: modules/core/cs_info.cpp:84
+msgid "OP Notice"
 msgstr ""
 
-#: language.cpp:1262
-msgid "OP Notice"
+#: modules/core/cs_modes.cpp:117
+msgid "OP [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:2513
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 
-#: language.cpp:1364
-msgid "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+msgid "OWNER [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr ""
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr ""
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr ""
-
-#: language.cpp:933
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
 #, c-format
-msgid "Op-notice option for %s is now ON."
+msgid "Op-notice option for %s is now ."
 msgstr ""
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr ""
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr ""
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr ""
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr ""
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr ""
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr ""
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+msgid "PROTECT [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr ""
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr ""
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
 msgstr ""
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr ""
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr ""
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr ""
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr ""
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr ""
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr ""
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr ""
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr ""
-
-#: language.cpp:888
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
 #, c-format
-msgid "Peace option for %s is now ON."
+msgid "Peace option for %s is now ."
 msgstr ""
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr ""
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr ""
 
-#: language.cpp:171
+#: include/language.h:18
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr ""
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr ""
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr ""
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr ""
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr ""
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr ""
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
-msgstr ""
-
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr ""
-
-#: language.cpp:894
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
 #, c-format
-msgid "Private option for %s is now ON."
+msgid "Private mode of bot %s is now ."
 msgstr ""
 
-#: language.cpp:444
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
 #, c-format
-msgid "Private option is now OFF for %s."
+msgid "Private option for %s is now ."
 msgstr ""
 
-#: language.cpp:442
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
 #, c-format
-msgid "Private option is now ON for %s."
+msgid "Private option is now  for %s."
 msgstr ""
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr ""
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr ""
-
-#: language.cpp:428
+#: modules/core/ns_set_kill.cpp:45
 #, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr ""
 
-#: language.cpp:430
+#: modules/core/ns_set_kill.cpp:54
 #, c-format
-msgid "Protection is now ON for %s, with no delay."
+msgid "Protection is now  for %s, with no delay."
 msgstr ""
 
-#: language.cpp:426
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
 #, c-format
-msgid "Protection is now ON for %s."
+msgid "Protection is now  for %s."
 msgstr ""
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
+#: modules/core/os_modinfo.cpp:32
+msgid "Providing command: %%s %s"
 msgstr ""
 
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
-msgstr ""
-
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr ""
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr ""
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr ""
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr ""
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr ""
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr ""
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr ""
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr ""
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr ""
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr ""
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr ""
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
 msgstr ""
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr ""
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr ""
 
-#: language.cpp:914
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
 #, c-format
-msgid "Restricted access option for %s is now OFF."
+msgid "Restricted access option for %s is now ."
 msgstr ""
 
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
-msgstr ""
-
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr ""
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr ""
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr ""
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr ""
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr ""
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr ""
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr ""
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr ""
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr ""
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr ""
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr ""
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr ""
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr ""
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr ""
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr ""
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr ""
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr ""
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr ""
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 msgid "SENDALL memo-text"
 msgstr ""
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr ""
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr ""
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr ""
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr ""
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr ""
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+msgid "SET botname NOBOT {ON|}"
 msgstr ""
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+msgid "SET botname PRIVATE {ON|}"
 msgstr ""
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr ""
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr ""
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr ""
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+msgid "SET channel FANTASY {ON|}"
 msgstr ""
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+msgid "SET channel GREET {ON|}"
 msgstr ""
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr ""
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr ""
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr ""
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr ""
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr ""
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr ""
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr ""
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr ""
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr ""
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr ""
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr ""
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr ""
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr ""
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr ""
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr ""
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr ""
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 msgid "SET LANGUAGE language"
 msgstr ""
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr ""
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr ""
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr ""
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr ""
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr ""
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr ""
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr ""
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
 msgstr ""
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr ""
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr ""
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr ""
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr ""
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr ""
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr ""
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr ""
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel freason"
 msgstr ""
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
 msgstr ""
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr ""
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr ""
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr ""
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr ""
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr ""
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr ""
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr ""
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
-msgstr ""
-
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr ""
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
-msgstr ""
-
-#: language.cpp:920
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
 #, c-format
-msgid "Secure option for %s is now OFF."
+msgid "Secure founder option for %s is now ."
 msgstr ""
 
-#: language.cpp:918
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
 #, c-format
-msgid "Secure option for %s is now ON."
+msgid "Secure ops option for %s is now ."
 msgstr ""
 
-#: language.cpp:438
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
 #, c-format
-msgid "Secure option is now OFF for %s."
+msgid "Secure option for %s is now ."
 msgstr ""
 
-#: language.cpp:436
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
 #, c-format
-msgid "Secure option is now ON for %s."
+msgid "Secure option is now  for %s."
 msgstr ""
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr ""
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr ""
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr ""
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr ""
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr ""
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr ""
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr ""
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr ""
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr ""
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr ""
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr ""
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr ""
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 
-#: language.cpp:1939
+#: modules/core/os_stats.cpp:137
 #, c-format
-msgid "Services up %d day, %02d:%02d"
+msgid "Services up %d days, %02d:%02d"
 msgstr ""
 
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d days, %02d:%02d"
+msgid "Services up %d hours, %d minutes"
 msgstr ""
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minute"
+msgid "Services up %d minutes, %d seconds"
 msgstr ""
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
 msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
 msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
 msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
 msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
 msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
 msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
 msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr ""
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr ""
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr ""
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr ""
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr ""
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr ""
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr ""
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr ""
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr ""
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr ""
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr ""
 
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:59
+msgid "Setting for READONLY must be  or ."
 msgstr ""
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
-msgstr ""
-
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 
-#: language.cpp:929
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
 #, c-format
-msgid "Signed kick option for %s is now OFF."
+msgid "Signed kick option for %s is now ."
 msgstr ""
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 msgstr ""
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr ""
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr ""
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr ""
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr ""
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
-msgstr ""
-
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr ""
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr ""
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr ""
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr ""
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr ""
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr ""
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr ""
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr ""
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr ""
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr ""
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr ""
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr ""
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr ""
 
-#: language.cpp:955
+#: modules/core/cs_xop.cpp:165
 #, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+msgid "Sorry, you can only have %d %s entries on a channel."
 msgstr ""
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr ""
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr ""
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr ""
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr ""
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr ""
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr ""
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr ""
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr ""
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr ""
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr ""
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr ""
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr ""
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr ""
-
-#: language.cpp:1798
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
 #, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+msgid "Symbiosis mode is now  on channel %s."
 msgstr ""
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr ""
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5401,7 +5026,7 @@ msgid ""
 "3: ban in the form *!*user@*.domain"
 msgstr ""
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5410,26 +5035,16 @@ msgid ""
 "the LIST and INFO commands."
 msgstr ""
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-
-#: language.cpp:3435
+#: modules/core/cs_set_founder.cpp:74
 #, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5441,44 +5056,7 @@ msgid ""
 "next time the channel is created."
 msgstr ""
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5489,7 +5067,7 @@ msgid ""
 "in the channel."
 msgstr ""
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5500,7 +5078,7 @@ msgid ""
 "a level superior or equal to his via %S commands."
 msgstr ""
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5525,7 +5103,7 @@ msgid ""
 "set persist on or off."
 msgstr ""
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5534,17 +5112,17 @@ msgid ""
 "include the channel in any lists."
 msgstr ""
 
-#: language.cpp:3534
+#: modules/core/cs_set_restricted.cpp:50
 #, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5556,7 +5134,7 @@ msgid ""
 "as controlled by the access list."
 msgstr ""
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5568,36 +5146,12 @@ msgid ""
 "the access/qop command."
 msgstr ""
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-
-#: language.cpp:3440
+#: modules/core/cs_set_successor.cpp:76
 #, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -5606,18 +5160,7 @@ msgid ""
 "nickname must be a registered one."
 msgstr ""
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5642,10 +5185,10 @@ msgid ""
 "causes no problem though."
 msgstr ""
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -5658,18 +5201,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -5686,7 +5233,7 @@ msgid ""
 "access list."
 msgstr ""
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5713,7 +5260,7 @@ msgid ""
 "        Displays the current access list."
 msgstr ""
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5721,12 +5268,18 @@ msgid ""
 "on the given channel using the given text."
 msgstr ""
 
-#: language.cpp:3871
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
 #, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -5747,15 +5300,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -5776,7 +5320,7 @@ msgid ""
 "akick list."
 msgstr ""
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -5784,21 +5328,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -5822,7 +5366,7 @@ msgid ""
 "AKILL CLEAR clears all entries of the AKILL list."
 msgstr ""
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5843,7 +5387,7 @@ msgid ""
 "prefixed by an exclamation mark."
 msgstr ""
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -5854,10 +5398,10 @@ msgid ""
 "This use limited to Services Operators."
 msgstr ""
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -5896,7 +5440,7 @@ msgid ""
 "the access list and xOP list systems."
 msgstr ""
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -5905,7 +5449,7 @@ msgid ""
 "your needs."
 msgstr ""
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -5937,12 +5481,12 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -5952,7 +5496,7 @@ msgid ""
 "and above on the channel."
 msgstr ""
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -5975,14 +5519,14 @@ msgid ""
 "using the nick, they will be killed."
 msgstr ""
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
 "Lists all available bots on this network."
 msgstr ""
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -5990,7 +5534,7 @@ msgid ""
 "provided it has not been read at the time you use the command."
 msgstr ""
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -5998,7 +5542,7 @@ msgid ""
 "then enforces the AKILL."
 msgstr ""
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6010,7 +5554,7 @@ msgid ""
 "+p mode."
 msgstr ""
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6018,43 +5562,27 @@ msgid ""
 "or not. Note that this does only work with nicks, not with chans."
 msgstr ""
 
-#: language.cpp:4088
+#: modules/core/cs_clearusers.cpp:54
 #, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6069,7 +5597,7 @@ msgid ""
 "force identify you to your nick so you may change your password."
 msgstr ""
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6077,30 +5605,31 @@ msgid ""
 "attack on the network."
 msgstr ""
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
 "and above for self dehalfopping."
 msgstr ""
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
 "database."
 msgstr ""
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -6116,57 +5645,61 @@ msgid ""
 "      Deletes memos numbered 2 through 5 and 7 through 9."
 msgstr ""
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
 msgstr ""
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
 "and above for self devoicing."
 msgstr ""
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6174,7 +5707,7 @@ msgid ""
 "channel founder."
 msgstr ""
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6182,9 +5715,9 @@ msgid ""
 "can drop a channel for which they have not identified."
 msgstr ""
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -6192,12 +5725,16 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
 msgstr ""
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6211,7 +5748,7 @@ msgid ""
 "Services Operators."
 msgstr ""
 
-#: language.cpp:2395
+#: modules/core/os_session.cpp:456
 #, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6223,7 +5760,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -6245,7 +5782,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -6253,7 +5790,7 @@ msgid ""
 "exception masks are likely to degrade services' performance."
 msgstr ""
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6263,7 +5800,7 @@ msgid ""
 "Reason may be required on certain networks."
 msgstr ""
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6273,7 +5810,7 @@ msgid ""
 "On certain networks, reason is required."
 msgstr ""
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6282,33 +5819,30 @@ msgid ""
 "the command and the email it was used on will be logged."
 msgstr ""
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
 "Returns the key of the given channel."
 msgstr ""
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -6319,14 +5853,14 @@ msgid ""
 "the nickname."
 msgstr ""
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
 "Lists all nicks in your group."
 msgstr ""
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6338,7 +5872,7 @@ msgid ""
 "This use limited to Services Operators."
 msgstr ""
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -6347,7 +5881,7 @@ msgid ""
 "network. The message will be sent from the nick %s."
 msgstr ""
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6356,7 +5890,7 @@ msgid ""
 "group."
 msgstr ""
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6390,22 +5924,22 @@ msgid ""
 "Note: all the nicknames of a group have the same password."
 msgstr ""
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -6442,7 +5976,7 @@ msgid ""
 "the access list and xOP list systems."
 msgstr ""
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -6454,9 +5988,19 @@ msgid ""
 "command."
 msgstr ""
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -6472,7 +6016,7 @@ msgid ""
 "Ignores will not be enforced on IRC Operators."
 msgstr ""
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -6483,7 +6027,7 @@ msgid ""
 "be displayed."
 msgstr ""
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -6492,7 +6036,7 @@ msgid ""
 "options."
 msgstr ""
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -6502,7 +6046,7 @@ msgid ""
 "for the given channel."
 msgstr ""
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -6517,7 +6061,7 @@ msgid ""
 "admins."
 msgstr ""
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -6529,32 +6073,32 @@ msgid ""
 "time or number of channels it is on."
 msgstr ""
 
-#: language.cpp:4048
+#: modules/core/cs_invite.cpp:73
 #, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
 msgstr ""
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
 "person who jupitered the server."
 msgstr ""
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -6564,7 +6108,7 @@ msgid ""
 "and above on the channel."
 msgstr ""
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -6578,7 +6122,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -6590,12 +6134,13 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -6614,20 +6159,31 @@ msgid ""
 "level SET."
 msgstr ""
 
-#: language.cpp:4485
+#: modules/core/os_kick.cpp:56
 #, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
 msgstr ""
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -6637,7 +6193,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -6653,7 +6209,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -6663,7 +6219,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -6676,7 +6232,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -6686,7 +6242,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -6696,7 +6252,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -6706,7 +6262,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: language.cpp:3922
+#: modules/core/cs_access.cpp:712
 #, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -6717,17 +6273,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -6735,7 +6291,7 @@ msgid ""
 "set, see HELP LEVELS DESC."
 msgstr ""
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -6749,7 +6305,7 @@ msgid ""
 "number of items to display to a operator at any 1 time."
 msgstr ""
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -6759,7 +6315,7 @@ msgid ""
 "are to be written without '#'."
 msgstr ""
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -6781,7 +6337,7 @@ msgid ""
 "        domain."
 msgstr ""
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -6809,26 +6365,25 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
 msgstr ""
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr ""
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -6845,11 +6400,11 @@ msgid ""
 "LOGONNEWS may only be used by Services Operators."
 msgstr ""
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr ""
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -6859,7 +6414,7 @@ msgid ""
 "yourself."
 msgstr ""
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -6873,30 +6428,57 @@ msgid ""
 "to re-identify. This use limited to Services Operators."
 msgstr ""
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
 "This command lists information about the specified loaded module"
 msgstr ""
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
 "Lists all currently loaded modules."
 msgstr ""
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -6904,14 +6486,14 @@ msgid ""
 "directory."
 msgstr ""
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 msgid ""
 "Syntax: MODRELOAD FileName\n"
 " \n"
 "This command reloads the module named FileName."
 msgstr ""
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -6919,10 +6501,11 @@ msgid ""
 "directory."
 msgstr ""
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -6933,7 +6516,7 @@ msgid ""
 "Services."
 msgstr ""
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -6941,7 +6524,7 @@ msgid ""
 "on you will see your real IP address."
 msgstr ""
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -6950,7 +6533,7 @@ msgid ""
 "remove all flags simply type a \"-\" instead of any flags."
 msgstr ""
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -6958,22 +6541,23 @@ msgid ""
 "on you will see the vhost instead of your real IP address."
 msgstr ""
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
 msgstr ""
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr ""
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -6990,34 +6574,37 @@ msgid ""
 "OPERNEWS may only be used by Services Operators."
 msgstr ""
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr ""
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
 msgstr ""
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -7054,7 +6641,7 @@ msgid ""
 "the access list and xOP list systems."
 msgstr ""
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -7065,11 +6652,11 @@ msgid ""
 "SHUTDOWN command."
 msgstr ""
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr ""
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -7082,25 +6669,25 @@ msgid ""
 "RANDOMNEWS may only be used by Services Operators."
 msgstr ""
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr ""
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
 "      Displays memos numbered 2 through 5 and 7 through 9."
 msgstr ""
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -7126,7 +6713,7 @@ msgid ""
 "the nickname."
 msgstr ""
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -7137,7 +6724,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -7150,24 +6737,24 @@ msgid ""
 "%R%s HELP for information on how to do so."
 msgstr ""
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -7185,15 +6772,15 @@ msgid ""
 "feature, type %R%S HELP GROUP."
 msgstr ""
 
-#: language.cpp:3043
+#: modules/core/ns_release.cpp:77
 #, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -7202,7 +6789,7 @@ msgid ""
 "the nickname."
 msgstr ""
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -7211,7 +6798,7 @@ msgid ""
 "session limitation, etc.)"
 msgstr ""
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -7219,14 +6806,14 @@ msgid ""
 "to the e-mail address of the user whom is performing it."
 msgstr ""
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 msgstr ""
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -7234,36 +6821,36 @@ msgid ""
 "(i.e. exit and immediately re-run the executable)."
 msgstr ""
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
 "has been read."
 msgstr ""
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -7271,14 +6858,14 @@ msgid ""
 "Services. The new display MUST be a nick of the group."
 msgstr ""
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
 "Associates the given E-mail address with the nickname."
 msgstr ""
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -7288,7 +6875,7 @@ msgid ""
 "access on it."
 msgstr ""
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -7302,26 +6889,26 @@ msgid ""
 "be displayed (OFF) or hidden (ON)."
 msgstr ""
 
-#: language.cpp:2953
+#: modules/core/ns_set_kill.cpp:111
 #, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
 " \n"
@@ -7331,7 +6918,7 @@ msgid ""
 "that you can get by typing %R%S HELP SET LANGUAGE."
 msgstr ""
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -7340,7 +6927,7 @@ msgid ""
 "else they'll use notices."
 msgstr ""
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -7348,14 +6935,14 @@ msgid ""
 "to ON prevents the nickname from expiring."
 msgstr ""
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -7367,44 +6954,45 @@ msgid ""
 "information on it using the INFO command.)"
 msgstr ""
 
-#: language.cpp:2968
+#: modules/core/ns_set_secure.cpp:82
 #, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
 "Makes the bot say the given text on the given channel."
 msgstr ""
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -7415,7 +7003,7 @@ msgid ""
 "May be limited to IRC operators on certain networks."
 msgstr ""
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -7433,7 +7021,7 @@ msgid ""
 "hosts and groups thereof."
 msgstr ""
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -7442,7 +7030,42 @@ msgid ""
 "well as vhosts."
 msgstr ""
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+
+#: modules/core/cs_set_signkick.cpp:56
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+
+#: modules/core/bs_set.cpp:204
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -7453,6 +7076,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -7460,14 +7084,14 @@ msgid ""
 "level SET."
 msgstr ""
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
 "channel by users that aren't IRC operators."
 msgstr ""
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -7477,7 +7101,7 @@ msgid ""
 "Available options:"
 msgstr ""
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -7486,7 +7110,7 @@ msgid ""
 "even if they don't match the NOKICK level."
 msgstr ""
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -7495,7 +7119,7 @@ msgid ""
 "even if they don't match the NOKICK level."
 msgstr ""
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -7513,7 +7137,7 @@ msgid ""
 "level)."
 msgstr ""
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -7523,7 +7147,22 @@ msgid ""
 "they have enough access to the channel."
 msgstr ""
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -7532,7 +7171,7 @@ msgid ""
 "automatically when you enable the option."
 msgstr ""
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -7540,7 +7179,7 @@ msgid ""
 "to ON prevents the channel from expiring."
 msgstr ""
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -7551,28 +7190,29 @@ msgid ""
 "KICKs, and even the entry message."
 msgstr ""
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
 msgstr ""
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+
+#: modules/core/os_set.cpp:193
 msgid ""
 "Syntax: SET option setting\n"
 "Sets various global Services options.  Option names\n"
@@ -7581,11 +7221,10 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -7593,20 +7232,7 @@ msgid ""
 "allow ChanServ to op you automatically when entering channels."
 msgstr ""
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -7614,7 +7240,7 @@ msgid ""
 "Services. The new display MUST be a nick of your group."
 msgstr ""
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -7623,7 +7249,7 @@ msgid ""
 "information on the nickname with the INFO command."
 msgstr ""
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -7633,7 +7259,7 @@ msgid ""
 "access on it."
 msgstr ""
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -7647,14 +7273,7 @@ msgid ""
 "be displayed (OFF) or hidden (ON)."
 msgstr ""
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-
-#: language.cpp:2853
+#: modules/core/ns_set_kill.cpp:74
 #, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -7669,11 +7288,11 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 msgid ""
 "Syntax: SET LANGUAGE language\n"
 " \n"
@@ -7683,7 +7302,7 @@ msgid ""
 "supported languages:"
 msgstr ""
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -7694,7 +7313,7 @@ msgid ""
 "this any higher than %d."
 msgstr ""
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -7717,14 +7336,14 @@ msgid ""
 "not set a hard limit."
 msgstr ""
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
 "Display the various %S settings"
 msgstr ""
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -7733,17 +7352,17 @@ msgid ""
 "use notices."
 msgstr ""
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
 "-noexpire."
 msgstr ""
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -7763,7 +7382,7 @@ msgid ""
 "ON is essentially LOGON and NEW combined."
 msgstr ""
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -7771,7 +7390,7 @@ msgid ""
 "owner."
 msgstr ""
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -7783,7 +7402,7 @@ msgid ""
 "information on it using the INFO command.)"
 msgstr ""
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -7800,21 +7419,21 @@ msgid ""
 "-readonly."
 msgstr ""
 
-#: language.cpp:2868
+#: modules/core/ns_set_secure.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -7823,28 +7442,28 @@ msgid ""
 "needed, and set back to OFF when no longer needed."
 msgstr ""
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
 "Causes Services to save all databases and then shut down."
 msgstr ""
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -7880,7 +7499,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -7888,10 +7507,10 @@ msgid ""
 "SNLINE CLEAR clears all entries of the SNLINE list."
 msgstr ""
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -7929,7 +7548,7 @@ msgid ""
 "the access list and xOP list systems."
 msgstr ""
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -7945,31 +7564,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -7977,29 +7596,21 @@ msgid ""
 "SQLINE CLEAR clears all entries of the SQLINE list."
 msgstr ""
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 msgstr ""
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -8025,7 +7636,7 @@ msgid ""
 "everything you'd see with MEMORY and UPLINK options."
 msgstr ""
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -8039,12 +7650,12 @@ msgid ""
 "    STATUS ERROR error-message"
 msgstr ""
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -8063,7 +7674,7 @@ msgid ""
 "will be returned."
 msgstr ""
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -8074,14 +7685,14 @@ msgid ""
 "Reason may be required on certain networks."
 msgstr ""
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
 "Forcefully changes a user's nickname from nick to newnick."
 msgstr ""
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -8094,31 +7705,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -8126,7 +7737,7 @@ msgid ""
 "SZLINE CLEAR clears all entries of the SZLINE list."
 msgstr ""
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -8140,7 +7751,7 @@ msgid ""
 "channel."
 msgstr ""
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -8149,7 +7760,7 @@ msgid ""
 "command."
 msgstr ""
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -8160,7 +7771,7 @@ msgid ""
 "it entirely."
 msgstr ""
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -8172,7 +7783,7 @@ msgid ""
 "on the channel."
 msgstr ""
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -8183,7 +7794,7 @@ msgid ""
 "nick in your group."
 msgstr ""
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -8191,7 +7802,7 @@ msgid ""
 "are preserved from before the suspension."
 msgstr ""
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -8199,7 +7810,7 @@ msgid ""
 "send the command."
 msgstr ""
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -8212,22 +7823,23 @@ msgid ""
 "with the +i flag will be listed."
 msgstr ""
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
 "and above for self voicing."
 msgstr ""
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -8264,7 +7876,7 @@ msgid ""
 "the access list and xOP list systems."
 msgstr ""
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -8274,19 +7886,19 @@ msgid ""
 "Available options:"
 msgstr ""
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
 msgstr ""
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 msgstr ""
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -8294,181 +7906,181 @@ msgid ""
 "your userflags (lastseentime, etc)."
 msgstr ""
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr ""
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr ""
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr ""
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr ""
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr ""
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr ""
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr ""
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr ""
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr ""
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr ""
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr ""
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr ""
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr ""
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr ""
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr ""
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr ""
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
 msgstr ""
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
 "for more information."
 msgstr ""
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr ""
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
 msgstr ""
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr ""
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr ""
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr ""
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr ""
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr ""
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -8478,758 +8090,743 @@ msgid ""
 "                        non IRC operators"
 msgstr ""
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr ""
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr ""
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr ""
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr ""
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr ""
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr ""
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 msgstr ""
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
 msgstr ""
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
 msgstr ""
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr ""
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr ""
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr ""
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
 "please choose a different nick."
 msgstr ""
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr ""
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr ""
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 msgstr ""
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr ""
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr ""
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr ""
-
-#: language.cpp:882
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
 #, c-format
-msgid "Topic lock option for %s is now ON."
+msgid "Topic lock option for %s is now ."
 msgstr ""
 
-#: language.cpp:878
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
 #, c-format
-msgid "Topic retention option for %s is now OFF."
+msgid "Topic retention option for %s is now ."
 msgstr ""
 
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
-msgstr ""
-
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr ""
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
 "nickname."
 msgstr ""
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
 msgstr ""
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
 msgstr ""
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
 "any third-party person."
 msgstr ""
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr ""
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr ""
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr ""
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr ""
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr ""
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr ""
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr ""
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr ""
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr ""
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr ""
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr ""
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr ""
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr ""
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr ""
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr ""
 
-#: language.cpp:864
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
 #, c-format
-msgid "Unknown mode character %c ignored."
+msgid "Unknown mode character %c ignored."
 msgstr ""
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr ""
 
-#: language.cpp:1806
+#: include/language.h:41
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 
-#: language.cpp:1757
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
-msgstr ""
-
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr ""
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr ""
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr ""
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr ""
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr ""
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr ""
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
 msgstr ""
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr ""
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
 msgstr ""
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+msgid "VOICE [#channel] [nick]"
 msgstr ""
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: language.cpp:1104
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr ""
+
+#: src/memoserv.cpp:78
 #, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
 
-#: language.cpp:1741
-msgid "Voices protection"
+#: src/memoserv.cpp:80
+#, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
 msgstr ""
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr ""
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr ""
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr ""
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr ""
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr ""
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr ""
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr ""
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr ""
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr ""
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
 msgstr ""
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr ""
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr ""
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr ""
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr ""
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr ""
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr ""
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr ""
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
 "Type %R%s HELP command for more information."
 msgstr ""
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type %R%s HELP command for more information."
 msgstr ""
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
 msgstr ""
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr ""
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr ""
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr ""
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr ""
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr ""
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr ""
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr ""
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr ""
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr ""
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr ""
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr ""
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr ""
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr ""
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
 msgstr ""
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr ""
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr ""
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr ""
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr ""
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr ""
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr ""
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
 msgstr ""
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr ""
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr ""
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr ""
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
 "case you forget it."
 msgstr ""
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr ""
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr ""
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr ""
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr ""
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr ""
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr ""
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr ""
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
 msgstr ""
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr ""
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+msgid "Your auto join list is empty."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+msgid "Your memo ignore list is empty."
+msgstr ""
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr ""
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr ""
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr ""
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr ""
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr ""
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
 msgstr ""
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr ""
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr ""
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr ""
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr ""
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr ""
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr ""
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr ""
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr ""
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr ""
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr ""
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr ""
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr ""
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr ""
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr ""
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr ""
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr ""
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr ""
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr ""
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr ""
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr ""
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr ""
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr ""
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr ""
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr ""
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr ""
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr ""
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr ""
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr ""
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr ""
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr ""
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr ""
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr ""
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr ""
 
-#: language.cpp:941
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
 #, c-format
-msgid "xOP lists system for %s is now OFF."
+msgid "xOP lists system for %s is now ."
 msgstr ""
 
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:31
+msgid "xOP system is not available."
 msgstr ""
 
-#: language.cpp:962
-msgid "xOP system is not available."
+#: src/memoserv.cpp:180
+msgid "{nick | channel} memo-text"
 msgstr ""
diff --git a/lang/anope.pt_PT.po b/language/anope.pt_PT.po
index 3d2baf76a..13db629a1 100644
--- a/lang/anope.pt_PT.po
+++ b/language/anope.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 21:02-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "Digite /msg %s HELP %s para maiores informações."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -35,7 +35,7 @@ msgstr ""
 "/msg %S comando. Para mais informações sobre um\n"
 "comando específico, digite /msg %S HELP comando."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -53,14 +53,15 @@ msgstr ""
 "/msg %S comando. Para informações mais específicas\n"
 "sobre um comando, digite /msg %S HELP comando."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S permite que você registre e controle vários\n"
@@ -71,12 +72,12 @@ msgstr ""
 "/msg %S comando. Para mais informações sobre\n"
 "um comando específico, digite /msg %S HELP comando."
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -89,122 +90,106 @@ msgstr ""
 "que possam enviar uma mensagem (memo).\n"
 "Os comandos do %S são:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s alterou o Nível do DEFCON para %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s adicionado à lista de AOP do %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s adicionado à lista de HOP do %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s adicionado à lista de SOP do %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s adicionado à lista de VOP do %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s adicionado à lista de acesso do %s com o nível %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s adicionado à lista de akick do %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s adicionado na lista de palavrões do %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s adicionado à lista de AKILL."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s adicionado à lista de SNLINE."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s adicionado à lista de SQLINE."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s adicionado à lista de SZLINE."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s adicionado em sua lista de acesso."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s adicionado em sua lista de acesso."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s já existe na lista de palavrões do %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s já existe na lista de akick do %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s já se encontra na lista de AKILL."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s já existe na lista de EXCEPTION."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s já existe na lista de SNLINE."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s já existe na lista de SQLINE."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s já existe na lista de SZLINE."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s não pode ser colocado como tempo para ban."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s alterou seus modos de usuário."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -213,132 +198,113 @@ msgstr ""
 "Lista de canais do %s:\n"
 "Nome              Usuários Tópico"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s deletado da lista de AOP do %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s deletado da lista de HOP do %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s deletado da lista de SOP do %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s deletado da lista de VOP do %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s removido da lista de acesso do %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s removido da lista de akick do %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s removido da lista de palavrões do %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s removido da lista de limite de sessões."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s removido da lista de AKILL."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s removido da lista de SNLINE."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s removido da lista de SQLINE."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s removido da lista de SZLINE."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s removido da sua lista de acesso."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s desabilitado no canal %s."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s possui muitos canais registrados."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s já está coberto pelo AKILL %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s adicionado em sua lista de acesso."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s não é um ban válido."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s não é um bot válido ou um canal registrado."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s não é um endereço de e-mail válido."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s não está mais sempre ativo no canal %s."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s não está atualmente no canal %s."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s está agora sempre ativo no canal %s."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s não encontrado na lista de Ignore."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -347,107 +313,72 @@ msgstr ""
 "%s combina com uma Except no %s e não pode ser banido até que a Except sejá "
 "removida."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s movido para a lista de AOP do %s."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s movido para a lista de HOP do %s."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s movido para a lista de SOP do %s."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s movido para a lista de VOP do %s."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "Nick %s não encontrado na lista de AOP do %s."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "Nick %s não encontrado na lista de HOP do %s."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "Nick %s não encontrado na lista de SOP do %s."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "Nick %s não encontrado na lista de VOP do %s."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s não foi encontrado na lista de acesso do %s."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s não encontrado na lista de akick do %s."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s não foi encontrado na lista de palavrões do %s."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s não encontrado na lista de Limite de Sessões."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s não encontrado na lista de limite de sessões."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s não encontrado na lista de AKILL."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s não encontrado na lista de SNLINE."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s não encontrado na lista de SQLINE."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s não foi encontrado na lista de SZLINE."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s não foi encontrado em sua lista de acesso."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s removido da sua lista de acesso."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -456,33 +387,33 @@ msgstr ""
 "Lista de usuários do %s:\n"
 "Nick                 Máscara"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s não será mais ignorado."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s agora será ignorado por %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s agora será permanentemente ignorado."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Aviso: Todos os comandos enviados para o %S são gravados!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Atenção: Os services estão no modo somente leitura; as mudanças não serão "
 "salvas!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -490,12 +421,12 @@ msgstr ""
 "Lembrete: As máscaras de AKILL não devem conter o nick; tenha certeza de que "
 "você não incluiu o nick na máscara."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr ""
 "Lembrete: você pode apenas adicionar endereços de IP para a lista de SZLINE."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -536,41 +467,38 @@ msgstr ""
 "Esses níveis podem ser mudados, ou adicionar novos, usando o\n"
 "comando LEVELS; digite /msg %S HELP LEVELS para informações."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Atenção: Você ultrapassou seu número máximo de memos (%d). Não será possível "
-"receber novos memos enquanto você não apagar alguns."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Atenção: Você atingiu seu número máximo de memos (%d). Não será possível "
-"receber novos memos enquanto você não apagar alguns."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[Auto-Memo] O memo que você enviou foi lido."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[Auto-Memo] O memo que você enviou para %s foi lido."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER senha email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER senha email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP alvo senha"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -580,7 +508,7 @@ msgstr ""
 "outras atitudes mau intencionadas. O abuso do %S\n"
 "resultará em, no mínimo, perda do(s) nick(s) abusivo(s). "
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -593,7 +521,7 @@ msgstr ""
 "também ver as listas de acesso, AKICK, e níveis de qualquer\n"
 "canal."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -604,368 +532,384 @@ msgstr ""
 "sem ser necessário se identificar como dono dele, e podem ver a lista de\n"
 "acesso de qualquer nick (/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "                Opções: %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "                   vHost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "                   vHost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Nick do bot: %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "           Nick do bot: nenhum associado no momento."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "                  Opções: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "         Kick por Caps: %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "         Kick por Caps: %s (%d kick(s) para banir; mínimo %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "         Kick por Caps: %s (mínimo %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "             Fundador: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "          Tipo de ban: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "      Kick por negrito: %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "      Kick por negrito: %s (%d kick(s) para banir)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "        Kick por flood: %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "        Kick por flood: %s (%d kick(s) para banir; %d linhas em %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "        Kick por flood: %s (%d linhas em %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Máscara: %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "        Kick por cores: %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "        Kick por cores: %s (%d kick(s) para banir)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "            Expira em: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "          Tipo de ban: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "           Último uso: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Trava de modo: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "    Kick por repetição: %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "    Kick por repetição: %s (%d kick(s) para banir; %d vezes)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "    Kick por repetição: %s (%d vezes)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "             Sucessor: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "             Suspenso: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "         Kick por Caps: %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "      Kick por negrito: %s (%d kick(s) para banir)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "       Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "       Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "        Último tópico: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "           Registrado: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (desabilitado)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (founder apenas)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifica a lista de endereços autorizados"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Modifica a lista de usuários privilegiados"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "    ACT                Faz com que o bot faça o mesmo que o comando \"/me\""
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Manipula a lista de AKILL"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      Lista todos os canais nos quais você tem acesso"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Modifica a lista de AOP (AutoOP) de um canal"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "    ASSIGN             Associa um bot ao canal"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "    BADWORDS           Configura os palavrões"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bane o nick selecionado em um canal"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       Ajusta como os Services devem fazer o ban"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "    BOT                Mantém a lista de bots da Rede"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "    BOTLIST            Lista os bots disponíveis"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL   Cancela o último memo enviado por você"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL todos os usuários de um canal específico"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Lista todos os canais em uso na Rede"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK    Verifica se o último memo enviado para um nick foi lido"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Diz ao ChanServ para remover certos ajustes de um canal"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Limpa os modos de um canal"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirma um código de autorização do NickServ"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "        Criado: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipula o sistema DefCon"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Retira o status de HalfOP de um nick no canal"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Deleta o vHost de outro usuário"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL      Apaga a(s) mensagem(ns)"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Deleta o vHost de todos os nicks de um grupo"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Retira o status de OP de um nick no canal"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Retira seu status de Owner no canal"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Desprotege um determinado nick no canal"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Ajusta a descrição do canal"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Retira o status de Voice de um nick no canal"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Mostra o seu grupo nos Services"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Cancela o registro de um canal"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Cancela o registro de um nick"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "            Descrição: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Associa um endereço de e-mail ao seu nick"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Ajusta a mensagem que deve ser mandada\n"
-"                    aos usuários quando eles entram no canal"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Modifica a lista de limite de sessões"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Previne um canal de ser registrado/usado"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Previne um nick de ser usado ou registrado"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Ajusta o fundador do canal"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -973,71 +917,76 @@ msgstr ""
 "    GETEMAIL   Encontra e retorna todos os usuários que se\n"
 "                   registraram usando o email fornecido"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Retorna a key (do modo +k) do canal fornecido"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr "    GETPASS    Recupera a senha de um determinado nick"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr ""
 "    GHOST      Termina uma sessão \"fantasma\" de IRC que esteja usando seu "
 "nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lista todos os nicks do seu grupo"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Envia uma mensagem para todos usuários"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Associa uma mensgem de entrada ao seu nick"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr ""
 "    GROUP       Sincroniza um mesmo vHost para todos os nicks de um grupo"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Se junta a um grupo"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "     Mensagem de entrada: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Atribui status de HalfOP a um nick no canal"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Esconde certas informações sobre seu nick"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Modifica a lista de HOP (HalfOP) de um canal"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Identifica seu nick com sua senha"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1045,47 +994,47 @@ msgstr ""
 "    INFO               Permite que você veja informações do BotServ sobre um "
 "canal ou bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Mostra informações sobre algum nick registrado"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Mostra informações sobre algum canal registrado"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO     Exibe informações sobre suas mensagens"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        Jupa um servidor"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr "    KEEPTOPIC     Mantem o tópico quando o canal não está em uso"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "    KICK               Configura os kickers"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Kicka um usuário de um canal"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicka (expulsa) um nick de um canal"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Ativa/Desativa a proteção de kill para o seu nick"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1093,93 +1042,86 @@ msgstr ""
 "    LANGUAGE   Ajusta a linguagem dos Services quando\n"
 "                   mensagens são enviadas à você"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Redefine os níveis de acesso"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Exibe uma ou mais entradas de vHost"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       Lista todos os nicks registrados que combinam com o padrão "
 "fornecido"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lista todos os canais registrados que combinam com o padrão "
 "fornecido"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST     Lista suas mensagens"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr "    LOGONNEWS   Define mensagens a serem mostradas na conexão"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverte o efeito do comando IDENTIFY"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Liga ou desliga a trava dos modos do canal"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Muda o modo de um canal"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Limpa os modos de um canal"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Informação sobre um módulo carregado"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Lista os módulos carregados"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Carrega um módulo"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Carrega um módulo"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Descarrega um módulo"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Altera o método de comunicação dos Services"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1187,407 +1129,403 @@ msgstr ""
 "    NOOP        Remove temporariamente todas as O:lines de um \n"
 "                  servidor remotamente"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Desativa seu vHost associado"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Dá flags de Operador a um determinado usuário"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Ativa seu vHost associado"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Atribui status de OP a um nick no canal"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr "    OPERNEWS    Define mensagens a serem mostradas a quem pega Oper"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      Envia uma notice quando os comandos OP/DEOP são usados"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Concede-lhe status de Owner no canal"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "        Opções: %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Ajusta a senha do seu nick"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         Regula o uso de comandos críticos"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       Esconde o canal do comando LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr "    PRIVATE    Previne seu nick de aparecer em um /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protege um determinado nick no canal"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Termina os Services sem salvar os dados"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
 msgstr "    RANDOMNEWS  Define mensagens a serem mostradas ao azar na conexão"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ     Lê a(s) mensagem(ns)"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER    Derruba usuário que esteja usando seu nick"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Registra um nick"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Registra um nick"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr "    RELEASE    Retoma a custódia do seu nick após um RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Reenvia um código de autorização do NickServ"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords"
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Salva os dados e reinicia os Services"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Acesso restrito ao canal"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND    Envia um memo e pede uma confirmação de leitura"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "     Kick por reversos: %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "     Kick por reversos: %s (%d kick(s) para banir)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "    SAY                Faz com que o bot diga determinado texto no canal dado"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        Ativa os recursos de segurança do %S"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER Controle rigoroso do status de Fundador do Canal"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Controle rigoroso do status de OP"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND     Envia uma mensagem para um nick ou para um canal"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Envia um memo para todos os usuários registrados"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Esqueceu sua senha? Tente isto"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Mostra a lista de sessões de host"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "    SET                Configura as opções do bot"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Ajusta o vHost de outro usuário"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Configura várias opções globais dos Services"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Ajusta as opções e informações do canal"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Ajusta opções, incluindo proteção de kill"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET      Ajusta opções relacionadas às mensagens"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Ajusta o vHost de todos os nicks de um grupo"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Termina os Services salvando os dados"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      Assinatura dos kicks feitos pelo comando KICK"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Manipula a lista de SNLINE"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Modifica a lista de SOP (SuperOP) de um canal"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Manipula a lista de SQLINE"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr ""
 "    STAFF       Exibe os membros da Staff dos Services e seu status online"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF    Envia um memo para todos os opers/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Mostra estatísticas dos Services e da Rede"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Fornece o atual nível de acesso de um usuário em um canal"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Retorna o status do owner de um determinado nick"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Ajusta o sucessor do canal"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Previne um canal de ser registrado/usado,\n"
 "               preservando os dados do canal e suas configurações"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspende o nick fornecido"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Força a mudança do nick de um usuário"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Manipula a lista de SZLINE"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Modifica o tópico de um canal"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     O tópico pode ser mudado apenas com o comando TOPIC"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Altera os modos de um usuário"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "    UNASSIGN           Desassocia um bot de um canal"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Libera um canal suspenso"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Libera o nick fornecido"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
 msgstr "    UPDATE      Salva os dados atuais dos Services"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Atualiza seu status atual, ou seja, verifica novos memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Lista todos os usuários online na Rede"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "      Usado em: %d canal(is)"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Atribui status de Voice a um nick no canal"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Modifica a lista de VOP (VOicePeople) de um canal"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Altera o sistema de privilégio de usuário"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expira em %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "     Kick por palavrão: %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "     Kick por palavrão: %s (%d kick(s) para banir)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "                  E-mail: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "          Está online em: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "    Último horário visto: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "           Tópico por: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1596,17 +1534,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1615,98 +1553,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s %s"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "  Mensagem de entrada: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "      RealName: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "        Hora de registro: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "   Kick por sublinhado: %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "   Kick por sublinhado: %s (%d kick(s) para banir)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Núm  Remetente            Data/Hora"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vHost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vHost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, fuzzy, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1715,7 +1657,7 @@ msgstr ""
 "%3d  %s (por %s em %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1724,25 +1666,16 @@ msgstr ""
 "%3d %s (por %s em %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (stuck) (por %s em %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (por %s em %s; %s)\n"
 "    Limite: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1751,254 +1684,260 @@ msgstr ""
 "%5d (%s por %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Comandos do %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s não é notificado de novos memos."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d módulos carregados."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bots disponíveis."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d dias"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (por %s em %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d horas"
+msgid "%d Modules loaded."
+msgstr "%d módulos carregados."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d minutos"
+msgid "%d bots available."
+msgstr "%d bots disponíveis."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicks no grupo."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "Lista de AOP do canal %s está vazia."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "Lista de HOP do canal %s está vazia."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "Lista de SOP do canal %s está vazia."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "Lista de VOP do canal %s está vazia."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "Lista de acesso do canal %s está vazia."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Lista de akick do %s vazia."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "Lista de palvrões do %s está vazia."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s não pode ser o successor do canal %s porque ele é o founder."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s não pode receber memos."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Comandos do %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "Máscara %s é muito grande; por favor seja mais específico."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s possui atualmente %d memos, dos quais %d não foram lidos."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s possui atualmente %d memos, dos quais 1 não foi lido."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s possui atualmente %d memos."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s possui atualmente %d memos; dos quais nenhum foi lido."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s possui atualmente 1 memo, e ainda não foi lido."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s possui atualmente 1 memo."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s não possui nenhum memo atualmente."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s possui muitos memos atualmente e não pode receber mais nenhum."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s não possui limite de memos."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s não possui memos."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s não possui novos memos."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s é %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s não está conectado no momento."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s está online neste momento."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s está desativada"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s está ativada"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s não é mais um Super-Admin"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s não é notificado de novos memos."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s é notificado de novos memos quando conecta e quando eles são enviados."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s é notificado de novos memos quando conecta."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s é notificado de novos memos quando eles são enviados."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s é agora um Super-Admin"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Lista de AOP para %s:\n"
+"  Núm  Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s não encontrado na lista de akick do %s."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s removido da lista de akick do %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s não irá mais notificá-lo de novos memos."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr ""
 "%s irá agora notificá-lo de novos memos quando eles lhe forem enviados."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2007,95 +1946,79 @@ msgstr ""
 "%s irá agora notificá-lo de novos memos quando você conectar, quando eles "
 "lhe forem enviados ou quando desativar o /AWAY."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s irá agora notificá-lo de novos memos quando você conectar ou quando "
 "desativar o /AWAY."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) adicionado à lista de bots."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "Limite de memos para %s é de %d, e não pode ser alterado."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Limite de memos para %s é de %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILLA quaisquer novos clientes conectando"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Força os Modos de Canal (%s) a serem setados em todos os canais"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignora quaisquer não-opers com mensagem"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killa quaisquer NOVOS clientes conectando"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Impedida a mudança de MLOCK"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Impedido o registro de novos canais"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Impede o envio de novos memos"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Impedido o registro de novos nicks"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Silenciosamente ignora não-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Usa o limite de sessões reduzido de %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 dia"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 hora"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 minuto"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 segundo"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<desconhecido>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "Uma mensagem global foi enviada a todos os usuários registrados."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2103,132 +2026,134 @@ msgid ""
 msgstr ""
 "Um memo de notificação foi enviado para %s informando que você leu seu memo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "O passcode foi enviado para %s, por favor digite /msg %s confirm <passcode> "
 "para completar o registro."
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "O Ident de um vhost deve estar no formato de um Ident válido."
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Erro! Um vhost pode conter apenas A-Z, a-z, 0-9, '.' e '-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|VIEW|CLEAR} [nick [nível] | lista-entradas]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [máscara]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT canal texto"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [máscara]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK canal {ADD|STICK|UNSTICK|DEL|LIST|VIEW|ENFORCE|CLEAR} [nick-ou-"
 "máscara] [motivo]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE para %s terminado; %d usuários afetados."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "A lista de AKILL está vazia."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista} [motivo]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista de AOP para %s:\n"
-"  Núm  Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Acesso negado."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Nível de acesso para %s no %s alterado para %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Nível de acesso para %s no %s não alterado %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "O nível de acesso deve ser entre %d e %d inclusive."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "O nível de acesso deve ser diferente de zero."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Opções de nível de acesso para o canal %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Níveis de acesso para o %s redefinidos para o padrão."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Lista de acesso para %s está vazia."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lista de acesso para %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Lista de acesso para %s:\n"
 "  Num   Nív  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista de acesso:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2237,22 +2162,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s adicionado à lista de akick do %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Adicionado novo logon news (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Adicionado novo OperNews (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Adicionada novo item RandomNews (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2260,237 +2190,230 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Todas as O:lines do servidor %s foram removidas."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Todas as O:lines do servidor %s foram resetadas."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Todos os bans do canal %s foram removidos."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Todos os excepts do canal %s foram removidos."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Todos os Invites do canal %s foram removidos."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Todos os logon news foram removidos."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Todos os memos para o canal %s foram apagados."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Todos os modos foram removidos do canal %s."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Todos os modos no canal %s foram removidos."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Todos os seus memos foram apagados."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Todos os OperNews foram removidos."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Todos os itens RandomNews deletados."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Todos os usuários foram kickados do canal %s."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Permitido usar o comando (DE)HALFOP em si mesmo"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Permitido usar o comando (DE)OP em si mesmo"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Permitido usar o comando (DE)PROTECT em si mesmo"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Permitido usar o comando (DE)VOICE em si mesmo"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Permitido associar/desassociar um bot a/de um canal"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Permitido o uso do comando BAN em si mesmo"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Permitido usar o comando KICK em si mesmo"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Permitido listar/ler memos do canal"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Permitido modificar a lista de acesso"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Permitido o uso do comando AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Permitido o uso do comando BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Permitido o uso do comando BAN"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Permitido o uso do comando CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Permitido o uso do comando GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Permitido o uso dos comandos HALFOP/DEHALFOP"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Permitido o uso do comando INFO com a opção ALL"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Permitido o uso do comando INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Permitido o uso do comando KICK"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Permitido o uso do comando OP/DEOP"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Permitido o uso dos comandos PROTECT/DEPROTECT"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Permitido o uso dos comandos SAY e ACT"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Permitido o uso do comando SET (não inclui as opções FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Permitido o uso do comando TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Permitido o uso do comando UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Permitido o uso dos comandos VOICE/DEVOICE"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Permitido o uso do comando FANTASY de bots"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Permitido visualizar a lista de acesso"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista de akick para %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Modo +o automático"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Modo +a automático"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Modo +h automático"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Modo +v automático"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [palavra | lista] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2500,7 +2423,7 @@ msgstr ""
 "BOT CHANGE nickantigo nicknovo [user [host [real]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2509,110 +2432,109 @@ msgstr ""
 "Lista de palavrões do %s:\n"
 "  Núm   Palavra                        Tipo"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Lista de palavrões está agora vazia."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Tipo de ban para o canal %s é agora #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Modos binários e bans removidos do canal %s."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s já existe."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Bot %s não existe."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s foi associado ao canal %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Bot %s foi alterado para %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Bot %s foi removido."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s já está associado ao canal %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot irá kickar OPs no canal %s."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot irá kickar voices no canal %s."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot não irá kickar OPs no canal %s."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot não irá kickar voices no canal %s."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "O Host do bot deve conter apenas caracteres válidos a Hosts."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents may only contain %d characters."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "A Identd do bot deve conter apenas caracteres válidos."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "O Nick do bot deve conter apenas caracteres válidos a Nicks."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Bot não está no canal %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Lista de bots:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"O bot irá entrar no canal sempre que tiver ao menos %d usuário(s) nele."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2623,7 +2545,7 @@ msgstr ""
 "após %d kicks no mesmo usuário. Use o comando BADWORDS\n"
 "para adicionar ou remover um palavrão."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2631,20 +2553,20 @@ msgstr ""
 "O bot irá agora kickar por palavrões. Use o comando\n"
 "BADWORDS para adicionar ou remover um palavrão."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "O bot irá agora kickar por negritos, e irá setar um ban \n"
 "após %d kicks no mesmo usuário."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "O bot irá agora kickar por negritos."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2655,7 +2577,7 @@ msgstr ""
 "%d caracteres e %d%% na mensagem inteira), e irá setar\n"
 "um ban após %d kicks no mesmo usuário."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2664,47 +2586,47 @@ msgstr ""
 "O bot irá agora kickar por caps (deve ter no mínimo\n"
 "%d caracteres e %d%% na mensagem inteira)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "O bot irá agora kickar por cores, e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "O bot irá agora kickar por cores."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "O bot irá agora kickar por flood (%d linhas em %d segundos), e \n"
 "setar um ban após %d kicks no mesmo usuário."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "O bot irá agora kickar por flood (%d linhas em %d segundos)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2715,7 +2637,7 @@ msgstr ""
 "%d vezes a mesma coisa), e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2724,138 +2646,153 @@ msgstr ""
 "O bot irá agora kickar por repetição (usuários que escreverem\n"
 "%d vezes a mesma coisa)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "O bot irá agora kickar por reversos, e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "O bot irá agora kickar por reversos."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "O bot irá agora kickar por sublinhados, e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "O bot irá agora kickar por sublinhados."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "O bot irá agora kickar por cores."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "O bot não irá mais kickar por palavrões."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "O bot não irá mais kickar por negritos."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "O bot não irá mais kickar por caps."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "O bot não irá mais kickar por cores."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "O bot não irá mais kickar por flood."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "O bot não irá mais kickar por repetição."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "O bot não irá mais kickar por reversos."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "O bot não irá mais kickar por sublinhados."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "O bot não irá mais kickar por caps."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d registros, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots reservados aos Operadores de IRC:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes lidos   : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes escritos: %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+tempo] {#canal} [motivo]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nick"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR canal opção"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal[ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr ""
-"Impossível fazer logout em %s porque ele é um Administrador dos Services."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR canal opção"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Não foi possível enviar e-mail agora; tente novamente mais tarde."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d registros, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Modos do usuário %s alterados."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "O canal %s não existe."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "O canal %s foi desregistrado."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2864,142 +2801,103 @@ msgstr ""
 "Canal %s foi bloqueado por %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "O canal %s já está registrado!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Canal %s está agora bloqueado."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Canal %s está agora liberado."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Canal %s está agora suspenso."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "O canal %s não está registrado."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "O canal %s não pode ser registrado ou usado."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "O canal %s não pode ser registrado."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "O canal %s está registrado sob seu nick: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canais        : %6d registros, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "O canal %s irá expirar."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "O canal %s não irá expirar."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Lista de AOP do canal %s foi limpa."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Lista de HOP do canal %s foi limpa."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Lista de SOP do canal %s foi limpa."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Lista de VOP do canal %s foi limpa."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Lista de acesso do canal %s apagada."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Lista de akick do canal %s foi limpa."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Canal %s está agora liberado."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Lista de AOP do canal só pode conter nicks registrados."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Lista de HOP do canal só pode conter nicks registrados."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Lista de SOP do canal só pode conter nicks registrados."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINEs de canal não são suportadas por este IRCd, então você não pode usá-"
 "las."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Lista de VOP do canal só pode conter nicks registrados."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "A lista de acesso do canal deve conter apenas nicks registrados."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3007,11 +2905,7 @@ msgstr ""
 "Lista de canais:\n"
 "Nome              Usuários Tópico"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Modo -o automático"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3020,7 +2914,7 @@ msgstr ""
 "Canais nos quais %s tem acesso:\n"
 "  Núm  Canal                Nível    Descrição "
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3028,31 +2922,16 @@ msgstr ""
 "Canais nos quais você tem acesso:\n"
 "  Núm  Canal                Nível    Descrição"
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Não foi possível bloquear o canal %s!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Não foi possível bloquear o nick %s!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Impossível liberar canal %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Impossível suspender o canal %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Lista de AKILL atual:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3060,15 +2939,15 @@ msgstr ""
 "Lista de AKILL atual:\n"
 "  Núm   Máscara                           Motivo"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Lista de Módulos atual:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Lista de SNLINE atual:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3076,11 +2955,11 @@ msgstr ""
 "Lista de SNLINE atual:\n"
 "  Núm   Máscara                           Motivo"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Lista de SQLINE atual:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3088,11 +2967,11 @@ msgstr ""
 "Lista de SQLINE atual:\n"
 "  Núm   Máscara                           Motivo"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Lista atual de SZLINE:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3100,725 +2979,612 @@ msgstr ""
 "Lista atual de SZLINE:\n"
 "  Núm   Máscara                           Motivo"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Atual lista de Limite de sessões:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Número atual de AKILLs: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Número atual de SNLINEs: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Número atual de SQLINEs: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Número atual de SZLINEs: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Usuários atuais: %d (%d ops)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {núm | list | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP canal"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Tempo atual de expiração de akill: %d dias"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Tempo atual de expiração de akill: %d horas"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Tempo atual de expiração de akill: %d minutos"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Tempo atual de expiração de akill: 1 dia"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Tempo atual de expiração de akill: 1 hora"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Tempo atual de expiração de akill: 1 minuto"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Tempo atual de expiração de akill: Não expira"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Tempo atual de expiração de SNLINE: %d dias"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Tempo atual de expiração de SNLINE: %d horas"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Tempo atual de expiração de SNLINE: %d minutos"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Tempo atual de expiração de SNLINE: 1 dia"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Tempo atual de expiração de SNLINE: 1 hora"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Tempo atual de expiração de SNLINE: 1 minuto"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Tempo atual de expiração de SNLINE: Não expira"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Tempo atual de expiração de SQLINE: %d dias"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Tempo atual de expiração de SQLINE: %d horas"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Tempo atual de expiração de SQLINE: %d minutos"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Tempo atual de expiração de SQLINE: 1 dia"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Tempo atual de expiração de SQLINE: 1 hora"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Tempo atual de expiração de SQLINE: 1 minuto"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Tempo atual de expiração de SQLINE: Não expira"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Tempo atual de expiração de SZLINE: %d dias"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Tempo atual de expiração de SZLINE: %d horas"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Tempo atual de expiração de SZLINE: %d minutos"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Tempo atual de expiração de SZLINE: 1 dia"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Tempo atual de expiração de SZLINE: 1 hora"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Tempo atual de expiração de SZLINE: 1 minuto"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Tempo atual de expiração de SZLINE: Não expira"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "Deletadas %d entradas da lista de AOP do %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "Deletadas %d entradas da lista de HOP do %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "Deletadas %d entradas da lista de SOP do %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "Deletadas %d entradas da lista de VOP do %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "Removidas %d entradas da lista de acesso do %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Removidas %d entradas da lista de akick do %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "Removidas %d entradas da lista de palavrões do %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "Removidas %d entradas da lista de limite de sessões."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "Removidas %d entradas da lista de AKILL."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "Removidas %d entradas da lista de SNLINE."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "Removidas %d entradas da lista de SQLINE."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "Removidas %d entradas da lista de SZLINE."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "Deletada 1 entrada da lista de AOP do %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "Deletada 1 entrada da lista de HOP do %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "Deletada 1 entrada da lista de SOP do %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "Deletada 1 entrada da lista de VOP do %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "Removida 1 entrada da lista de acesso do %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Removida 1 entrada da lista de akick do %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "Removida 1 entrada da lista de palavrões do %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "Removida 1 entrada da lista de limite de sessões."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "Removida 1 entrada da lista de AKILL."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "Removida 1 entrada da lista de SNLINE."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "Removida 1 entrada da lista de SQLINE."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "Removida 1 entrada da lista de SZLINE."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "Deletada 1 entrada da lista de AOP do %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Descrição do canal %s alterada para %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "desativado"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Exibidos todos os registros (Contador: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Exibidos registros de %d até %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Exibidos registros coincidindo com a chave %s (Contador: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Não use negritos neste canal!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Não use cores neste canal!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Por favor não use reversos no canal!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Não use a palavra %s neste canal!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Não use sublinhados neste canal!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "E-mail removido."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "E-mail para %s é inválido."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parâmetros]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "O nick %s usa o E-mail %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "ativado"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Fim da lista de %s."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Fim da lista de acesso."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Fim da listagem."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fim da listagem - %d/%d resultados mostrados."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fim da listagem - %d/%d resultados mostrados."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Fim da listagem."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Português"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Mensagem de entrada para o canal %s alterada."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Mensagem de entrada para o canal %s removida."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 "Erro! O Ident é muito comprido, por favor use um Ident de até %d caracteres."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Erro! O host é muito comprido, por favor use um host de até %d caracteres."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Sessão para %s (#%d) alterada para a posição %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exceção para %s foi atualizada para %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "               Expira em: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Tempo de expiração para %s alterado."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID canal motivo"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [motivo]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nick motivo"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [motivo]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Modo Fantasia está agora ATIVADO no canal %s."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Modo Fantasia está agora DESATIVADO no canal %s."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Modo Fantasia está agora ATIVADO no canal %s."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s não será mais ignorado."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Founder do canal %s alterado para %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@emailhost Não use coringas!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY canal"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "Comando GETPASS não disponível: modo de encriptação ativado."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [senha]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL mensagem"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP alvo senha"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Seu nick foi derrubado e pode ser usado."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Mensagem de entrada"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Mensagem de entrada"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Modo mensagem de entrada está agora DESATIVADO no canal %s."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Modo mensagem de entrada está agora ATIVADO no canal %s."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista de HOP para %s:\n"
-"  Núm  Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d registros, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts com pelo menos %d sessões:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY senha"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Se você não mudar seu nick em 20 segundos, eu irei mudá-lo."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Se você não mudar seu nick em 1 minuto, eu irei mudá-lo."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Opção IGNORE será usada."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Opção IGNORE não será usada."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Lista de Ignore foi apagada."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Lista de Ignore dos Services vazia."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Lista de bots:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3834,29 +3600,25 @@ msgstr ""
 "Digite /msg %S HELP SET opção para maiores informações\n"
 "sobre um comando específico."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informações do bot %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Informações do canal %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Erro interno - não foi possível processar seu pedido."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Tempo de expiração inválido."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3864,14 +3626,14 @@ msgstr ""
 "Máscara inválida. Apenas máscaras (hosts) são válidas como exceções aos "
 "limites de sessões. Nick ou username não são válidos."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Um passcode inválido foi digitado, por favor verifique o e-mail e tente "
 "novamente"
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3880,295 +3642,309 @@ msgstr ""
 "Limite de sessão inválida. O limite deve ser um número inteiro maior ou "
 "igual a zero e menor que %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Número inválido. Deve ser um número inteiro maior que 1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE servidor [motivo]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal opções {ON|OFF} [configurações]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK canal usuário motivo"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [item [nível]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST opções"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST opções [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [list | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Linguagem alterada para Português."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Último memo enviado para %s foi cancelado."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Última mensagem de saída: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "   Último endereço visto: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Nível para %s no canal %s alterado para %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "O nível deve ser entre %d e %d inclusive."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Este comando não tem utilidade neste modo."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista de entradas com %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista de nicks no grupo %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Lista de nicks no grupo:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Canais locais não podem ser registrados."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Logon news removido #%d."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Logon news não encontrado #%d!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Logon News itens:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE canal modos"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO NomeDoArquivo"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD NomeDoArquivo"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD NomeDoArquivo"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD NomeDoArquivo"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "A máscara %s já se encontra em sua lista de acesso."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "A máscara deve ser no formato user@host."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Máximo atingido: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "Memo %d de %s (%s). Para apagar, digite: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr "Memo %d de %s (%s). Para apagar, digite: /msg %s DEL %s %d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d foi apagado."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limite de memos desativado para %s."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limite de memos para %s é agora de %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de memos para %s é agora de 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Limite de memos muito grande; limitando em %d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviado para %s."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "Memos para %s. Para ler, digite: /msg %s READ núm"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Memos para %s. Para ler, digite: /msg %s READ %s núm"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "Memos para %s. Para ler, digite: /msg %s READ núm"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "Memos para %s. Para ler, digite: /msg %s READ %s núm"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Modo mensagem"
 
-#: language.cpp:866
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Modo %c ignorado porque você não pode travá-lo."
-
-#: language.cpp:1314
-#, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Modo +o foi retirado do canal %s."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Modo MLOCK no canal %s alterado para %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "        Trava de modo: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Módulo %s carregado"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Módulo %s carregado"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Módulo %s descarregado"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Módulo: %s Versão: %s Autor: %s Carregado: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Módulo: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} servidor"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Nicks NS      : %6d registros, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grupos NS     : %6d registros, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Nunca ser kickado pelos motivos dos Kickers do bot"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Novo memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "Novos memos para %s. Para ler, digite: /msg %s READ núm"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "Novos memos para %s. Para ler, digite: /msg %s READ %s núm"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Lista de logon news está cheia!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4177,146 +3953,132 @@ msgstr ""
 "Nick %s foi bloqueado por %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s é um nick ilegal e não pode ser usado."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s está atualmente em uso."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Nick %s está agora bloqueado."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s é parte dos Services desta Rede."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Nick %s não está em uso no momento."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Nick %s não está sendo usado."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Nick %s não está registrado."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Nick %s não pode ser registrado ou usado."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s não encontrado na lista de Ignore."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s foi truncado para %d caracteres."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "O nick %s não possui nenhum memo seu."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "O nick %s foi desconectado."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s está atualmente suspenso."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s foi liberado."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s foi suspendido."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NÃO registrado, por favor tente novamente mais tarde."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nick %s confirmado"
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "O nick %s foi desregistrado."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "O nick %s já está registrado!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "O nick %s não pode ser registrado."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "O nick %s foi registrado em sua conta: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nick %s registrado."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Registro de nick (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Senha do nick (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4327,161 +4089,116 @@ msgstr ""
 "a expirarem automaticamente, ou seja, eles serão apagados\n"
 "após %d dias sem serem usados."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Não foi encontrado \"#\" em frente ao nome do canal."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Modo NOBOT está agora DESATIVADO no canal %s."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Modo NOBOT está agora ATIVADO no canal %s."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nenhum email listado para %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Sem bot"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Nenhuma ajuda disponível para %s."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Nenhuma informação sobre o módulo %s está disponível."
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Nenhum logon news para remover!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Resultado não encontrado na lista de AOP do %s."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Resultado não encontrado na lista de HOP do %s."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Resultado não encontrado na lista de SOP do %s."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Resultado não encontrado na lista de VOP do %s."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Resultado não encontrado na lista de acesso do %s."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nenhum resultado encontrado na lista de akick do %s."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Nenhum resultado correspondente encontrado na lista do %s."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "Nenhum resultado encontrado na lista de limite de sessões."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Nenhum resultado equivalente na lista de AKILL."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Nenhum resultado equivalente na lista de SNLINE."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Nenhum resultado equivalente na lista de SQLINE."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Nenhum resultado equivalente na lista de SZLINE."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Nenhum memo foi cancelado."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Nenhum módulo carregado atualmente."
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nenhum OperNews para remover!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Nenhum item RandomNews para deletar!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Sem motivo"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Sem assinatura no kick quando a opção SIGNKICK LEVEL estiver em uso"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Entrada (#%d) não encontrada na lista de AOP do %s."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Entrada (#%d) não encontrada na lista de HOP do %s."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Entrada (#%d) não encontrada na lista de SOP do %s."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Entrada (#%d) não encontrada na lista de VOP do %s."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "Nenhuma"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Entrada no canal não permitida"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4493,95 +4210,93 @@ msgstr ""
 "desse canal entrar neste período de tempo) terá\n"
 "automaticamente cancelado o seu registro."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Núm  Limite  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "Op-notice"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "A informação antiga é igual a nova."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Nível Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Opção Op-notice para %s está agora DESATIVADA."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Opção Op-notice para %s está agora ATIVADA."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "OperNews removido #%d."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "OperNews não encontrado #%d!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper News itens:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d registros, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "As Operflags %s foram adicionadas para %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Proteção de OPs"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opção %s não pode ser usada nesta Rede."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Passcode para %s é %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Senha aceita - você está agora reconhecido."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4589,231 +4304,188 @@ msgstr ""
 "Identificação de senha requerida para usar este comando.\n"
 "Tente novamente após digitar /msg %s IDENTIFY senha."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Senha para %s é %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Senha incorreta."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Senha para %s foi enviada."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Paz"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Opção Peace para %s está agora DESATIVADA."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Opção Peace para %s está agora ATIVADA."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr ""
 "Por favor contacte algum Operator para receber um vhost associado a este "
 "nick."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
 "Por favor tente novamente com uma senha mais difícil. Não use TAB ou espaços."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Por favor, use um nome de servidor válido quando estiver \"jupando\"."
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Por favor use o símbolo # quando tentar registrar"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Por favor aguarde %d segundos e tente novamente."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Por favor espere %d segundos antes de usar o comando GROUP novamente."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
 "Por favor espere %d segundos antes de usar o comando REGISTER novamente."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Por favor aguarde %d segundos antes de usar o comando RSEND novamente."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Por favor aguarde %d segundos antes de usar o comando SEND novamente."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Privado"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Modo Privado do bot %s está agora DESATIVADO."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Modo Privado do bot %s está agora ATIVADO."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Opção Private para %s está agora DESATIVADA."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Opção Private para %s está agora ATIVADA."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Proteção"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Proteção de KILL está agora ATIVADA, sem tempo de espera."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Comando fornecido: //msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {list | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [senha]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER canal descrição"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER senha email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER senha [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [senha]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | canal} mensagem"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "RandomNews item #%d deletado."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "RandomNews item #%d não encontrado!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Random News itens:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4821,296 +4493,307 @@ msgstr ""
 "O primeiro passo do registro deve ter expirado, por favor use /msg %s "
 "register <senha> <email> primeiro."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Acesso restrito"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Opção de acesso restrito para %s está agora DESATIVADA."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Opção de acesso restrito para %s está agora ATIVADA."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY canal texto"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | canal} texto"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "Comando SENDPASS não disponível: modo de encriptação ativado."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal opções configurações"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET canal opções parâmetros"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET canal OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET opções parâmetros"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET opção configuração"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE número"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] limite"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [usuário | canal] {limite | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "A lista de SNLINE está vazia."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5118,344 +4801,329 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista}[:"
 "motivo]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Lista de SOP para %s:\n"
-"  Núm  Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "A lista de SQLINE está vazia."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista} "
 "[motivo]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Canal %s não está registrado"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s não está online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND canal motivo"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND canal [motivo]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND canal motivo"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick motivo"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick novonick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "A lista de SZLINE está vazia."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista} "
 "[motivo]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Seguro"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Founder Seguro"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "OPs Seguros"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Opção Secure Founder para %s está agora DESATIVADA."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Opção Secure Founder para %s está agora ATIVADA."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Opção Secure OPs para %s está agora DESATIVADA."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Opção Secure OPs para %s está agora ATIVADA."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Opção Secure para %s está agora DESATIVADA."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Opção Secure para %s está agora ATIVADA."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Segurança"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Este serviço está temporariamente desabilitado, por favor tente novamente "
 "mais tarde"
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services estão agora em DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Services estão agora no modo expira."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Services estão agora no modo não expira."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Services estão agora no modo somente leitura."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Services estão agora no modo leitura e gravação."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Services estão agora no modo debug (nível %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Services estão agora no modo debug."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Services não estão mais no modo debug."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Os services foram configurados para não enviar e-mail."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Lista de Ignore dos Services:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Os Services não conseguiram alterar os modos. Seus servidores estão "
-"configurados corretamente?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Os Services não conseguiram alterar os modos. As U:lines dos seus servidores "
 "estão configuradas corretamente?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Services ativos %d dia, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Services ativos %d dias, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Services ativos %d hora, %d minuto"
+msgid "Services up %d hours, %d minutes"
+msgstr "Services ativos %d horas, %d minutos"
+
+#: modules/core/os_stats.cpp:161
+#, c-format
+msgid "Services up %d minutes, %d seconds"
+msgstr "Services ativos %d minutos, %d segundos"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Services ativos %d hora, %d minutos"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Services ativos %d horas, %d minuto"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Services ativos %d horas, %d minutos"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Services ativos %d minuto, %d segundo"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Services ativos %d minuto, %d segundos"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Services ativos %d minutos, %d segundo"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Services ativos %d minutos, %d segundos"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Arquivos de configuração dos Services foram recarregados."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Seu nick foi derrubado e pode ser usado."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Limite de sessões para %s é agora de %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Opção de limite de sessões desabilitada."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessões       : %6d registros, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessões  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Level %s desconhecido. Digite /msg %s HELP LEVELS DESC para uma lista de "
 "Levels válidos."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "Configuração do DEBUG deve ser ON, OFF, ou um número positivo."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "Configuração do IGNORE deve ser ON ou OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "Opção NOEXPIRE deve ser ON ou OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "Configuração do READONLY deve ser ON ou OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 "Configuração de SuperAdmin deve ser ON ou OFF (deve estar habilitada no "
 "services.conf)."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Opção Signed Kicks para %s está agora DESATIVADA."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Opção Signed Kicks para %s está agora ATIVADA."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5464,215 +5132,185 @@ msgstr ""
 "Opção Signed Kicks para %s está agora ATIVADA, mas depende\n"
 "do nível de acesso do usuário que está usando o comando."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Opção Signed Kicks para %s está agora ATIVADA."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Kicks assinados"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Desculpe, RSEND foi desabilitado nesta rede."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Desculpe, mas o comando ASSIGN está temporariamente desativado."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Desculpe, criação do bot falhou."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Desculpe, comando CHANGE temporariamente desativado."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Desculpe, o comando SET está temporariamente desativado."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Desculpe, a modificação da lista de AOP está temporariamente desabilitada."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr ""
-"Desculpe, a modificação da lista de HOP está temporariamente desabilitada."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr ""
-"Desculpe, a modificação da lista de SOP está temporariamente desabilitada."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr ""
-"Desculpe, a modificação da lista de VOP está temporariamente desabilitada."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Desculpe, o registro de canais está temporariamente desativado."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Desculpe, o comando AKICK está temporariamente desativado."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Desculpe, o comando BADWORDS está temporariamente desatvado."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Desculpe, o comando DROP está temporariamente desativado."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "Desculpe, o comando SET está temporariamente desativado."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Desculpe, o registro de canais está temporariamente desativado."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Desculpe, o comando GROUP falhou."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Desculpe, a identificação falhou."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 "Desculpe, as configurações do kicker estão temporariamente desativadas."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Desculpe, a opção SET está temporariamente desativada."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Desculpe, o envio de memos está temporariamente desabilitado."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Desculpe, o comando DROP está temporariamente desativado."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Desculpe, o comando GROUP está temporariamente desativado."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "Desculpe, a opção SET está temporariamente desativada."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Desculpe, registros de nick estão temporariamente desativados."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Desculpe, registro de nick falhou."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Desculpe, você pode ter apenas %d entradas de AOP/SOP/VOP em um canal."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr ""
+"Desculpe, você pode ter apenas %d entradas na lista de acesso do canal."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Desculpe, você pode ter somente %d entradas em sua lista de acesso."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Desculpe, você pode ter apenas %d entradas na lista de acesso do canal."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Desculpe, você pode ter apenas %d akicks na lista do canal."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Desculpe, você pode ter apenas %d palavrões em sua lista."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Desculpe, você já ultrapassou o limite de %d canais registrados."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "Desculpe, você já alcançou o limite de %d canais registrados."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Resetar estatísticas."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status atualizado (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Pare de floodar!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Pare de ficar repetindo!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Successor do canal %s removido."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Successor do canal %s alterado para %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "Opção SuperAdmin não habilitada no arquivo services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Simbiose"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Modo SYMBIOSIS está agora DESATIVADO no canal %s."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Modo SYMBIOSIS está agora ATIVADO no canal %s."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintaxe: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5699,7 +5337,7 @@ msgstr ""
 "2: ban na forma *!*@host\n"
 "3: ban na forma *!*user@*.domain"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5712,28 +5350,12 @@ msgstr ""
 "Ajusta a descrição para o canal, que são mostradas com\n"
 "os comandos LIST e INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Sintaxe: %s canal ENTRYMSG [mensagem]\n"
-"\n"
-"Ajusta a mensagem na qual será enviada via /notice para\n"
-"os usuários quando eles entrarem no canal. Se nenhum\n"
-"parâmetro é fornecido, nenhuma mensagem será enviada\n"
-"ao se entrar no canal."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Sintaxe: %s canal FOUNDER nick\n"
@@ -5741,7 +5363,7 @@ msgstr ""
 "Muda o fundador do canal. O novo nick deve estar\n"
 "registrado."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5760,80 +5382,7 @@ msgstr ""
 "mesmo depois que os usuários deixarem o canal, e será\n"
 "restaurado na próxima vez que o canal for reutilizado."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Sintaxe: %s canal MLOCK modos\n"
-"\n"
-"Ajusta o parâmetro da trava do modo para um canal. O\n"
-"%S permite que você defina certos modos no canal\n"
-"a serem sempre ativo, desativos ou não travados.\n"
-"Os modos podem ser i, k, l, m, n, p, s, S, t\n"
-"entre outros.\n"
-"\n"
-"O parâmetro modos é usado exatamente do mesmo modo\n"
-"que o comando /MODE, ou seja, modos seguidos de + são\n"
-"travados como ativos, e modos seguidos de - são travados\n"
-"como desativos. Note, no entanto, que ao contrário do\n"
-"comando /MODE, cada uso do SET MLOCK irá remover\n"
-"todos os modos anteriormente travados antes de travar\n"
-"os novos.\n"
-"\n"
-"Cuidado: Se você trava uma senha, como no segundo exemplo\n"
-"abaixo, você deveria também ajustar a opção RESTRICTED para\n"
-"o canal (veja HELP SET RESTRICTED), ou qualquer\n"
-"usuário que entrar no canal que está vazio será capaz de ver a senha!\n"
-"\n"
-"Exemplos:\n"
-"\n"
-"    SET #canal MLOCK +nt-iklps\n"
-"        Trava os modos n e t ativados, e os modos i, k, l, p,\n"
-"        e s desligados. Modo m é livremente deixado para ser\n"
-"        ativo ou desativo (não travado).\n"
-"\n"
-"    SET #canal MLOCK +knst-ilmp minha-senha\n"
-"        Trava os modos k, n, s, t como ligados e os modos i,\n"
-"        l, m, p como desligados. Também trava a senha do canal\n"
-"        como \"minha-senha\".\n"
-"\n"
-"    SET #canal MLOCK +\n"
-"        Elimina a trava do modos; todos os modos do canal\n"
-"        ficam livres para ser ativos ou desativos."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5850,7 +5399,7 @@ msgstr ""
 "o canal sempre que os comandos OP ou DEOP forem usados em um\n"
 "usuário no canal."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5867,7 +5416,7 @@ msgstr ""
 "banir ou remover os modos no canal de um usuário que tenha\n"
 "nível superior ou igual ao seu via comandos do %S."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5912,7 +5461,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5926,13 +5475,13 @@ msgstr ""
 "private está ativada, um /msg %S LIST não irá incluir\n"
 "o canal em qualquer listagem."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Sintaxe: %s canal RESTRICTED {ON|OFF}\n"
@@ -5941,7 +5490,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5960,7 +5509,7 @@ msgstr ""
 "e identificados com sua senha poderão entrar no canal\n"
 "controlado pela lista de acesso."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5978,51 +5527,12 @@ msgstr ""
 "poderá dar DROP no canal, mudar sua senha, seu founder e seu\n"
 "successor, e não aqueles que estiverem identificados no %S."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Sintaxe: %s canal SECUREOPS {ON|OFF}\n"
-"\n"
-"Ativa ou desativa a opção de segurança de ops para um canal.\n"
-"Quando secure ops estiver ativada, os usuários que não\n"
-"estiverem na lista de acesso não poderão ter o status de OP."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Sintaxe: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Habilita ou desabilita a assinatura nos kicks para um\n"
-"canal. Quando o SIGNKICK está habilitado, kicks através\n"
-"do comando %S KICK terão o nick de quem usou o comando\n"
-"no motivo do kick.\n"
-"\n"
-"Se você usar LEVEL, aqueles que tiverem um nível igual ou \n"
-"superior ao nível do SIGNKICK não terão o nick aparecendo no \n"
-"motivo. Veja /msg %S HELP LEVELS para maiores informações. "
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6039,24 +5549,7 @@ msgstr ""
 "(%d), o canal será dropado, como se nenhum sucessor tivesse\n"
 "sido ajustado. O novo nick deverá estar registrado."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintaxe: %s canal TOPICLOCK {ON|OFF}\n"
-"\n"
-"Ativa ou desativa a opção de trava do tópico de um canal.\n"
-"Quando a trava do tópico está ativada, o %S não\n"
-"permitirá a mudança do tópico do canal exceto pelo comando \n"
-"TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6101,10 +5594,11 @@ msgstr ""
 "Entretanto, mudar do sistema de listas xOP para sistema de lista\n"
 "de acesso não causa problemas."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6117,18 +5611,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6187,7 +5685,7 @@ msgstr ""
 "O comando ACCESS CLEAR limpa todas as entradas da lista\n"
 "de acesso."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6235,7 +5733,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mostra a lista de acesso atual."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6247,12 +5745,18 @@ msgstr ""
 "Faz com que o bot faça o mesmo que o comando \"/me\"\n"
 "em um determinado canal com o determinado texto."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6273,15 +5777,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6351,7 +5846,8 @@ msgstr ""
 "O comando AKICK CLEAR limpa todas as entradas da lista\n"
 "de AutoKick."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6359,21 +5855,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6441,7 +5937,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR apaga todas as entradas da lista de AKILL."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6480,7 +5976,7 @@ msgstr ""
 "\n"
 "Canais com a opção NOEXPIRE serão prefixados por uma exclamação."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6499,10 +5995,11 @@ msgstr ""
 "\n"
 "Este uso é limitado aos Administradores dos Services."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6579,7 +6076,7 @@ msgstr ""
 "de acesso, e /msg %S HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6593,7 +6090,8 @@ msgstr ""
 "Você poderá então configurar o bot para o canal de acordo\n"
 "com as suas necessidades."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6625,7 +6123,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6667,7 +6165,7 @@ msgstr ""
 "\n"
 "O comando BADWORDS CLEAR limpa todas entradas da lista."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6683,7 +6181,7 @@ msgstr ""
 "Por padrão, limitado a AOPs ou àqueles com nível de acesso 5 ou\n"
 "superior no canal."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6724,7 +6222,7 @@ msgstr ""
 "seja registrado. Se um usuário não registrado está atualmente\n"
 "usando o nick, ele será killado."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6734,7 +6232,7 @@ msgstr ""
 "\n"
 "Lista todos os bots disponíveis nesta Rede."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6747,7 +6245,7 @@ msgstr ""
 "canal, caso ela ainda não tenha sido lida no momento em que este\n"
 "comando for usado."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6759,7 +6257,7 @@ msgstr ""
 "usa por completo todo o host real ident@host para cada nick;\n"
 "em seguida, força o AKILL."
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6779,7 +6277,7 @@ msgstr ""
 "estiver usando. Se SECRET é especificado, listará apenas canais\n"
 "combinando com o padrão e que tenham modo +s ou +p."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6792,70 +6290,32 @@ msgstr ""
 "foi lido ou não. Observe que isso só funciona com nicks,\n"
 "nunca com canais."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Sintaxe: CLEAR canal opção\n"
-"\n"
-"Diz ao %S para remover certos ajustes de um canal.\n"
-"A opção pode ser uma das seguintes:\n"
-"\n"
-"     MODES    Recoloca todos os modos do canal, isto é, remove\n"
-"                os modos i,k,l,m,n,p,s,t e recoloca os que estão\n"
-"                travados com MLOCK.\n"
-"     BANS     Remove todos os bans do canal.\n"
-"     EXCEPTS  Remove todos os excepts do canal.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Remove o status de Operador de canal (modo +o)\n"
-"                de todos os Operadores do canal. If supported, removes\n"
-"                channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                as well.\n"
-"     HOPS     Remove o status de Half-Operador de canal (modo +h)\n"
-"                de todos os Half-Operadores do canal, se suportado.\n"
-"     VOICES   Remove o status \"voice\" (modo +v) de qualquer\n"
-"                pessoa que tenha esse modo.\n"
-"     USERS    Remove (kicka) todos os usuários do canal.\n"
+"Sintaxe: DEOWNER #canal\n"
 "\n"
-"Por padrão, limitado àqueles que possuem acesso de Founder no canal."
+"Remove seu status de owner no canal.\n"
+"\n"
+"Limitado àqueles que possuem acesso de Founder no canal."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Sintaxe: CLEARMODES canal [ALL]\n"
-"\n"
-"Limpa todos os modos binários (i,k,l,m,n,p,s,t) e bans de um\n"
-"canal. Se ALL é fornecido, limpa também todos os OPs e\n"
-"voices (modos +o e +v) de um canal."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6881,7 +6341,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6893,12 +6353,14 @@ msgstr ""
 "pré-definido de restrições aos Services, útil durante uma\n"
 "tentativa de ataque à Rede."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6915,7 +6377,7 @@ msgstr ""
 "àqueles que possuem nível de acesso 4 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6924,11 +6386,12 @@ msgstr ""
 "Sintaxe: DEL <nick>\n"
 "Deleta o vhost associado ao nick dado."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -6959,22 +6422,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Apaga mensagens numeradas de 2 a 5 e de 7 a 9."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Sintaxe: DELALL <nick>.\n"
 "Deleta o vhost para todos os nicks no mesmo grupo do\n"
 "nick fornecido."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -6988,29 +6454,36 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintaxe: DEOWNER #canal\n"
+"Sintaxe: DEOP #canal [nick]\n"
 "\n"
-"Remove seu status de owner no canal.\n"
+"Remove o status de Operador do nick dado em um determinado\n"
+"canal. Se não for fornecido um nick, o status será removido\n"
+"de você mesmo.\n"
 "\n"
-"Limitado àqueles que possuem acesso de Founder no canal."
+"Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
+"nível de acesso 5 ou superior no canal."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Sintaxe: DEPROTECT #canal [nick]\n"
 "\n"
@@ -7020,12 +6493,14 @@ msgstr ""
 "Por padrão, limitado ao Founder, a SOPs ou àqueles com nível\n"
 "10 ou superior no canal para se auto-desprotegerem."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7042,7 +6517,7 @@ msgstr ""
 "àqueles que possuem nível de acesso 3 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7054,7 +6529,7 @@ msgstr ""
 "Cancela o registro do canal. So poderá ser usado pelo\n"
 "fundador do canal."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7066,9 +6541,10 @@ msgstr ""
 "Cancela o registro de um canal. Somente Administradores dos\n"
 "Services podem cancelar canais que pertencem a outros usuários."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7076,6 +6552,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7092,7 +6572,7 @@ msgstr ""
 "você se identifique usando sua senha (/msg %S HELP IDENTIFY \n"
 "para maiores informações)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7115,8 +6595,8 @@ msgstr ""
 "SEU GRUPO sem nenhum privilégio especial, mas desregistrar\n"
 "QUALQUER nick é restrito aos Administradores dos Services."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7127,7 +6607,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7149,7 +6629,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7198,7 +6678,7 @@ msgstr ""
 "irão degradar a eficácia de funcionamento (\"performance\")\n"
 "dos services."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7214,7 +6694,7 @@ msgstr ""
 "\n"
 "Um motivo pode ser necessário em algumas redes."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7230,7 +6710,7 @@ msgstr ""
 "\n"
 "Em algumas redes, um motivo é necessário."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7245,7 +6725,7 @@ msgstr ""
 "Sempre que este comando for usado, uma mensagem incluindo a pessoa\n"
 "que emitiu o comando e o email no qual foi usado serão gravados."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7255,16 +6735,15 @@ msgstr ""
 "\n"
 "Retorna a key (do modo +k) de um determinado canal."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Sintaxe: GETPASS nick\n"
 "\n"
@@ -7275,14 +6754,14 @@ msgstr ""
 "\n"
 "Este comando não fica disponível quando a encriptação está habilitada."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7306,7 +6785,7 @@ msgstr ""
 "do nick, você deve estar identificado e estar no grupo daquele\n"
 "nick, ou você deve fornecer a senha correta para o nick."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7316,7 +6795,7 @@ msgstr ""
 "\n"
 "Lista todos os nicks do grupo."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7334,7 +6813,7 @@ msgstr ""
 "\n"
 "Este comando é limitado aos Administradores dos Services."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7347,7 +6826,7 @@ msgstr ""
 "Permite que os IRCops enviem mensagens para todos os usuários\n"
 "da Rede. A mensagem será enviada pelo nick %s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7360,7 +6839,7 @@ msgstr ""
 "Este comando permite aos usuários ajustar o vhost do seu\n"
 "nick ATUAL para ser o vhost de todos os nicks no mesmo grupo."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7424,16 +6903,17 @@ msgstr ""
 "\n"
 "Atenção: todos os nicks do grupo terão a mesma senha."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Sintaxe: HALFOP #canal [nick]\n"
 "\n"
@@ -7446,10 +6926,11 @@ msgstr ""
 "àqueles que possuem nível de acesso 4 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7521,7 +7002,7 @@ msgstr ""
 "de acesso, e /msg %S HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7539,9 +7020,20 @@ msgstr ""
 "comando antes de você usá-los. A senha deve ser a mesma que\n"
 "você enviou com o comando REGISTER."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7571,7 +7063,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7592,7 +7084,7 @@ msgstr ""
 "informações sobre a mensagem de entrada e sobre o sucessor\n"
 "do canal também serão mostradas."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7608,7 +7100,7 @@ msgstr ""
 "e a opção ALL é especificada, será mostrado a você toda\n"
 "informação possível; independente de haver opções para esconder."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7624,7 +7116,7 @@ msgstr ""
 "você pode receber. Com o parâmetro, mostra a mesma\n"
 "informação para o canal fornecido."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7651,7 +7143,7 @@ msgstr ""
 "o nick fornecido. Esta derivação do comando é limitada aos\n"
 "Administradores dos Services."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7670,12 +7162,12 @@ msgstr ""
 "você terá informações sobre o bot, como o horário de criação\n"
 "ou número de canais onde ele está."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7686,14 +7178,15 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7710,7 +7203,7 @@ msgstr ""
 "o texto \"Jupado por <nick>\", mostrando o nick de quem mascarou\n"
 "o servidor."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7725,7 +7218,7 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7752,7 +7245,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7774,12 +7267,14 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7817,14 +7312,14 @@ msgstr ""
 "Nota: o acesso a esse comando é controlado pelo ajuste\n"
 "dos níveis de acesso do canal."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7838,7 +7333,25 @@ msgstr ""
 "\n"
 "*** Spam foi kickado do canal #canal pelo %S (Operador (Flood))"
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7856,7 +7369,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7885,7 +7398,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7903,7 +7416,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7927,7 +7440,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7943,7 +7456,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7961,7 +7474,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7979,8 +7492,8 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -7990,17 +7503,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8032,7 +7545,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8056,7 +7569,7 @@ msgstr ""
 "A lista usa o valor de NSListMax como limite do número de\n"
 "itens para exibir a um Operator de uma vez só."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8070,7 +7583,7 @@ msgstr ""
 "Lista todos os canais registrados que combinam com o padrão\n"
 "fornecido. (Canais com opção PRIVATE ativada não serão listados)."
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8110,7 +7623,8 @@ msgstr ""
 "        Lista todos os nicks possuídos por usuários do domínio\n"
 "        bar.org"
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8138,7 +7652,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Sintaxe: LIST padrão [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8168,13 +7681,14 @@ msgstr ""
 "        Lista todos os nicks registrados cujos registros foram\n"
 "        ajustados para não expirar."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8189,11 +7703,11 @@ msgstr ""
 "LIST 2-5,7-9\n"
 "   Lista mensagens numeradas de 2 a 5 e de 7 a 9."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "LOGONNEWS ADD texto"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, fuzzy, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8222,11 +7736,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "LOGONNEWS DEL {núm | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8242,7 +7756,7 @@ msgstr ""
 "dono do nick. Note, entretanto, que ele não pedirá que você se\n"
 "identifique novamente."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8268,12 +7782,13 @@ msgstr ""
 "\n"
 "Comando limitado aos Administradores dos Services."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Sintaxe: MODE canal modos\n"
@@ -8282,7 +7797,34 @@ msgstr ""
 "qualquer canal. Os parâmetros são os mesmos do comando\n"
 "/MODE padrão."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8292,7 +7834,7 @@ msgstr ""
 "\n"
 "Este comando lista informações sobre um módulo carregado."
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8302,7 +7844,7 @@ msgstr ""
 "\n"
 "Lista todos os módulos atualmente carregados."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8314,7 +7856,7 @@ msgstr ""
 "Este comando carrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8326,7 +7868,7 @@ msgstr ""
 "Este comando carrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8337,10 +7879,12 @@ msgstr ""
 "Este comando descarrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8362,7 +7906,7 @@ msgstr ""
 "Nota: O servidor não é checado como um todo\n"
 "pelos Services."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8374,7 +7918,7 @@ msgstr ""
 "Quando você usa este comando, qualquer usuário que faça um /whois\n"
 "em você irá ver seu endereço IP real/encriptado."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8389,7 +7933,7 @@ msgstr ""
 "\"-\". Para remover todas as flags apenas digite um \"-\" em\n"
 "vez de usar alguma flag."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8401,12 +7945,14 @@ msgstr ""
 "Quando você usa este comando, qualquer usuário que faça um /whois\n"
 "em você irá ver o vhost em vez do seu endereço IP real/encriptado."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8420,11 +7966,11 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "OPERNEWS ADD texto"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8453,30 +7999,38 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "OPERNEWS DEL {núm | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Sintaxe: OWNER #canal\n"
+"Sintaxe: OP #canal [nick]\n"
 "\n"
-"Te concede status de owner no canal.\n"
+"Atribui status de Operador ao nick dado em um determinado\n"
+"canal. Se não for fornecido um nick, o status será atribuído\n"
+"a você mesmo.\n"
 "\n"
-"Limitado àqueles que possuem acesso de Founder no canal."
+"Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
+"nível de acesso 5 ou superior no canal."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8489,10 +8043,11 @@ msgstr ""
 "Por padrão, limitado ao Founder, a SOPs ou àqueles com nível\n"
 "10 ou superior no canal para se auto-protegerem."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8565,7 +8120,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8583,11 +8138,11 @@ msgstr ""
 "isso eles não devam ser salvos. Para desligar normalmente,\n"
 "use o comando SHUTDOWN."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "RANDOMNEWS ADD texto"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8609,18 +8164,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "RANDOMNEWS DEL {núm | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8637,7 +8193,7 @@ msgstr ""
 "READ 2-5,7-9\n"
 "   Mostra as mensagens numeradas de 2 a 5 e de 7 a 9."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8683,7 +8239,8 @@ msgstr ""
 "do nick, você deve estar identificado e estar no grupo daquele\n"
 "nick, ou você deve fornecer a senha correta para o nick."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8694,7 +8251,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8725,24 +8282,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8792,15 +8350,15 @@ msgstr ""
 "privilégios em canais. Para maiores informações neste recurso,\n"
 "digite /msg %S HELP GROUP."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8820,7 +8378,7 @@ msgstr ""
 "do nick, você deve estar identificado e estar no grupo daquele\n"
 "nick, ou você deve fornecer a senha correta para o nick."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8834,7 +8392,7 @@ msgstr ""
 "Repare que, para algumas mudanças terem efeito, será necessário\n"
 "que os Services sejam reiniciados."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8846,7 +8404,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8857,7 +8415,7 @@ msgstr ""
 "Sends a codekey to the nickname with the instructions on how to\n"
 "reset their psasword."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8869,13 +8427,14 @@ msgstr ""
 "Salva o banco de dados dos Services e os reinicia.\n"
 "(sai e roda imediatamente o executável)."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8891,23 +8450,25 @@ msgstr ""
 "automática será enviada ao remetente informando-o que o memo\n"
 "foi lido."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -8915,7 +8476,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8927,7 +8488,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8937,7 +8498,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8953,7 +8514,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8976,22 +8537,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9009,7 +8570,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9026,7 +8587,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9040,7 +8601,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9052,17 +8613,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9081,16 +8643,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9104,7 +8666,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9114,13 +8676,14 @@ msgstr ""
 "\n"
 "Faz com que o bot diga determinado texto no canal dado."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sintaxe: SEND {nick | canal} mensagem\n"
@@ -9130,9 +8693,11 @@ msgstr ""
 "receberá um aviso que possui uma nova mensagem. O nick/canal\n"
 "de destino deverá estar registrado."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Sintaxe: SENDALL mensagem\n"
@@ -9140,7 +8705,7 @@ msgstr ""
 "Envia um memo para todos os usuários registrados\n"
 "contendo uma mensagem."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9158,7 +8723,7 @@ msgstr ""
 "\n"
 "Poder ser limitado a Operadores de IRC em algumas redes."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9194,7 +8759,7 @@ msgstr ""
 "o limite de conexões e como especificar limites de conexões\n"
 "para certos hosts e grupos de hosts."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9208,7 +8773,65 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> ajustará idents para\n"
 "usuários, assim como vhosts."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Sintaxe: %s canal SECUREOPS {ON|OFF}\n"
+"\n"
+"Ativa ou desativa a opção de segurança de ops para um canal.\n"
+"Quando secure ops estiver ativada, os usuários que não\n"
+"estiverem na lista de acesso não poderão ter o status de OP."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Sintaxe: %s canal SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Habilita ou desabilita a assinatura nos kicks para um\n"
+"canal. Quando o SIGNKICK está habilitado, kicks através\n"
+"do comando %S KICK terão o nick de quem usou o comando\n"
+"no motivo do kick.\n"
+"\n"
+"Se você usar LEVEL, aqueles que tiverem um nível igual ou \n"
+"superior ao nível do SIGNKICK não terão o nick aparecendo no \n"
+"motivo. Veja /msg %S HELP LEVELS para maiores informações. "
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintaxe: %s canal TOPICLOCK {ON|OFF}\n"
+"\n"
+"Ativa ou desativa a opção de trava do tópico de um canal.\n"
+"Quando a trava do tópico está ativada, o %S não\n"
+"permitirá a mudança do tópico do canal exceto pelo comando \n"
+"TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9219,6 +8842,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9241,7 +8865,7 @@ msgstr ""
 "Aviso: o acesso a este comando é controlado pelo ajuste\n"
 "dos níveis de acesso do canal."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9252,7 +8876,7 @@ msgstr ""
 "Esta opção previne um bot de ser associado a um canal\n"
 "por usuários que não sejam Operadores de IRC."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9268,7 +8892,7 @@ msgstr ""
 "\n"
 "Opções disponíveis:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9282,7 +8906,7 @@ msgstr ""
 "Quando estiver ativado, os OPs não serão kickados pelo bot,\n"
 "mesmo se eles não se enquadram no nível de NOKICK."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9296,7 +8920,7 @@ msgstr ""
 "Quando estiver ativado, os voices não serão kickados pelo bot,\n"
 "mesmo se eles não se enquadram no nível de NOKICK."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9329,7 +8953,7 @@ msgstr ""
 "do comando usado (por exemplo, para usar !op, o \n"
 "usuário deve ter acesso aos comandos OP e DEOP)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9345,7 +8969,22 @@ msgstr ""
 "entrada dos usuários quando eles entrarem no\n"
 "canal, caso tenham nível de acesso suficiente."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9360,7 +8999,7 @@ msgstr ""
 "canal, este será automaticamente desassociado quando você\n"
 "ativar essa opção."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9373,7 +9012,7 @@ msgstr ""
 "Ajustando para ON, evita que o canal seja desregistrado\n"
 "por passar do tempo de expiração."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9391,25 +9030,17 @@ msgstr ""
 "mudanças de modos, kicks e, inclusive, a mensagem\n"
 "de entrada (entrymsg)."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Sintaxe: SET opção parâmetros\n"
-"\n"
-"Ajusta várias opções de nick. A opção pode ser:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9426,7 +9057,17 @@ msgstr ""
 "Digite /msg %S HELP SET opção, para mais informações sobre\n"
 "uma opção específica."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Sintaxe: SET opção parâmetros\n"
+"\n"
+"Ajusta várias opções de nick. A opção pode ser:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9436,7 +9077,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Sintaxe: SET opção seleção\n"
@@ -9451,7 +9091,7 @@ msgstr ""
 "    IGNORE      Ativa ou desativa o modo Ignore\n"
 "    LIST        Lista as opções atuais"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9463,31 +9103,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Sintaxe: SET DEBUG {ON | OFF | número}\n"
-"\n"
-"Ativa ou desativa o modo de depuração (debug). No modo de\n"
-"depuração, todos os dados enviados para os Services e vindos\n"
-"deles, assim como um número de outras mensagens de depuração\n"
-"são enviadas a um arquivo de log. Se número é fornecido,\n"
-"o modo de depuração é ativado, com nível de depuração ajustado\n"
-"para número.\n"
-"\n"
-"Esta opção é equivalente à opção da linha de comando\n"
-"-debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9499,7 +9115,7 @@ msgstr ""
 "Altera o display usado como referência ao nome do seu grupo \n"
 "nos Services. O novo display DEVE ser um nick do seu grupo."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9517,7 +9133,7 @@ msgstr ""
 "nick ou o mesmo seje inválido, não será possível recuperar\n"
 "a senha perdida."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9532,7 +9148,7 @@ msgstr ""
 "de entrada que aparecerá sempre quando você entrar em um canal\n"
 "que tenha a opção GREET habilitada, e também tenha acesso a isto."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9555,19 +9171,8 @@ msgstr ""
 "O segundo parâmetro especifica quando a informação deve ser\n"
 "mostrada (OFF) ou escondida (ON)."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Sintaxe: SET IGNORE {ON | OFF}\n"
-"\n"
-"Ajustando esta opção, fará os Services usarem ou não o sistema\n"
-"de IGNORE."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9581,7 +9186,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Sintaxe: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9599,7 +9204,7 @@ msgstr ""
 "não usar essa opção, a não ser que seja necessário. Pode\n"
 "acontecer do Administrador da Rede desabilitar essa opção."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9618,7 +9223,7 @@ msgstr ""
 "já que Inglês é a linguagem oficial destes Services.\n"
 "O número deve ser escolhido da seguinte lista de línguas:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9635,7 +9240,7 @@ msgstr ""
 "mensagens para você. Entretanto, você não pode ajustar este\n"
 "limite para mais que %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9677,7 +9282,7 @@ msgstr ""
 "podem ajustar o limite acima de %d, e não podem ajustar\n"
 "um limite máximo (HARD)."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9687,7 +9292,7 @@ msgstr ""
 "\n"
 "Exibe as várias configurações do %S."
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9701,10 +9306,11 @@ msgstr ""
 "comunicar com você. Com MSG acionado, os Services irão usar\n"
 "mensagems, caso contrário, usarão notices. "
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9719,7 +9325,7 @@ msgstr ""
 "Esta opção é equivalente à opção da linha de comando\n"
 "-noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9756,7 +9362,7 @@ msgstr ""
 "\n"
 "ON é essencialmente a combinação de LOGON e NEW."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9767,7 +9373,7 @@ msgstr ""
 "\n"
 "Muda a senha de seu nick."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9786,7 +9392,7 @@ msgstr ""
 "o comando %S's LIST. (Entretando, alguém que sabe do seu\n"
 "nick ainda pode obter informações usando o comando INFO)."
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9817,16 +9423,16 @@ msgstr ""
 "Esta opção é equivalente à opção da linha de comando\n"
 "-readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9840,7 +9446,7 @@ msgstr ""
 "lista de acesso, o %S não irá dar auto-kill em você de\n"
 "acordo com os ajustes da opção KILL."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9855,14 +9461,15 @@ msgstr ""
 "Esta opção não é permanente, e deve ser usada somente quando\n"
 "necessária, e desativada quando não for mais necessária."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Sintaxe: SETALL <nick> <hostmask>.\n"
@@ -9873,7 +9480,7 @@ msgstr ""
 "* NOTA: isto não irá atualizar o vhost de nenhum nick\n"
 "adicionado ao grupo depois que o comando foi usado."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9883,10 +9490,11 @@ msgstr ""
 "\n"
 "Salva o banco de dados dos Services e os desliga."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -9922,7 +9530,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -9973,10 +9581,11 @@ msgstr ""
 "\n"
 "SNLINE CLEAR apaga todas as entradas da lista de SNLINE."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10050,7 +9659,8 @@ msgstr ""
 "de acesso, e /msg %S HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10066,31 +9676,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10139,21 +9749,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR apaga todas as entradas da lista de SQLINE."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10163,9 +9759,11 @@ msgstr ""
 "Exibe todos os nicks da Staff dos Services juntamente com seus\n"
 "níveis e status on-line."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Sintaxe: STAFF mensagem\n"
@@ -10173,7 +9771,7 @@ msgstr ""
 "Envia um memo a todos os membros da Staff dos Services\n"
 "contendo uma mensagem."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10219,7 +9817,7 @@ msgstr ""
 "A opção RESET reinicia a contagem do máximo de usuários\n"
 "para o número de usuários atualmente conectados na rede."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10243,12 +9841,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR mensagem-de-erro"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10286,7 +9885,7 @@ msgstr ""
 "Até 16 nicks podem ser enviados com cada comando; o resto será\n"
 "ignorado. Se nenhum nick for fornecido, seu status será exibido."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10304,7 +9903,7 @@ msgstr ""
 "\n"
 "Um motivo pode ser necessário em algumas redes."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10314,7 +9913,8 @@ msgstr ""
 "\n"
 "Força a mudança do nick de um usuário, de nick a novo-nick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10327,31 +9927,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10401,7 +10001,7 @@ msgstr ""
 "\n"
 "SZLINE CLEAR apaga todas as entradas da lista de SZLINE."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10424,7 +10024,7 @@ msgstr ""
 "\n"
 "Por padrão, limitado àqueles que possuem acesso de Founder no canal."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10438,7 +10038,7 @@ msgstr ""
 "modos de usuário para qualquer usuário. Os parâmetros\n"
 "são os mesmos do comando /MODE padrão."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10456,7 +10056,7 @@ msgstr ""
 "sempre poder associá-lo àquele canal mais tarde sem ter que\n"
 "configurar tudo novamente."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10475,7 +10075,7 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10493,7 +10093,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10505,7 +10105,7 @@ msgstr ""
 "Libera um canal suspenso. Todos os dados e configurações\n"
 "são preservados de antes da suspensão."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10517,7 +10117,7 @@ msgstr ""
 "Faz com que os Services atualizem o banco de dados logo que\n"
 "você envia este comando."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10540,12 +10140,14 @@ msgstr ""
 "estiver usando. Se INVISIBLE é especificado, listará apenas usuários\n"
 "que tenham o modo +i."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10562,10 +10164,11 @@ msgstr ""
 "àqueles que possuem nível de acesso 3 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10637,7 +10240,7 @@ msgstr ""
 "de acesso, e /msg %S HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10653,7 +10256,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10661,7 +10264,7 @@ msgstr ""
 "Sintaxe: SUSPEND nick motivo\n"
 "SUSPENDE um nick, impedindo-o de ser usado."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10669,7 +10272,7 @@ msgstr ""
 "Sintaxe: UNSUSPEND nick\n"
 "LIBERA um nick suspendido, permitindo que seja usado."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10681,144 +10284,145 @@ msgstr ""
 "seta modos de canal necessários (ModeonID) e atualiza seu\n"
 "vHost e suas flags de usuário (Último horário visto etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [tópico]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "O comando IMMED não está disponível nesta Rede."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "Lista de AKILL apagada."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "O Nível do Defcon está agora no Nível: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "A lista de SNLINE foi apagada."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "A lista de SQLINE foi apagada."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "A lista de SZLINE foi apagada."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "O canal %s não tem key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Os seguintes nomes de recursos/funções são entendidos.\n"
 "Note que os níveis para AUTODEOP e NOJOIN são os níveis\n"
 "máximos, enquanto que todos os outros são níveis mínimos."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "O host %s possui atualmente %d sessões com um limite de %d."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "O último memo que você enviou para %s (enviado em %s) foi lido."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "O último memo que você enviou para %s (enviado em %s) ainda não foi lido."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "O limite de memos para %s não pode ser mudado."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "O novo display é agora %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "O nick %s está sendo alterado para %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Existem %d memos para o canal %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10826,7 +10430,7 @@ msgstr ""
 "Não existem bots disponíveis no momento.\n"
 "Peça a um Administrador dos Services para criar mais bots!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10836,12 +10440,12 @@ msgstr ""
 "Digite /msg %s HELP GLIST e /msg %s HELP DROP para\n"
 "mais informações."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Existe %d memo para o canal %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10849,28 +10453,28 @@ msgstr ""
 "Foi recebido um novo memo para o canal %s.\n"
 "Digite /msg %s READ %s %d para ler."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Não possui mais nenhum bot associado ao canal %s."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Não existem logon news."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Não existe nenhum oper news."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Não há RandomNews."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Não há endereço de email ajustado para o seu nick."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10886,39 +10490,35 @@ msgstr ""
 "    PRIVATE          Previne um bot de ser associado por\n"
 "                       quem não é Operador de IRC."
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Este canal foi forbidado."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Este canal foi registrado com o %s."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Este canal foi suspenso."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Este canal não pode ser usado."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Este canal não irá expirar."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 msgstr ""
 "Esse nick já foi solicitado, por favor verifique seu e-mail pelo passcode"
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -10926,7 +10526,7 @@ msgstr ""
 "Esse nick está aguardando um código de verificação por e-mail antes de "
 "completar o registro."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -10934,20 +10534,20 @@ msgstr ""
 "Este nick foi registrado por outra pessoa.  Por favor escolha outro.\n"
 "(Se este for seu nick, digite /msg %s IDENTIFY senha.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Este nick é registrado; você não pode usá-lo."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Este nick está atualmente suspenso"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Este nick está atualmente suspenso, motivo: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -10957,15 +10557,15 @@ msgstr ""
 "nick, digite /msg %s IDENTIFY senha.  Caso contrário,\n"
 "por favor escolha outro nick."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Este nick não pode ser usado.  Por favor escolha outro."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Este nick não irá expirar."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10973,44 +10573,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Trava de tópico"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Retenção de tópico"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Trava de tópico para %s está agora DESATIVADA."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Trava de tópico para %s está agora ATIVADA."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Retenção de tópico para %s está agora DESATIVADA."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Retenção de tópico para %s está agora ATIVADA."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Desligue o CAPS LOCK!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Digite /msg %S HELP comando para ajuda em qualquer um\n"
@@ -11020,7 +10611,7 @@ msgstr ""
 "    em um canal pode ler os memos do canal. Isso pode ser mudado\n"
 "    com o comando %s LEVELS."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11030,7 +10621,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11038,7 +10629,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11046,7 +10637,7 @@ msgstr ""
 "Digite /msg %S HELP SET opção para maiores informações\n"
 "sobre uma opção em particular."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11056,127 +10647,108 @@ msgstr ""
 "Sua privacidade é respeitada; seu e-mail não será dado\n"
 "para terceiros."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Digite /msg %s LIST NEW para listar."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Digite /msg %s READ %d para ler."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Digite /msg %s READ LAST para ler."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modos"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canal"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nick"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Impossível carregar o módulo %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Impossível remover o módulo %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Opção SET desconhecida: %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opção STATS desconhecida: %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Comando desconhecido: %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Comando desconhecido %s. Digite /msg %s HELP para ajuda."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Modo %c desconhecido e ignorado."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opção desconhecida: %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Opção desconhecida: %s.\n"
-"Digite /msg %S HELP KICK para maiores informações."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Opção desconhecida: %s.\n"
 "Digite /msg %S HELP SET para maiores informações."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Atualizando banco de dados."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "Usuário %s não encontrado na DB do NickServ."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Usuários      : %6d registros, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11184,11 +10756,11 @@ msgstr ""
 "Usuário que usava seu nick foi derrubado.\n"
 "/msg %s RELEASE %s para liberar seu nick antes de %s."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "Usuário combina com Except do canal."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11196,102 +10768,118 @@ msgstr ""
 "Lista de usuários:\n"
 "Nick                 Máscara"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Proteção de Voices"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Lista de VOP para %s:\n"
-"  Núm  Nick"
+"Atenção: Você ultrapassou seu número máximo de memos (%d). Não será possível "
+"receber novos memos enquanto você não apagar alguns."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Proteção de Voices"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Atenção: Você atingiu seu número máximo de memos (%d). Não será possível "
+"receber novos memos enquanto você não apagar alguns."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Cuidado com suas palavras!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Você já é um membro do grupo %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Você já está identificado."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Você não é mais um Super-Admin"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Você não tem permissão para permanecer neste canal."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Você não tem permissão para mudar seu limite de memos."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Você é agora um Super-Admin"
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Você agora é um Operador de IRC."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
 msgstr "You are now identified for your nick "
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Você é agora um membro do grupo %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Você não pode pedir uma notificação ao enviar uma mensagem a si próprio."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Você não pode usar o comando GHOST em si mesmo!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr ""
+"Impossível fazer logout em %s porque ele é um Administrador dos Services."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Você não pode usar o comando RECOVER em si mesmo!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11301,7 +10889,7 @@ msgstr ""
 "Ao invés, use os comandos VOP, HOP, AOP e SOP.\n"
 "Digite /msg %s HELP comando para mais informação."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11311,7 +10899,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11319,66 +10907,66 @@ msgstr ""
 "Você não pode usar este comando. Ao invés, use o comando ACCESS.\n"
 "Digite /msg %s HELP ACCESS para mais informação."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Você não pode colocar o limite de memos para %s maior que %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Você não pode colocar seu limite de memos maior que %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Você não pode remover o e-mail nesta Rede."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Você possui atualmente %d memos, dos quais %d não foram lidos."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Você possui atualmente %d memos, dos quais 1 não foi lido."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Você possui atualmente %d memos."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Você possui atualmente %d memos; dos quais nenhum foi lido."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Você possui atualmente 1 memo, e este ainda não foi lido."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Você possui atualmente 1 memo."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Você não possui nenhum memo atualmente."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Você tem %d novos memos."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Você tem 1 novo memo."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11386,33 +10974,37 @@ msgstr ""
 "Você recebeu um novo memo de %s.\n"
 "Digite /msg %s READ %d para ler."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Você não está mais banido do %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Você não possui limite de memos que pode guardar."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Você não possui memos."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Você não possui novos memos."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Você precisa digitar um número válido como tempo."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11420,25 +11012,17 @@ msgstr ""
 "Você precisa primeiro associar um bot ao canal antes de usar este comando.\n"
 "Digite /msg %S HELP ASSIGN para maiores informações."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "Você deve ser no mínimo um operador para registrar o canal."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Você deve estar conectado há mais de %d segundos para registrar seu nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Você deve travar o modo +i para poder travar o modo +K."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Você deve travar o modo +l para poder travar o modo +L."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11448,41 +11032,41 @@ msgstr ""
 "Este e-mail permitirá que você receba sua senha por ele\n"
 "caso você se esqueça dela."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Você será notificado de novos memos quando conectar e quando eles forem "
 "enviados."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Você será notificado de novos memos quando conectar."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Você será notificado de novos memos quando eles forem enviados."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Você não poderá mais receber memos."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "Você não será mais notificado por email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Você será notificado de novos memos."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "Você será notificado sobre novos memos por email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11490,34 +11074,54 @@ msgstr ""
 "Seu IRCD não suporta vIdent's, se isto não está certo, por favor reporte "
 "isso como um possível bug."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Sua lista de acesso está vazia."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "Lista de akick do %s vazia."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Lista de Ignore dos Services vazia."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Seu limite de memos foi desativado."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Seu limite de memo é agora de %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Seu limite de memos é de %d, e não pode ser alterado."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Seu limite de memos é de %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Seu limite de memos é de 0; você não pode receber novos memos."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11525,178 +11129,733 @@ msgstr ""
 "Seu limite de memos é de 0; você não pode receber novos memos. Você não pode "
 "alterar esse limite."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Seu nick foi desconectado."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Seu nick já está registrado; digite /msg %s DROP primeiro."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Seu nick não está registrado."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "O registro do seu nick foi cancelado."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Seu nick está sendo mudado para %s."
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Seu passcode foi re-enviado para %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Sua senha é %s - guarde ela para uso posterior."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Your password is too long. Please try again with a shorter password."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Seu vhost %s está agora ativado."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Seu vhost %s@%s está agora ativado."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Logon News - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Oper News - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Random News - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "desativado"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "não expira"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "ativado"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "irá expirar na próxima atualização do banco de dados"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "expira em %d dia"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "expira em %d dias"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expira em %d hora, %d minuto"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expira em %d hora, %d minutos"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expira em %d horas, %d minuto"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expira em %d horas, %d minutos"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "expira em %d minuto"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expira em %d minutos"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost para %s removido."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost de %s ajustado para %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost de %s ajustado para %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost do grupo %s ajustado para %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost do grupo %s ajustado para %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts do grupo %s foi removido."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "Sistema de acesso xOP"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "Sistema de acesso xOP para %s está agora DESATIVADO."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "Sistema de acesso xOP para %s está agora ATIVADO."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | canal} texto"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s adicionado à lista de AOP do %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s adicionado à lista de HOP do %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s adicionado à lista de SOP do %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s adicionado à lista de VOP do %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s deletado da lista de HOP do %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s deletado da lista de SOP do %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s deletado da lista de VOP do %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s movido para a lista de HOP do %s."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s movido para a lista de SOP do %s."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s movido para a lista de VOP do %s."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "Nick %s não encontrado na lista de HOP do %s."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "Nick %s não encontrado na lista de SOP do %s."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "Nick %s não encontrado na lista de VOP do %s."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr "    PRIVATE    Previne seu nick de aparecer em um /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d dias"
+
+#~ msgid "%d hours"
+#~ msgstr "%d horas"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d minutos"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d segundos"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "Lista de HOP do canal %s está vazia."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "Lista de SOP do canal %s está vazia."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "Lista de VOP do canal %s está vazia."
+
+#~ msgid "1 day"
+#~ msgstr "1 dia"
+
+#~ msgid "1 hour"
+#~ msgstr "1 hora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuto"
+
+#~ msgid "1 second"
+#~ msgstr "1 segundo"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Permitido o uso do comando CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Permitido o uso dos comandos HALFOP/DEHALFOP"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Lista de HOP do canal %s foi limpa."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Lista de SOP do canal %s foi limpa."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Lista de VOP do canal %s foi limpa."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "Deletadas %d entradas da lista de HOP do %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "Deletadas %d entradas da lista de SOP do %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "Deletadas %d entradas da lista de VOP do %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "Deletada 1 entrada da lista de HOP do %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "Deletada 1 entrada da lista de SOP do %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "Deletada 1 entrada da lista de VOP do %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "E-mail removido."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Fim da listagem."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Mensagem de entrada para o canal %s removida."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Bot não está no canal %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "  Mensagem de entrada: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Lista de acesso para %s está vazia."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Lista de acesso para %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Mensagem de entrada para o canal %s alterada."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Modo Fantasia está agora DESATIVADO no canal %s."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Modo mensagem de entrada está agora DESATIVADO no canal %s."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista de HOP para %s:\n"
+#~ "  Núm  Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Erro interno - não foi possível processar seu pedido."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Logon news removido #%d."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Registro de nick (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Senha do nick (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Não foi encontrado \"#\" em frente ao nome do canal."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Modo NOBOT está agora DESATIVADO no canal %s."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Resultado não encontrado na lista de HOP do %s."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Resultado não encontrado na lista de SOP do %s."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Resultado não encontrado na lista de VOP do %s."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Entrada (#%d) não encontrada na lista de AOP do %s."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Entrada (#%d) não encontrada na lista de HOP do %s."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Entrada (#%d) não encontrada na lista de SOP do %s."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Entrada (#%d) não encontrada na lista de VOP do %s."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Opção Op-notice para %s está agora DESATIVADA."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Opção Peace para %s está agora DESATIVADA."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Por favor aguarde %d segundos antes de usar o comando SEND novamente."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Modo Privado do bot %s está agora DESATIVADO."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Opção Private para %s está agora DESATIVADA."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Proteção de KILL está agora ATIVADA, sem tempo de espera."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER senha [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Opção de acesso restrito para %s está agora DESATIVADA."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista de SOP para %s:\n"
+#~ "  Núm  Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Canal %s não está registrado"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND canal [motivo]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Opção Secure Founder para %s está agora DESATIVADA."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Opção Secure OPs para %s está agora DESATIVADA."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Opção Secure para %s está agora DESATIVADA."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Os Services não conseguiram alterar os modos. Seus servidores estão "
+#~ "configurados corretamente?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Services ativos %d dia, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Services ativos %d hora, %d minuto"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Services ativos %d hora, %d minutos"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Services ativos %d horas, %d minuto"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Services ativos %d minuto, %d segundo"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Services ativos %d minuto, %d segundos"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Services ativos %d minutos, %d segundo"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Opção Signed Kicks para %s está agora DESATIVADA."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Desculpe, a modificação da lista de HOP está temporariamente desabilitada."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Desculpe, a modificação da lista de SOP está temporariamente desabilitada."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Desculpe, a modificação da lista de VOP está temporariamente desabilitada."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr ""
+#~ "Desculpe, você pode ter apenas %d entradas de AOP/SOP/VOP em um canal."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Modo SYMBIOSIS está agora DESATIVADO no canal %s."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "RANDOMNEWS ADD texto"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR canal opção"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "OPERNEWS ADD texto"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Sintaxe: SET DEBUG {ON | OFF | número}\n"
+#~ "\n"
+#~ "Ativa ou desativa o modo de depuração (debug). No modo de\n"
+#~ "depuração, todos os dados enviados para os Services e vindos\n"
+#~ "deles, assim como um número de outras mensagens de depuração\n"
+#~ "são enviadas a um arquivo de log. Se número é fornecido,\n"
+#~ "o modo de depuração é ativado, com nível de depuração ajustado\n"
+#~ "para número.\n"
+#~ "\n"
+#~ "Esta opção é equivalente à opção da linha de comando\n"
+#~ "-debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Sintaxe: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Trava de tópico para %s está agora DESATIVADA."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Retenção de tópico para %s está agora DESATIVADA."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Comando desconhecido: %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Opção desconhecida: %s.\n"
+#~ "Digite /msg %S HELP KICK para maiores informações."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "Usuário %s não encontrado na DB do NickServ."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Lista de VOP para %s:\n"
+#~ "  Núm  Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Bot %s foi removido."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[Auto-Memo] O memo que você enviou para %s foi lido."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[Auto-Memo] O memo que você enviou para %s foi lido."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Último memo enviado para %s foi cancelado."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Seu vhost %s está agora ativado."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Bot %s foi removido."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "Sistema de acesso xOP para %s está agora DESATIVADO."
diff --git a/lang/anope.ru_RU.po b/language/anope.ru_RU.po
index 7d2a09476..9e1b4773c 100644
--- a/lang/anope.ru_RU.po
+++ b/language/anope.ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 21:10-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "/msg %s HELP %s äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -38,7 +38,7 @@ msgstr ""
 "Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè ïî êàêîé-ëèáî êîìàíäå èñïîëüçóéòå:\n"
 "/msg %S HELP êîìàíäà."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -57,14 +57,15 @@ msgstr ""
 "èíôîðìàöèè ïî êîíêðåòíîé êîìàíäå, íàïèøèòå\n"
 "/msg  %S HELP êîìàíäà."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S ïîçâîëÿåò âàì ðåãèñòðèðîâàòü êàíàë è óïðàâëÿòü åãî ðàçëè÷íûìè\n"
@@ -78,12 +79,12 @@ msgstr ""
 "/msg %S HELP êîìàíäà\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -99,122 +100,106 @@ msgstr ""
 "\n"
 "Ñïèñîê êîìàíä %S:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s èçìåíèë óðîâåíü DEFCON íà %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s óñïåøíî äîáàâëåí â AOP'û êàíàëà %s."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s óñïåøíî äîáàâëåí â HOP'û êàíàëà %s."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s óñïåøíî äîáàâëåí â SOP'û êàíàëà %s."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s óñïåøíî äîáàâëåí â VOP'û êàíàëà %s."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s äîáàâëåí â ñïèñîê äîñòóïà êàíàëà %s ñ óðîâíåì äîñòóïà %d."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê àâòîêèêîâ êàíàëà %s."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê ïëîõèõ ñëîâ êàíàëà %s."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê AKILL'îâ."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SNLINE'îâ."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SQLINE'îâ."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SZLINE'îâ."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåðæèòñÿ â ñïèñêå ïëîõèõ ñëîâ êàíàëà %s."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "Çàïèñü âèäà %s óæå ïðèñóòñòâóåò â ñïèñêå àâòîêèêîâ êàíàëà %s."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "Çàïèñü âèäà %s óæå ïðèñóòñòâóåò â ñïèñêå AKILL'îâ."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "Çàïèñü âèäà %s óæå ïðèñóòñòâóåò â ñïèñêå èñêëþ÷åíèé èç ëèìèòà ñåññèé."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåðæèòñÿ â ñïèñêå SNLINE'îâ."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåðæèòñÿ â ñïèñêå SQLINE'îâ."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåðæèòñÿ â ñïèñêå SZLINE'îâ."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "Çíà÷åíèå âèäà %s íå ìîæåò áûòü èñïîëüçîâàíî êàê êîë-âî êèêîâ äî áàíà."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s ïðèíóäèòåëüíî èçìåíèë âàøè ïîëüçîâàòåëüñêèå ðåæèìû."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -223,134 +208,115 @@ msgstr ""
 "Ñïèñîê êàíàëîâ ïîëüçîâàòåëÿ %s:\n"
 "Èìÿ            Ïîñåòèòåëåé Ðåæèìû  Òîïèê"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s óñïåøíî óäàëåí èç AOP'îâ êàíàëà %s."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s óñïåøíî óäàëåí èç ñïèñêà HOP'îâ êàíàëà %s."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s óñïåøíî óäàëåí èç SOP'îâ êàíàëà %s."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s óñïåøíî óäàëåí èç VOP'îâ êàíàëà %s."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "Íèê %s óñïåøíî óäàëåí èç ñïèñêà äîñòóïà êàíàëà %s."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "Çàïèñü âèäà %s óäàëåíà èç ñïèñêà àâòîêèêîâ êàíàëà %s."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà ïëîõèõ ñëîâ êàíàëà %s."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà èñêëþ÷åíèé ëèìèòà ñåññèé."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà AKILL'îâ."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SNLINE'îâ."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SQLINE'îâ."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SZLINE'îâ."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "Ìàñêà âèäà %s óñïåøíî óäàëåíà èç âàøåãî ñïèñêà äîñòóïà."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "Óðîâåíü äîñòóïà ê %s íà êàíàëå %s îòêëþ÷åí."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s èìååò ñëèøêîì ìíîãî çàðåãèñòðèðîâàííûõ êàíàëîâ."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr ""
 "Óêàçàííàÿ ìàñêà âèäà %s ñîâïàäàåò ñ îäíîé èç ìàñîê â ñïèñêå AKILL'îâ: %s."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "×èñëî %s íå ÿâëÿåòñÿ âàëèäíûì íîìåðîì øàáëîíà áàíìàñêè."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr ""
 "Óêàçàííûé ïàðàìåòð %s íå ÿâëÿåòñÿ íèêîì áîòà èëè çàðåãèñòðèðîâàííûì êàíàëîì."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "Email-àäðåñ âèäà %s íå ÿâëÿåòñÿ ïðàâèëüíûì ýëåêòðîííîé ïî÷òû."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "Áëîêèðîâêà áàíìàñêè %s íà êàíàëå %s ñíÿòà."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "Ïîëüçîâàòåëü %s íå ïðèñóòñòâóåò â äàííûé ìîìåíò íà êàíàëå %s"
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "Áëîêèðîâêà áàíìàñêè %s íà êàíàëå %s àêòèâèðîâàíà."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "Íèê %s â ñïèñêå èãíîðèðóåìûõ íå îáíàðóæåí."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, fuzzy, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -359,107 +325,72 @@ msgstr ""
 "Îäíà èç ìàñîê â ñïèñêå èñêëþ÷åíèé êàíàëà ñîâïàäàåò ñ õîñòìàñêîé ïîëüçîâàòåëÿ "
 "%s. ×òî áû çàáàíèòü åãî, âû äîëæíû óäàëèòü èñêëþ÷åíèÿ."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s ïåðåìåùåí â AOP'û êàíàëà %s."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s ïåðåìåùåí â HOP'û êàíàëà %s."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s ïåðåìåùåí â SOP'û êàíàëà %s."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s ïåðåìåùåí â VOP'û êàíàëà %s."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "Íèê %s â ñïèñêå AOP'îâ êàíàëà %s íå îáíàðóæåí."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "Íèê %s â ñïèñêå HOP'îâ êàíàëà %s íå îáíàðóæåí."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "Íèê %s â ñïèñêå SOP'îâ êàíàëà %s íå îáíàðóæåí."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "Íèê %s â ñïèñêå VOP'îâ êàíàëà %s íå îáíàðóæåí."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "Íèê %s â ñïèñêå äîñòóïà êàíàëà %s íå îáíàðóæåí."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàðóæåíà."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå ïëîõèõ ñëîâ êàíàëà %s íå îáíàðóæåíà."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "Õîñò âèäà %s â ñïèñêå ñåññèé íå ÷èñëèòñÿ."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå èñêëþ÷åíèé èç ëèìèòà ñåññèé íå îáíàðóæåíà."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå AKILL'îâ íå îáíàðóæåíà."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå SNLINE'îâ íå îáíàðóæåíà."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå SQLINE'îâ íå îáíàðóæåíà."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå SZLINE'îâ íå îáíàðóæåíà."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "Ìàñêà âèäà %s íå íàéäåíà â âàøåì ñïèñêå äîñòóïà."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "Ìàñêà âèäà %s óñïåøíî óäàëåíà èç âàøåãî ñïèñêà äîñòóïà."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -468,34 +399,34 @@ msgstr ""
 "Ñïèñîê ïîëüçîâàòåëåé êàíàëà %s:\n"
 "Íèê                  Ìàñêà"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "Íèê %s óñïåøíî óäàëåí èç ñïèñêà èãíîðèðîâàíèÿ."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "Íèê %s äîáàâëåí â ñïèñîê èãíîðèðîâàíèÿ, ïðîäîëæèòåëüíîñòü èãíîðà: %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr ""
 "Íèê %s äîáàâëåí â ñïèñîê èãíîðèðîâàíèÿ, ïðîäîëæèòåëüíîñòü èãíîðà: ïîñòîÿííî."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Ïðèìå÷àíèå: âñå êîìàíäû %S'ó çàïèñûâàþòñÿ â ëîã!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr ""
 "Ïðèìå÷àíèå: ñåé÷àñ ñåðâèñû ðàáîòàþò â ðåæèìå read-only (òîëüêî-÷òåíèå), "
 "íèêàêèå èçìåíåíèÿ ñîõðàíåíû ÍÅ áóäóò!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -503,11 +434,11 @@ msgstr ""
 "Ïîìíèòå: AKILL-çàïèñü áàçèðóåòñÿ íà ìàñêå âèäà èäåíò@õîñò, "
 "èñïîëüçîâàíèå íèêà â êà÷åñòâå ìàñêè íåäîïóñòèìî!"
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Ïîìíèòå: ñïèñîê SZLINE'îâ ìîæåò ñîäåðæàòü òîëüêî IP-ìàñêè!"
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -550,43 +481,39 @@ msgstr ""
 "ïî ñâîåìó âêóñó. Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè î íàñòðîéêå óðîâíåé\n"
 "äîñòóïà ñì. /msg %S HELP LEVELS."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Âíèìàíèå: âû ïðåâûñèëè ëèìèò ìàêñèìàëüíî äîïóñòèìîãî ÷èñëà õðàíèìûõ "
-"ñîîáùåíèé (%d). Âû íå ñìîæåòå ïðèíèìàòü íîâûå ñîîáùåíèÿ, ïîêà âû íå óäàëèòå "
-"ëèøíèå."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Âíèìàíèå: âû äîñòèãëè ìàêñèìàëüíî äîïóñòèìîãî ÷èñëà õðàíèìûõ ñîîáùåíèé (%d). "
-"Âû íå ñìîæåòå ïðèíèìàòü íîâûå ñîîáùåíèÿ, ïîêà íå óäàëèòå ëèøíèå."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîðûå âû ïîñûëàëè, áûëî ïðî÷èòàíî."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr ""
 "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîðûå âû ïîñûëàëè %s, áûëî ïðî÷èòàíî."
 
-#: language.cpp:2650
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER ïàðîëü email"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER ïàðîëü email"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP ãëàâíûé_íèê ïàðîëü"
+
+#: modules/core/ns_help.cpp:51
 #, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -598,7 +525,7 @@ msgstr ""
 "íèêîâ è äðóãèå çëîíàìåðåííûå äåéñòâèÿ - ïðèâåäóò, êàê ìèíèìóì, ê\n"
 "óíè÷òîæåíèþ ýòèõ ñàìûõ íèêîâ."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -610,7 +537,7 @@ msgstr ""
 "ê  íåìó  â  êà÷åñòâå  âëàäåëüöà, ìîãóò ïðîñìàòðèâàòü ñïèñêè äîñòóïà\n"
 "êàíàëîâ, à òàê æå, ñïèñêè àêèêîâ è óñòàíîâêè óðîâíåé äîñòóïà êàíàëîâ."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -622,483 +549,506 @@ msgstr ""
 "ê íåìó, à òàê æå, ìîãóò ñìîòðåòü ñïèñîê äîñòóïà ëþáîãî íèêà\n"
 "(áîëåå ïîäðîáíî ñì. /msg %S ACCESS LIST íèê)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "Àêòèâèðîâàííûå îïöèè.: %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "Âèðòóàëüíûé õîñò........: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "Âèðòóàëüíûé õîñò........: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "Íèê áîòà.............: %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "Íèê áîòà.............: áîò íå íàçíà÷åí."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "Àêòèâèðîâàííûå îïöèè....: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "Öåíçîð CapsLOCK......: %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "Öåíçîð CapsLOCK......: %s (%d êèêîâ äî áàíà; ìèíèìóì %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "Öåíçîð CapsLOCK......: %s (ìèíèìóì %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "Âëàäåëåö..................: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "Òèï áàíà..................: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "Öåíçîð æèðíûõ áóêâ...: %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîð æèðíûõ áóêâ...: %s (%d êèêîâ äî áàíà)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "Öåíçîð ôëóäà.........: %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "Öåíçîð ôëóäà.........: %s (%d êèêîâ äî áàíà; %d ëèíèé èç %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "Öåíçîð ôëóäà.........: %s (%d ëèíèé çà %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "Ìàñêà...........: %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "Öåíçîð öâåòîâ........: %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîð öâåòîâ........: %s (%d êèêîâ äî áàíà)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "Ðåãèñòðàöèÿ èñòåêàåò......: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "Òèï áàíà..................: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr "Ïîñëåäíèé ðàç èñïîëüçîâàí.: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "Áëîêèðîâêà ðåæèìîâ........: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "Öåíçîð ïîâòîðîâ......: %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "Öåíçîð ïîâòîðîâ......: %s (%d êèêîâ äî áàíà; %d ðàç)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "Öåíçîð ïîâòîðîâ......: %s (%d ðàç)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "Íàñëåäíèê.................: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "Êàíàë 'çàìîðîæåí': [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "Öåíçîð CapsLOCK......: %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "Öåíçîð æèðíûõ áóêâ...: %s (%d êèêîâ äî áàíà)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "Ïîñëåäíèé òîïèê...........: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "Çàðåãèñòðèðîâàí...........: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (îòêëþ÷åíî)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (òîëüêî äëÿ âëàäåëüöà)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Óïðàâëåíèå ACCESS-ñïèñêîì íèêà (ñïèñêîì õîñòìàñîê)"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Óïðàâëåíèå ACCESS-ñïèñêîì ïðèâèëåãèé êàíàëà"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr "ACT                Âûïîëíèòü äåéñòâèå îò ëèöà áîòà íà óêàçàííîì êàíàëå"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Óïðàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Óïðàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       Óïðàâëåíèå ñïèñêîì AKILL'îâ"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      Âûâîä ñïèñêà êàíàëîâ, íà êîòîðûõ ó âàñ åñòü äîñòóï"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        Óïðàâëåíèå ñïèñêîì AOP'îâ êàíàëà"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Óñòàíîâêà áîòà íà óêàçàííûé êàíàë"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     àêòèâèðîâàíèå/äåàêòèâèðîâàíèå àâòîñòàòóñà"
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     àêòèâèðîâàíèå/äåàêòèâèðîâàíèå ðåæèìà àâòîñòàòóñà"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Óïðàâëåíèå ñïèñêîì \"ïëîõèõ\" ñëîâ"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Óñòàíîâêà áàíà íà êàíàëå"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       óñòàíîâêà òèïà áàíà ñåðâèñàìè íà êàíàëå"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Óïðàâëåíèå ñåðâèñíûìè áîòàìè"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Ñïèñîê äîñòóïíûõ äëÿ óñòàíîâêè áîòîâ"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Îòìåíà ïîñëåäíåãî îòïðàâëåííîãî âàìè ìåìî-ñîîáùåíèÿ"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    \"Ïðèáèòü\" âñåõ ïîëüçîâàòåëåé íà óêàçàííîì êàíàëå"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Ñïèñîê òåêóùèõ àêòèâíûõ êàíàëîâ ñåòè"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr ""
 "    CHECK  Ïðîâåðêà íà òî, áûëî ëè ïðî÷èòàíî ïîñëåäíåå ïîñëàííîå âàìè "
 "ñîîáùåíèå"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Î÷èñòêà îïðåäåëåííûõ ðåæèìîâ êàíàëà"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Î÷èñòêà âñåõ ðåæèìîâ óêàçàííîãî êàíàëà"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Ïîäòâåðæäåíèå ðåãèñòðàöèè êîäîì àóòåíôèêàöèè"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "Ñîçäàí..........: %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Óïðàâëåíèå ñèñòåìîé DefCon (çàùèòíûõ êîíòðìåð)"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr ""
 "    DEHALFOP   Ñíÿòèå ðåæèìà ïîëóîïåðàòîðà (-h) ñ óêàçàííîãî íèêà íà êàíàëå"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Óäàëåíèå âèðòóàëüíîãî õîñòà"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Óäàëåíèå ìåìî-ñîîáùåíèé"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Óäàëåíèå âèðò. õîñòà ó âñåõ íèêîâ óêàçàííîé ãðóïïû"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr ""
 "    DEOP       Ñíÿòèå ðåæèìà îïåðàòîðà (-o) ñ óêàçàííîãî íèêà íà êàíàëå"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Ñíèìàåò ñ âàñ ñòàòóñ âëàäåëüöà êàíàëà"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Ñíÿòèå ðåæèìà çàùèòû (+a) ñ óêàçàííîãî íèêà íà êàíàëå"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          èçìåíåíèå îïèñàíèÿ êàíàëà"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Ñíÿòèå ðåæèìà âîéñà (-v) ñ óêàçàííîãî íèêà íà êàíàëå"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    óñòàíîâêà ãëàâíîãî íèêà ãðóïïû"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    óñòàíîâêà ãëàâíîãî íèêà ãðóïïû"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Óäàëåíèå êàíàëà èç áàçû äàííûõ ñåðâèñîâ"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Îòìåíà ðåãèñòðàöèè íèêà (óäàëåíèå)"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "Îïèñàíèå..................: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      óñòàíîâêà email-àäðåñà íà íèê"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      óñòàíîâêà email-àäðåñà íà íèê"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr "    ENTRYMSG      óñòàíîâêà àâòîñîîáùåíèÿ ïðè âõîäå íà êàíàë"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Óïðàâëåíèå ñïèñêîì èñêëþ÷åíèé èç ëèìèòà ñåññèé"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Óñòàíîâêà çàïðåòà íà èñïîëüçîâàíèå/ðåãèñòðàöèþ êàíàëà"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Óñòàíîâêà çàïðåòà íà èñïîëüçîâàíèå/ðåãèñòðàöèþ íèêà"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       ñìåíà âëàäåëüöà êàíàëà"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 msgstr "    GETEMAIL   Çàïðîñ ñïèñêà âñåõ íèêîâ ñ óêàçàííûì email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Çàïðîñ óñòàíîâëåííîãî íà êàíàëå êëþ÷à (+k)"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr "    GETPASS    Çàïðîñ ïàðîëÿ óêàçàííîãî íèêà"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Îòêëþ÷åíèå \"ìåðòâîé\" IRC-ñåññèé ñ âàøèì íèêîì"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Ñïèñîê âñåõ íèêîâ â âàøåé ãðóïïå"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Îòïðàâêà ãëîáàëüíîãî ñîîáùåíèÿ âñåì ïîëüçîâàòåëÿì ñåòè"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      óñòàíîâêà ïðèâåòñòâåííîãî ñîîáùåíèÿ"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      óñòàíîâêà ïðèâåòñòâåííîãî ñîîáùåíèÿ"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Ñèíõðîíèçèðóåò âèðòóàëüíûé õîñò äëÿ âñåõ íèêîâ ãðóïïû"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Îáúåäèíåíèå íèêîâ â ãðóïïû"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "Òåêñò ïðèâåòñòâèÿ.......: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr ""
 "    HALFOP     Óñòàíîâêà ñòàòóñà ïîëóîïåðàòîðà (+h) óêàçàííîìó íèêó íà êàíàëå"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       ñêðûòèå ðàçëè÷íîé èíôîðìàöèè î âàøåì íèêå"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Óïðàâëåíèå ñïèñêîì HOP'îâ êàíàëå"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Èäåíòèôèêàöèÿ ê íèêó â êà÷åñòâå âëàäåëüöà"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Óïðàâëåíèå èãíîð-ñïèñêîì ñåðâèñîâ"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Óïðàâëåíèå èãíîð-ñïèñêîì ñåðâèñîâ"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
 msgstr "INFO               Çàïðîñ èíôîðìàöèè î áîòå è åãî íàñòðîéêàõ íà êàíàëå"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Èíôîðìàöèÿ î êàêîì-ëèáî íèêå"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Çàïðîñ èíôîðìàöèè îá óêàçàííîì êàíàëå"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Èíôîðìàöèÿ î êîë-âå ñîîáùåíèé è íàñòðîéêàõ îïîâåùåíèÿ"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        \"Äæóï\" óêàçàííîãî ñåðâåðà ñåòè"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr "    KEEPTOPIC     àêòèâèðîâàíèå àâòîñîõðàíåíèÿ òîïèêà êàíàëà"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Íàñòðîéêà óñëîâèé KICK'à"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Êèêíóòü ïîëüçîâàòåëÿ ñ êàíàëà ïîñðåäñòâîì ñåðâèñîâ"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Âûêèäûâàåò óêàçàííîãî ïîëüçîâàòåëÿ ñ êàíàëà"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       àêòèâèðîâàíèå/äåàêòèâèðîâàíèå ðåæèìà çàùèòû"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1106,89 +1056,82 @@ msgstr ""
 "    LANGUAGE   âûáîð ÿçûêà, ïîñðåäñòâîì êîòîðîãî\n"
 "               ñåðâèñû áóäóò ñ âàìè îáùàòüñÿ"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   âûáîð ÿçûêà, ïîñðåäñòâîì êîòîðîãî ñåðâèñû áóäóò ñ\n"
-"               óêàçàííûì íèêîì."
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Ïåðåóñòàíîâêà çíà÷åíèÿ óðîâíåé äîñòóïà êàíàëà"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Âûâîä ñïèñêà âñåõ âèðòóàëüíûõ õîñòîâ"
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr "    LIST       Ñïèñîê âñåõ çàðåãèñòðèðîâàííûõ íèêîâ ïî ìàñêå"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr "    LIST       Çàïðîñ ñïèñêà âñåõ çàðåãèñòðèðîâàííûõ êàíàëîâ"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Ñïèñîê âàøèõ ìåìî-ñîîáùåíèé"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr "    LOGONNEWS   Óïðàâëåíèå ñïèñêîì íîâîñòåé ïðè ïîäêëþ÷åíèè"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Äåèäåíòèôèêàöèÿ îò èñïîëüçóåìîãî íà äàííûé ìîìåíò íèêà"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         áëîêèðîâêà îïðåäåëåííûõ ðåæèìîâ êàíàëà"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Èçìåíåíèå êàêîãî-ëèáî ðåæèìà íà óêàçàííîì êàíàëà"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Î÷èñòêà âñåõ ðåæèìîâ óêàçàííîãî êàíàëà"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Èíôîðìàöèÿ î çàãðóæåííîì ìîäóëå"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     Ñïèñîê çàãðóæåííûõ ìîäóëåé"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Çàãðóçèòü ìîäóëü"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Çàãðóçèòü ìîäóëü"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Âûãðóçèòü ìîäóëü"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        âûáîð ìåòîäà îáùåíèÿ ñåðâèñîâ ñ âàìè"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   óñòàíîâêà íà íèê ò.í. ðåæèìà 'íå-èñòå÷åíèÿ'"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
@@ -1196,410 +1139,406 @@ msgstr ""
 "    NOOP        Âðåìåííîå óäàëåíèå âñåõ O:line'îâ ñ óêàçàííîãî\n"
 "                ñåðâåðà ñåòè"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Äåàêòèâèðóåò âàø òåêóùèé âèðòóàëüíûé õîñò"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Óñòàíîâêà îïåðôëàãîâ óêàçàííîìó ïîëüçîâàòåëþ ñåòè"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Àêòèâèðóåò íàçíà÷åííûé âàì âèðòóàëüíûé õîñò"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr ""
 "    OP         Óñòàíîâêà ñòàòóñà îïåðàòîðà (+o) óêàçàííîìó íèêó íà êàíàëå"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr "    OPERNEWS    Óïðàâëåíèå ñïèñêîì îïåð-íîâîñòåé"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr ""
 "    OPNOTICE      àêòèâèðîâàíèå óâåäîìëåíèé îá èñïîëüçîâàíèè\n"
 "                  êîìàíä OP/DEOP"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Çàïðîñ ñòàòóñà âëàäåëüöà íà êàíàëå"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "Îïöèè...........: %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   èçìåíåíèå òåêóùåãî ïàðîëÿ íà íèê"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   èçìåíåíèå òåêóùåãî ïàðîëÿ íà íèê"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         àêòèâèðîâàíèå ðåæèìà \"ñïîêîéñòâèÿ\" íà êàíàëå"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       ñêðûòèå êàíàëà â ñïèñêå êàíàëîâ âûâîäèìûõ ïî LIST"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr "    PRIVATE    ñêðûòèå íèêà â ñïèñêå íèêîâ ïî /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr "    PRIVATE    ñêðûòèå âàøåãî íèêà â ñïèñêå íèêîâ ïî /msg %S LIST"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Óñòàíîâêà ðåæèìà çàùèòû (+a) óêàçàííîìó íèêó íà êàíàëå"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Çàâåðøèòü ðàáîòó ñåðâèñîâ áåç ñîõðàíåíèÿ áàçû äàííûõ"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
 msgstr "    RANDOMNEWS  Óïðàâëåíèå ñïèñêîì ñëó÷àéíûõ íîâîñòåé"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   ×òåíèå êàêîãî-ëèáî ñîîáùåíèÿ, ãðóïïû ñîîáùåíèé"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr ""
 "    RECOVER    Îñâîáîæäåíèå âàøåãî íèêà îò èñïîëüçîâàíèÿ åãî êåì-òî äðóãèì"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Ðåãèñòðàöèÿ íèêà"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Ðåãèñòðàöèÿ íèêà"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 "    RELEASE    Ñíÿòèå çàùèòû ñåðâèñîâ ñ âàøåãî íèêà ïîñëå êîìàíäû RECOVER"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Ïåðåçàãðóçêà êîíôèãóðàöèîííîãî ôàéëà ñåðâèñîâ"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Ïîâòîðíûé çàïðîñ auth-êîäà íà email"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords"
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr "    RESTART     Ñîõðàíèòü áàçû äàííûõ è ïåðåçàïóñòèòü ñåðâèñû"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    îãðàíè÷åíèå óðîâíÿ äîñòóïà íà êàíàë äî ïðîïèñàííûõ"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr ""
 "    RSEND  Îòïðàâêà ìåìî-ñîîáùåíèÿ ñ óñëîâèåì ïîäòâåðæäåíèÿ î ïðî÷òåíèè"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "Öåíçîð èíâåðñèé......: %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîð èíâåðñèé......: %s (%d êèêîâ äî áàíà)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Óñòàíîâêà ðàçëè÷íûõ îïöèé êàêîãî-ëèáî íèêà"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr "SAY                Ïîñëàòü íà óêàçàííûé êàíàë òåêñò îò ëèöà áîòà"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        äîïîëíèòåëüíûå âîçìîæíîñòè %S'à ïî áåçîïàñíîñòè"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     àêòèâèðîâàíèå/äåàêòèâèðîâàíèå ðåæèìà áåçîïàñíîñòè"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER îãðàíè÷åíèå íà ïîëó÷åíèå ñòàòóñà âëàäåëüöà êàíàëà"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     êîíòðîëü çà ïîëó÷åíèåì ñòàòóñà îïåðàòîðà êàíàëà"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Îòïðàâêà ìåìî-ñîîáùåíèÿ óêàçàííîìó íèêó èëè êàíàëó"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Îòïðàâêà ìàññîâîãî ìåìî-ñîîáùåíèÿ âñåì ïîëüçîâàòåëÿì ñåòè"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Çàïðîñ ïàðîëÿ îò íèêà íà email-àäðåñ"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Ïðîñìîòð êîëè÷åñòâà ñåññèé ñ óêàçàííîãî õîñòà"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Íàñòðîéêà ðàçëè÷íûõ îïöèé áîòà"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Óñòàíîâêà âèðòóàëüíîãî õîñòà óêàçàííîìó ïîëüçîâàòåëþ"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Íàñòðîéêà ðàçëè÷íûõ îïöèé ñåðâèñîâ"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Íàñòðîéêà ðàçëè÷íûõ îïöèé êàíàëà"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Íàñòðîéêà îïöèé íèêà, âêëþ÷àÿ çàùèòó KILL'îì"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Óñòàíîâêà îïöèé äëÿ ìåìî-ñîîáùåíèé"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Óñòàíîâêà âèðò. õîñòà äëÿ âñåõ íèêîâ óêàçàííîé ãðóïïû"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Çàâåðøèòü ðàáîòó ñåðâèñîâ ñ ñîõðàíåíèåì áàçû äàííûõ"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      íàñòðîéêà ðåæèìà \"ïîäïèñàííûõ êèêîâ\""
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      Óïðàâëåíèå ñïèñêîì SNLINE'îâ"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        Óïðàâëåíèå ñïèñêîì SOP'îâ êàíàëà"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      Óïðàâëåíèå ñïèñêîì SQLINE'îâ"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Ñïèñîê âñåõ ïðîïèñàííûõ íà ñåðâèñàõ è èõ îíëàéí-ñòàòóñ"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr ""
 "    STAFF  Îòïðàâêà ìåìî-ñîîáùåíèÿ âñåì îïåðàòîðàì/àäìèíèñòðàòîðàì ñåòè"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Çàïðîñ èíôîðìàöè î ñòàòóñå ñåðâèñîâ è ñåòè"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr ""
 "    STATUS     Âîçâðàùàåò òåêóùèé óðîâåíü äîñòóïà äëÿ óêàçàííîãî\n"
 "               ïîëüçîâàòåëÿ íà óêàçàííîì êàíàëå"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr ""
 "    STATUS     Çàïðîñ ñòàòóñà èäåíòèôèêàöèè óêàçàííîãî íèêà íà ñåðâèñàõ"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     óñòàíîâêà íàñëåäíèêà êàíàëà"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Ïðèîñòàíîâêà ðàáîòû êàíàëà, ñ ñîõðàíåíèåì âñåõ äàííûõ\n"
 "               è íàñòðîåê êàíàëà"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Óñòàíîâêà ðåæèìà ñàñïåíäà (\"çàìîðîçêè\") íà íèê"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Ïðèíóäèòåëüíîå èçìåíåíèå íèêà ïîëüçîâàòåëÿ ñåòè"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      Óïðàâëåíèå ñïèñêîì SZLINE'îâ"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Óñòàíîâêà òîïèêà íà êàíàëå ïîñðåäñòâîì ñåðâèñîâ"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     áëîêèðîâêà òîïèêà êàíàëà îò èçìåíåíèé åãî êåì-ëèáî"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Èçìåíåíèå ðåæèìîâ êàêîãî-ëèáî ïîëüçîâàòåëÿ ñåòè"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Ñíÿòü áîòà ñ óêàçàííîãî êàíàëà"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Ñíÿòèå ðåæèìà ñàñïåíäà ñ êàíàëà (âîññòàíîâëåíèå)"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Ñíÿòèå ðåæèìà ñàñïåíäà ñ íèêà"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
 msgstr "    UPDATE      Îáíîâëåíèå áàç äàííûõ ñåðâèñîâ (ñîõðàíåíèå íà äèñê)"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr "    UPDATE     Îáíîâëåíèå âàøåãî òåêóùåãî ñòàòóñà íà ñåðâèñàõ"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Ñïèñîê òåêóùèõ ïîëüçîâàòåëåé ñåòè"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Êîë-âî êàíàëîâ..: %d"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Óñòàíîâêà ñòàòóñà âîéñà (+v) óêàçàííîìó íèêó íà êàíàëå"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Óïðàâëåíèå ñïèñêîì VOP'îâ êàíàëà"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           íàñòðîéêà ñèñòåìû ïðèâèëåãèé êàíàëà"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (èñòåêàåò %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "Öåíçîð ïëîõèõ ñëîâ...: %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîð ïëîõèõ ñëîâ...: %s (%d êèêîâ äî áàíà)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "Email-àäðåñ.............: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "Ñåé÷àñ îíëàéí, c ìàñêîé.: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "Ïîñëåäíèé ðàç çàìå÷åí...: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "Òîïèê óñòàíîâèë...........: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1608,17 +1547,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1627,66 +1566,61 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "Ñîîáùåíèå ïðè âõîäå.......: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "Ðåàëüíîå èìÿ....: %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "Çàðåãèñòðèðîâàí.........: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Öåíçîð ïîä÷åðêèâàíèé.: %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîð ïîä÷åðêèâàíèé.: %s (%d êèêîâ äî áàíà)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr "  %c    %s    %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr "  %c    %s    %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " No.  Ïîñëàë            Äàòà/Âðåìÿ"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1694,32 +1628,41 @@ msgstr ""
 "Àäðåñàöèÿ âèäà \"/msg %s\" áîëüøå íå ïîääåðæèâàåòñÿ. Èñïîëüçóéòå \"/msg %s@%s"
 "\" èëè \"/%s\"."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d * Íèê: %s * âèðòóàëüíûé õîñò: %s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d * Íèê: %s * âèðòóàëüíûé õîñò: %s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1728,7 +1671,7 @@ msgstr ""
 "%3d  %s (îò %s â %s; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1737,25 +1680,16 @@ msgstr ""
 "%3d %s (îò %s â %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (çàáëîêèðîâàí) (îò %s â %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (by %s on %s; %s)\n"
 "    Ëèìèò: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1764,258 +1698,264 @@ msgstr ""
 "%5d (%s îò %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "Ñïèñîê êîìàíä %S:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s íå óâåäîìëÿåòñÿ î íîâûõ ñîáùåíèÿõ."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "Êîëè÷åñòâî çàãðóæåííûõ ìîäóëåé: %d"
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "Êîëè÷åñòâî äîñòóïíûõ áîòîâ: %d"
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d äíåé"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (îò %s â %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d ÷àñîâ"
+msgid "%d Modules loaded."
+msgstr "Êîëè÷åñòâî çàãðóæåííûõ ìîäóëåé: %d"
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d ìèíóò"
+msgid "%d bots available."
+msgstr "Êîëè÷åñòâî äîñòóïíûõ áîòîâ: %d"
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "Êîëè÷åñòâî íèêîâ â ãðóïïå: %d"
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d ñåêóíä"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "Ñïèñîê AOP'îâ êàíàëà %s ïóñò."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "Ñïèñîê HOP'îâ êàíàëà %s ïóñò."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "Ñïèñîê SOP'îâ êàíàëà %s ïóñò."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "Ñïèñîê VOP'îâ êàíàëà %s ïóñò."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "Ñïèñîê äîñòóïà êàíàëà %s ïóñò."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Ñïèñîê àâòîêèêîâ êàíàëà %s ïóñò."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "Ñïèñîê ïëîõèõ ñëîâ êàíàëà %s ïóñò."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s íå ìîæåò áûòü íàñëåäíèêîì êàíàëà %s òàê êàê îí åãî âëàäåëåö."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "Àäðåñàò %s íå ìîæåò ïðèíèìàòü ñîîáùåíèÿ."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "Ñïèñîê êîìàíä %S:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "Ãðàíèöû ìàñêè %s ñëèøêîì øèðîêè, ïîæàëóéñòà, óòî÷íèòå ìàñêó."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé, %d èç íèõ âñå åùå íå ïðî÷èòàíû."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé, 1 èç íèõ âñå åùå íå ïðî÷èòàíî."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé, íè îäíî èç íèõ íå ïðî÷èòàíî."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s ñåé÷àñ èìååò 1 íîâîå, íåïðî÷èòàííîå ñîîáùåíèå."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s ñåé÷àñ èìååò 1 ñîîáùåíèå."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "Ñïèñîê ñîîáùåíèé äëÿ %s íà äàííûé ìîìåíò ïóñò."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr ""
 "Ñïèñîê ñîîáùåíèé äëÿ %s ïåðåïîëíåí è ïðèíèìàòü íà äàííûé ìîìåíò íîâûå îí íå "
 "ìîæåò."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s îòêëþ÷åí."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "Ñïèñîê ñîîáùåíèé êàíàëà %s ïóñò."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "Íîâûõ ñîîáùåíèé äëÿ %s íå îáíàðóæåíî."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "%s ýòî %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s íà äàííûé ìîìåíò íåàêòèâåí (skeleton-ðåæèì)."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "%s ñåé÷àñ â ñåòè."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "Ðåæèì %s: îòêëþ÷åí."
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "Ðåæèì %s: âêëþ÷åí."
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s ñíÿë ñ ñåáÿ ðåæèì Ñóïåð-Àäìèíèñòðàòîðà."
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s íå óâåäîìëÿåòñÿ î íîâûõ ñîáùåíèÿõ."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s óâåäîìëÿåòñÿ î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå èäåíòèôèêàöèè èëè ïî ìåðå "
 "ïðèõîäà íîâûõ ñîáùåíèé."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s óâåäîìëÿåòñÿ î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå èäåíòèôèêàöèè ê íèêó."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s óâåäîìëÿåòñÿ î íîâûõ ñîîáùåíèÿõ ñðàçó ïðè ïîñòóïëåíèè îíûõ."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "Âñòðå÷àåì íîâîãî Ñóïåð-Àäìèíèñòðàòîðà - %s"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"Ñïèñîê AOP'îâ êàíàëà %s:\n"
+" Íîìåð  Íèê"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "Çàïèñü âèäà %s â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàðóæåíà."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "Çàïèñü âèäà %s óäàëåíà èç ñïèñêà àâòîêèêîâ êàíàëà %s."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "Ñ ýòîãî ìîìåíòà, %s íå áóäåò óâåäîìëÿòü âàñ î íîâûõ ñîîáùåíèÿõ."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr ""
 "Ñ ýòîãî ìîìåíòà, %s áóäåò óâåäîìëÿòü âàñ î íîâûõ ñîîáùåíèÿõ ñðàçó ïî "
 "ïîñòóïëåíèè îíûõ."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2024,96 +1964,80 @@ msgstr ""
 "Ñ ýòîãî ìîìåíòà, %s áóäåò óâåäîìëÿòü âàñ î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå "
 "èäåíòèôèêàöèè ê íèêó èëè ïðè ïîñòóïëåíèè íîâûõ ñîîáùåíèé."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "Ñ ýòîãî ìîìåíòà, %s áóäåò óâåäîìëÿòü âàñ î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå "
 "èäåíòèôèêàöèè ê íèêó èëè ïî âîçâðàùåíèþ èç ðåæèìà /AWAY."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) äîáàâëåí â ñïèñîê áîòîâ."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "Ëèìèò ñîáùåíèé äëÿ %s ðàâåí %d è íå ìîæåò áûòü èçìåíåí."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s ðàâåí %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* Àâòîìàòè÷åñêàÿ óñòàíîâêà AKILL'îâ íà âñåõ íîâûõ êëèåíòîâ."
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Ïðèíóäèòåëüíàÿ óñòàíîâêà ðåæèìîâ %s íà âñå êàíàëû ñåòè."
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Èãíîðèðîâàíèå ïðîñòûõ ïîëüçîâàòåëåé ñ îïîâåùåíèåì èõ îá ýòîì."
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Àâòîìàòè÷åñêîå îòêëþ÷åíèå îò ñåòè âñåõ íîâûõ êëèåíòîâ."
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* Çàïðåò íà èçìåíåíèå ïàðàìåòðîâ MLOCK."
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* Çàïðåò íà ðåãèñòðàöèþ êàíàëîâ."
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* Çàïðåò íà îòïðàâêó ìåìî-ñîîáùåíèé."
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* Çàïðåò íà ðåãèñòðàöèþ íèêîâ."
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Èãíîðèðîâàíèå ïðîñòûõ ïîëüçîâàòåëåé áåç óâåäîìëåíèÿ èõ îá ýòîì."
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Óìåíüøåíèå ëèìèòà ñåññèé ñ îäíîãî õîñòà äî %d."
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 äåíü"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 ÷àñ"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 ìèíóòà"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 ñåêóíäà"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<íåèçâåñòíî>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr ""
 "Ìàññîâîå ñîîáùåíèå óñïåøíî îòïðàâëåíî âñåì çàðåãèñòðèðîâàííûì ïîëüçîâàòåëÿì."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2122,133 +2046,135 @@ msgstr ""
 "Ìåìî-èçâåùåíèå áûëî àâòîìàòè÷åñêè ïîñëàíî äëÿ %s, èíôîðìèðóþùåå îòïðàâèòåëÿ "
 "î òîì, ÷òî âû ïðî÷èòàëè åãî/åå ñîîáùåíèå."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "Auth-êîä áûë âûñëàí íà %s, äëÿ çàâåðøåíèÿ ðåãèñòðàöèè èñïîëüçóéòå êîìàíäó /"
 "msg %s confirm auth-êîä"
 
-#: language.cpp:5126
+#: include/language.h:114
 msgid "A vhost ident must be in the format of a valid ident"
 msgstr "Óêàçàííûé âèðóòàëüíûé èäåíò èìååò íåâåðíûé ôîðìàò."
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Óêàçàííûé âèðóòàëüíûé õîñò èìååò íåâåðíûé ôîðìàò."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS #êàíàë {ADD|DEL|LIST|VIEW|CLEAR} [íèê [óðîâåíü] | íîìåð_çàïèñè]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [ìàñêà]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT #êàíàë òåêñò"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [ìàñêà]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK #êàíàë {ADD|STICK|UNSTICK|DEL|LIST|VIEW|ENFORCE|CLEAR} [íèê|ìàñêà] "
 "[ïðè÷èíà]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE íà êàíàëå %s çàâåðøåí, ïîëüçîâàòåëåé çàáàíåíî: %d "
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "Ñïèñîê AKILL'îâ ïóñò."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD|DEL|LIST|VIEW|CLEAR} [[+âðåìÿ_èñòå÷åíèÿ] {ìàñêà | íîìåð_çàïèñè} "
 "[ïðè÷èíà]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Ñïèñîê AOP'îâ êàíàëà %s:\n"
-" Íîìåð  Íèê"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN #êàíàë íèê"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Äîñòóï çàïðåùåí."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Óðîâåíü äîñòóïà äëÿ %s íà êàíàëå %s èçìåíåí íà %d."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Óðîâåíü äîñòóïà äëÿ %s íà êàíàëå %s îñòàëñÿ ïðåæíèì - %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Óðîâåíü äîñòóïà äîëæåí áûòü ìåæäó %d è %d âêëþ÷èòåëüíî."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Óðîâåíü äîñòóïà äîëæåí áûòü îòëè÷åí îò íóëÿ."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Óñòàíîâêè ñïèñêà äîñòóïà äëÿ êàíàëà %s:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Óðîâíè äîñòóïà äëÿ êàíàëà %s ñáðîøåíû íà çíà÷åíèÿ ïî-óìîë÷àíèþ."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Ñïèñîê äîñòóïà äëÿ %s ïóñò."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "Ñïèñîê äîñòóïà äëÿ %s:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "Ñïèñîê äîñòóïà êàíàëà %s:\n"
 "  Íîì.  Óð.  Íèê"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Âàø òåêóùèé ñïèñîê äîñòóïà:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2257,22 +2183,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê àâòîêèêîâ êàíàëà %s."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåð: #%d"
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåð: #%d"
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåð: #%d"
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2280,237 +2211,230 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "Âñå OLINE-çàïèñè íà ñåðâåðå %s áûëè óäàëåíû."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Âñå OLINE-çàïèñè íà ñåðâåðå %s âîññòàíîâëåíû."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "Âñå áàíû êàíàëà %s óäàëåíû."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ íèêîâ ãðóïïû %s óñòàíîâëåíû íà %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "Âñå èñêëþ÷åíèÿ èç áàíîâ êàíàëà %s óäàëåíû."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ íèêîâ ãðóïïû %s óñòàíîâëåíû íà %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "Âñå èñêëþ÷åíèÿ íà ïðèãëàøåíèå êàíàëà %s óäàëåíû."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ íèêîâ ãðóïïû %s óñòàíîâëåíû íà %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Ñïèñîê íîâîñòåé ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Âñå ñîîáùåíèÿ êàíàëà %s áûëè óäàëåíû."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "Âñå ðåæèìû êàíàëà %s áûëè ñáðîøåíû."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "Âñå óñòàíîâëåííûå ðåæèìû êàíàëà %s ñáðîøåíû."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Âñå âàøè âîîáùåíèÿ áûëè óäàëåíû."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Ñïèñîê íîâîñòåé äëÿ îïåðàòîðîâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ íèêîâ ãðóïïû %s óñòàíîâëåíû íà %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "Âñå ïîëüçîâàòåëè êàíàëà %s êèêíóòû."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ íèêîâ ãðóïïû %s óñòàíîâëåíû íà %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ íèêîâ ãðóïïû %s óñòàíîâëåíû íà %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì HALFOP/DEHALFOP îòíîñèòåëüíî ñåáÿ"
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì OP/DEOP îòíîñèòåëüíî ñåáÿ"
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì PROTECT/DEPROTECT îòíîñèòåëüíî ñåáÿ"
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì VOICE/DEVOICE îòíîñèòåëüíî ñåáÿ"
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Äîñòóï ê êîìàíäàì ASSIGN/UNASSIGN"
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå BAN îòíîñèòåëüíî ñåáÿ"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå KICK îòíîñèòåëüíî ñåáÿ"
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Óðîâåíü äîñòóïà ê ÷òåíèþ ìåìî-ñîîáùåíèé êàíàëà"
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì ìîäèôèêàöèè ACCESS-ñïèñêà êàíàëà"
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå AKICK"
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå BADWORDS"
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå BAN"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "Óðîâåíü äîñòóïà ê êîìàíäå CLEAR"
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå GETKEY"
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì HALFOP/DEHALFOP"
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå INFO ñ ïàðàìåòðîì ALL"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå INVITE"
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå KICK"
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì OP/DEOP"
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì PROTECT/DEPROTECT"
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì SAY è ACT"
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå SET (èñêëþ÷àÿ îïöèè FOUNDER/PASSWORD)"
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå TOPIC"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå UNBAN"
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì VOICE/DEVOICE"
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì FANTASY-ðåæèìà"
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Óðîâåíü äîñòóïà ê êîìàíäå ACCESS LIST"
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Àâòîñòàòóñ"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Ñïèñîê àâòîêèêîâ êàíàëà %s:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Óðîâåíü äîñòóïà ê àâòîñòàòóñó îïåðàòîðà (+o)"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Óðîâåíü äîñòóïà ê àâòîñòàòóñó çàùèòû/àäìèíà (+a)"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Óðîâåíü äîñòóïà ê àâòîñòàòóñó ïîëóîïåðàòîðà (+h)"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Óðîâåíü äîñòóïà ê àâòîñòàòóñó âîéñà (+v)"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS #êàíàë {ADD|DEL|LIST|CLEAR} [ñëîâî|íîìåð_çàïèñè] [SINGLE|START|END]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2520,7 +2444,7 @@ msgstr ""
 "BOT CHANGE ñòàðûé_íèê íîâûé_íèê [èäåíò [õîñò [ðåàëüíîå_èìÿ]]]\n"
 "BOT DEL íèê"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2529,112 +2453,110 @@ msgstr ""
 "Ñïèñîê ïëîõèõ ñëîâ äëÿ %s:\n"
 "  No.   Ñëîâî                          Òèï"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Ñïèñîê \"ïëîõèõ\" ñëîâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Øàáëîí áàíìàñêè íà êàíàëå %s èçìåíåí íà #%d."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "Âñå ðåæèìû è áàíû êàíàëà %s áûëè ñáðîøåíû."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Áîò ñ íèêîì %s óæå ñóùåñòâóåò."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Áîòà %s íå ñóùåñòâóåò."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Áîò %s óñïåøíî íàçíà÷åí íà êàíàë %s."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "Äàííûå î áîòå %s áûëè èçìåíåíû íà %s!%s@%s (%s)"
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "Áîò ïîä íèêîì %s óñïåøíî óäàëåí."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Áîò %s óæå íàçíà÷åí íà êàíàë %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Ñ ýòîãî ìîìåíòà, áîò áóäåò êèêàòü îïåðàòîðîâ êàíàëà %s çà íàðóøåíèÿ."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Ñ ýòîãî ìîìåíòà áîò áóäåò êèêàòü âîéñîâ êàíàëà %s çà íàðóøåíèÿ."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr ""
 "Òåïåðü, îïåðàòîðû êàíàëà %s áóäóò èñêëþ÷åíû èç óñëîâèé êèêà çà íàðóøåíèÿ."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Òåïåðü, âîéñû êàíàëà %s áóäóò èñêëþ÷åíû èç óñëîâèé êèêà çà íàðóøåíèÿ."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Õîñò áîòà íå äîëæåí ïðåâûøàòü %d ñèìâîëîâ."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Óêàçàííûé äëÿ áîòà õîñò ñîäåðæèò íåäîïóñòèìûå ñèìâîëû."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Èäåíò áîòà íå äîëæåí ïðåâûøàòü %d ñèìâîëîâ."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Óêàçàííûé äëÿ áîòà èäåíò ñîäåðæèò íåäîïóñòèìûå ñèìâîëû."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Óêàçàííûé äëÿ áîòà íèê ñîäåðæèò íåäîïóñòèìûå ñèìâîëû."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Íà äàííûé ìîìåíò, áîò íå ïðèñóòñòâóåò íà êàíàëå %s."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Ñïèñîê áîòîâ:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
 msgstr ""
-"Áîò àâòîìàòè÷åñêè ïðèñîåäèíèòñÿ ê êàíàëó ñðàçó æå ïîñëå òîãî, êàê\n"
-"íà íåì (íà êàíàëå, à íå íà áîòå) îêàæåòñÿ íå ìåíåå %d ïîñåòèòåëåé."
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2645,7 +2567,7 @@ msgstr ""
 "íàðóøèòåëþ ïîñëå %d êèêà(îâ). Äëÿ ìîäèôèêàöèè ñïèñêà \"ïëîõèõ\" ñëîâ\n"
 "âîñïîëüçóéòåñü êîìàíäîé BADWORDS."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2653,20 +2575,20 @@ msgstr ""
 "Ðåæèì êèêà çà ïëîõèå ñëîâà àêòèâèðîâàí.\n"
 "Äëÿ ìîäèôèêàöèè ñïèñêà \"ïëîõèõ\" ñëîâ âîñïîëüçóéòåñü êîìàíäîé BADWORDS."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Ðåæèì êèêà çà èñïîëüçîâàíèå æèðíîãî øðèôòà àêòèâèðîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå æèðíîãî øðèôòà àêòèâèðîâàí."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2678,7 +2600,7 @@ msgstr ""
 "ñèìâîëîâ è îíè ñîñòàâëÿþò íå ìåíåå %d%% îò îáùåãî êîë-âà ñèìâîëîâ.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2688,47 +2610,47 @@ msgstr ""
 "áóäåò êèêàòü ïîñåòèòåëÿ, åñëè åãî ôðàçà ñîäåðæèò íå ìåíåå %d áîëüøèõ\n"
 "ñèìâîëîâ è îíè ñîñòàâëÿþò íå ìåíåå %d%% îò îáùåãî êîë-âà ñèìâîëîâ."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Ðåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ àêòèâèðîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ àêòèâèðîâàí."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Ðåæèì êèêà çà ôëóä àêòèâèðîâàí (óñëîâèå: %d ëèíèé çà %d ñåêóíä).\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Ðåæèì êèêà çà ôëóä àêòèâèðîâàí (óñëîâèå: %d ëèíèé çà %d ñåêóíä)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2739,7 +2661,7 @@ msgstr ""
 "Áîò áóäåò êèêàòü ïîëüçîâàòåëÿ ïîñëå %d ïîâòîðîâ ïîäðÿä è ñòàâèòü\n"
 "áàí ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2748,137 +2670,153 @@ msgstr ""
 "Ðåæèì êèêà çà ÷ðåçìåðíûå ïîâòîðû àêòèâèðîâàí.  Áîò áóäåò êèêàòü\n"
 "ïîñåòèòåëÿ åñëè îí ïîâòîðèò îäíó è òó æå ôðàçó %d ðàç ïîäðÿä."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Ðåæèì êèêà çà èñïîëüçîâàíèå èíâåðñíîãî òåêñòà àêòèâèðîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå èíâåðñíîãî òåêñòà àêòèâèðîâàí."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Ðåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åðêíóòîãî òåêñòà àêòèâèðîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åðêíóòîãî òåêñòà àêòèâèðîâàí."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ àêòèâèðîâàí."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Ðåæèì êèêà çà ïëîõèå ñëîâà îòêëþ÷åí."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå æèðíîãî øðèôòà îòêëþ÷åí."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Ðåæèì êèêà çà ÷ðåçìåðíîå èñïîëüçîâàíèå CapsLOCK îòêëþ÷åí."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ îòêëþ÷åí."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Ðåæèì êèêà çà ôëóä îòêëþ÷åí."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Ðåæèì êèêà çà ÷ðåçìåðíûå ïîâòîðû îòêëþ÷åí."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå èíâåðñíîãî òåêñòà îòêëþ÷åí."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Ðåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åðêíóòîãî òåêñòà îòêëþ÷åí."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Ðåæèì êèêà çà ÷ðåçìåðíîå èñïîëüçîâàíèå CapsLOCK îòêëþ÷åí."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ         : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "Áîòû, çàðåçåðâèðîâàííûå äëÿ IRC-îïåðàòîðîâ:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Áàéò ñ÷èòàíî    : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Áàéò çàïèñàíî   : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {íèê | #êàíàë}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+ñðîê_èñòå÷åíèÿ] {#êàíàë} [ïðè÷èíà]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK íèê"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR #êàíàë ÷òî_èìåííî"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES #êàíàë [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Íåâîçìîæíî äåèäåíòèôèöèðîâàòü %s òàê êàê îí Àäìèíèñòðàòîð ñåðâèñîâ."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR #êàíàë ÷òî_èìåííî"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Íà äàííûé ìîìåíò îòïðàâêà email íåâîçìîæíà, ïîïðîáóéòå ïîçæå."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ        : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Ðåæèìû ïîëüçîâàòåëÿ %s èçìåíåíû."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "Êàíàë %s íå ñóùåñòâóåò."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Êàíàë %s óäàëåí èç áàçû äàííûõ."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2887,140 +2825,101 @@ msgstr ""
 "Êàíàë %s ÇÀÏÐÅÙÅÍ ê èñïîëüçîâàíèþ %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Êàíàë %s óæå çàðåãèñòðèðîâàí!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Ñ ýòîãî ìîìåíòà êàíàë %s çàïðåùåí äëÿ èñïîëüçîâàíèÿ."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Êàíàë %s óñïåøíî âîññòàíîâëåí èç ðåæèìà ñàñïåíäà."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Àêòèâíîñòü êàíàëà %s ïðèîñòàíîâëåíà."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "Êàíàë %s íå çàðåãèñòðèðîâàí."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "Ðåãèñòðàöèÿ èëè èñïîëüçîâàíèå êàíàëà %s ÇÀÏÐÅÙÅÍÛ."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Êàíàë %s íå ìîæåò áûòü çàðåãèñòðèðîâàí."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Êàíàë %s óñïåøíî çàðåãèñòðèðîâàí íà íèê %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Êàíàëîâ         : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Ðåæèì èñòå÷åíèÿ ïî âðåìåíè äëÿ êàíàëà %s àêòèâèðîâàíà."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Ñ ýòîãî ìîìåíòà, ðåãèñòðàöèÿ êàíàëà %s íèêîãäà íå èñòå÷åò."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Ñïèñîê AOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Ñïèñîê HOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Ñïèñîê SOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Ñïèñîê VOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Ñïèñîê äîñòóïà êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Ñïèñîê AKICK'îâ íà êàíàëå %s áûë ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Êàíàë %s óñïåøíî âîññòàíîâëåí èç ðåæèìà ñàñïåíäà."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Óêàçàíî íåäîïóñòèìîå èìÿ êàíàëà: %s"
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Ñïèñîê AOP'îâ ìîæåò âêëþ÷àòü â ñåáÿ òîëüêî çàðåãèñòðèðîâàííûå íèêè."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Ñïèñîê HOP'îâ ìîæåò âêëþ÷àòü â ñåáÿ òîëüêî çàðåãèñòðèðîâàííûå íèêè."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Ñïèñîê SOP'îâ ìîæåò âêëþ÷àòü â ñåáÿ òîëüêî çàðåãèñòðèðîâàííûå íèêè."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr "SQLINE-âîçìîæíîñòè ñåðâèñîâ â âàøåé ñåòè íåäîñòóïíû."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Ñïèñîê VOP'îâ ìîæåò âêëþ÷àòü â ñåáÿ òîëüêî çàðåãèñòðèðîâàííûå íèêè."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Ñïèñîê äîñòóïà êàíàëà ìîæåò âêëþ÷àòü òîëüêî çàðåãèñòðèðîâàííûå íèêè."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3028,11 +2927,7 @@ msgstr ""
 "Ñïèñîê êàíàëîâ:\n"
 "Èìÿ            Ïîñåòèòåëåé Ðåæèìû  Òîïèê"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Óðîâåíü äîñòóïà, çàïðåùàþùèé ïîëó÷åíèå ñòàòóñà îïà"
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3041,7 +2936,7 @@ msgstr ""
 "Êàíàëû, íà êîòîðûõ ó %s åñòü óðîâíè äîñòóïà:\n"
 "Íîìåð  Êàíàë                Óðîâåíü  Îïèñàíèå"
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3049,31 +2944,16 @@ msgstr ""
 "Êàíàëû, íà êîòîðûõ ó âàñ åñòü óðîâíè äîñòóïà:\n"
 "Íîìåð  Êàíàë                Óðîâåíü  Îïèñàíèå"
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "Èçâèíèòå, óñòàíîâèòü çàïðåò íà êàíàë %s íåóäàëîñü."
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "Èçâèíèòå, íî óñòàíîâèòü ðåæèì çàïðåòà íà íèê %s íåóäàëîñü."
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Èçâèíèòå, âîññòàíîâèòü àêòèâíîñòü êàíàëà %s íåóäàëîñü."
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Èçâèíèòå, óñòàíîâèòü ðåæèì ñàñïåíäà íà êàíàë %s íåóäàëîñü."
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Òåêóùèé ñïèñîê AKILL'îâ:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3081,15 +2961,15 @@ msgstr ""
 "Òåêóùèé ñïèñîê AKILL'îâ:\n"
 "  No.   Ìàñêà                             Ïðè÷èíà"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Òåêóùèé ñïèñîê ìîäóëåé:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Òåêóùèé ñïèñîê SNLINE'îâ:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3097,11 +2977,11 @@ msgstr ""
 "Òåêóùèé ñïèñîê SNLINE'îâ:\n"
 "  No.   Ìàñêà                             Ïðè÷èíà"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Òåêóùèé ñïèñîê SQLINE'îâ:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3109,11 +2989,11 @@ msgstr ""
 "Òåêóùèé ñïèñîê SQLINE'îâ:\n"
 "  No.   Ìàñêà                             Ïðè÷èíà"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Òåêóùèé ñïèñîê SZLINE'îâ:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3121,729 +3001,616 @@ msgstr ""
 "Òåêóùèé ñïèñîê SZLINE'îâ:\n"
 "  No.   Ìàñêà                             Ïðè÷èíà"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Òåêóùèé ñïèñîê èñêëþ÷åíèé èç ëèìèòà ñåññèé:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Òåêóùåå êîëè÷åñòâî AKILL'îâ           : %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Òåêóùåå êîëè÷åñòâî SNLINE'îâ          : %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Òåêóùåå êîëè÷åñòâî SQLINE'îâ          : %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Òåêóùåå êîëè÷åñòâî SZLINE'îâ          : %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Òåêóùåå êîë-âî ïîëüçîâàòåëåé: %d, IRC-îïåðàòîðîâ: %d "
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <íèê>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [#êàíàë] {íîìåð_ñîîáùåíèÿ | ñïèñîê_çàïèñåé | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <íèê>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP #êàíàë"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : %d äíåé"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : %d ÷àñîâ"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : %d ìèíóò"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : 1 äåíü"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : 1 ÷àñ"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : 1 ìèíóòà"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Âðåìÿ èñòå÷åíèÿ AKILL'à ïî-óìîë÷àíèþ  : íèêîãäà"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : %d äíåé"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : %d ÷àñîâ"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : %d ìèíóò"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : 1 äåíü"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : 1 ÷àñ"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : 1 ìèíóòà"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Âðåìÿ èñòå÷åíèÿ SNLINE'à ïî-óìîë÷àíèþ : íèêîãäà"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: %d äíåé"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: %d ÷àñîâ"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: %d ìèíóò"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: 1 äåíü"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: 1 ÷àñ"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: 1 ìèíóòà"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Âðåìÿ èñòå÷åíèÿ SQGLINE'à ïî-óìîë÷àíèþ: íèêîãäà"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : %d äíåé"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : %d ÷àñîâ"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : %d ìèíóò"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : 1 äåíü"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : 1 ÷àñ"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : 1 ìèíóòà"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Âðåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèþ : íèêîãäà"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà AOP'îâ êàíàëà %s."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà HOP'îâ êàíàëà %s."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SOP'îâ êàíàëà %s."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà VOP'îâ êàíàëà %s."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà äîñòóïà êàíàëà %s."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà àêòîêèêîâ êàíàëà %s."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà ïëîõèõ ñëîâ êàíàëà %s."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà èñêëþ÷åíèé ëèìèòà ñåññèé."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà AKILL'îâ."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SNLINE'îâ."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SQLINE'îâ."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SZLINE'îâ."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà AOP'îâ êàíàëà %s."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà HOP'îâ êàíàëà %s."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà SOP'îâ êàíàëà %s."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà VOP'îâ êàíàëà %s."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà äîñòóïà êàíàëà %s."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà àâòîêèêîâ êàíàëà %s."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà ïëîõèõ ñëîâ êàíàëà %s."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà èñêëþ÷åíèé ëèìèòà ñåññèé."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèêà AKILL'îâ."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèêà SNLINE'îâ."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèêà SQLINE'îâ."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèêà SZLINE'îâ."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà AOP'îâ êàíàëà %s."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Îïèñàíèå êàíàëà %s èçìåíåíî íà %s."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "îòêëþ÷åí"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Êîíåö ñïèñêà õîñòîâ, çàïèñåé íàñ÷èòàíî: %d"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Êîíåö ñïèñêà çàïèñåé ñ %d ïî %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Êîíåö ñïèñêà õîñòîâ ïî ìàñêå %s, çàïèñåé íàñ÷èòàíî: %d"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Èñïîëüçîâàíèå æèðíîãî øðèôòà ó íàñ òóò íå ïðèâåòñòâóåòñÿ!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Èñïîëüçîâàíèå öâåòîâ ó íàñ òóò íå ïðèâåòñòâóåòñÿ!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Èñïîëüçîâàíèå èíâåðñèè ó íàñ òóò íå ïðèâåòñòâóåòñÿ!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "Ñëîâî %s çàïðåùåíî íà ýòîì êàíàëå!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Èñïîëüçîâàíèå ïîä÷åðêèâàíèé ó íàñ òóò íå ïðèâåòñòâóåòñÿ!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Email-àäðåñ äëÿ %s èçìåíåí íà %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Email-àäðåñ äëÿ %s óäàëåí."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "Email-àäðåñ äëÿ âàøåãî íèêà óäàëåí."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "Email-àäðåñ äëÿ %s íåêîððåêòåí."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD|DEL|MOVE|LIST|VIEW} [ïàðàìåòðû]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Íàéäåíî ñîîòâåòñòâèå äëÿ íèêà %s: %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "âêëþ÷åí"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "Êîíåö ñïèñêà %s."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "Êîíåö ñïèñêà äîñòóïà."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Êîíåö ñïèñêà êàíàëîâ."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Êîíåö ñïèñêà - %d/%d êàíàëîâ ïîêàçàíî."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Êîíåö ñïèñêà - %d/%d çàïèñåé ïîêàçàíî."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Êîíåö ñïèñêà ïîëüçîâàòåëåé."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Ðóññêèé"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "Ñîîáùåíèå ïðè âõîäå íà êàíàë %s èçìåíåíî."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "Ñîîáùåíèå ïðè âõîäå íà êàíàë %s óäàëåíî."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 "Îøèáêà: äëèíà óêàçàííîãî âèðòóàëüíîãî èäåíòà ïðåâûøàåò ïîðîã â %d ñèìâîëîâ."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Îøèáêà: äëèíà óêàçàííîãî âèðòóàëüíîãî õîñòà ïðåâûøàåò ïîðîã â %d ñèìâîëîâ."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Èñêëþ÷åíèå äëÿ %s (#%d) ïåðåìåùåíî â ïîçèöèþ %d."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Ëèìèò ñåññèé äëÿ çàïèñè âèäà %s áûë èçìåíåí íà %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Ðåãèñòðàöèÿ èñòåêàåò....: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Ñðîê èñòå÷åíèÿ çàïèñè %s óñïåøíî èçìåíåí."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID #êàíàë ïðè÷èíà"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID #êàíàë [ïðè÷èíà]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID íèê ïðè÷èíà"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID íèê [ïðè÷èíà]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "FANTASY-ðåæèì"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "FANTASY-ðåæèì äëÿ êàíàëà %s àêòèâèðîâàí."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "FANTASY-ðåæèì äëÿ êàíàëà %s îòêëþ÷åí."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "FANTASY-ðåæèì äëÿ êàíàëà %s àêòèâèðîâàí."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "Íèê %s óñïåøíî óäàëåí èç ñïèñêà èãíîðèðîâàíèÿ."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Âñå ïðàâà íà âëàäåíèå êàíàëîì %s óñïåøíî ïåðåäàíû ïîëüçîâàòåëþ %s."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL ëîãèí@email-õîñò.tld (ñèìâîëüíûå ìàñêè çàïðåùåíû!!)"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY #êàíàë"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS íèê"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "Êîìàíäà GETPASS íåäîñòóïíà, òàê êàê âêëþ÷åíî øèôðîâàíèå ïàðîëåé."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST íèê [ïàðîëü]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL ñîîáùåíèå"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP ãëàâíûé_íèê ïàðîëü"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Ñåññèÿ ñ âàøèì çàâèñøèì íèêîì óñïåøíî çàêðûòà."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Ïðèâåòñòâèÿ"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Óðîâåíü äîñòóïà ê èñïîëüçîâàíèþ ïðèâåòñòâåííîãî ñîîáùåíèÿ"
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Ïðèâåòñòâèå äëÿ %s èçìåíåíî íà %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Ïðèâåòñòâèå äëÿ %s óäàëåíî."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Ðåæèì ïðèâåòñòâèé äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Ðåæèì ïðèâåòñòâèé äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Ñïèñîê HOP'îâ êàíàëà %s:\n"
-"  Íîìåð  Íèê"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Ñïèñîê õîñòîâ ñ êîëè÷åñòâîì ñåññèé %d è áîëåå:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY ïàðîëü"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [âðåìÿ] [íèê]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO #êàíàë"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO íèê"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {#êàíàë | íèê}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE #êàíàë"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 "Åñëè âû íå âûïîëíèòå óêàçàííûå ðåêîìåíäàöèè, âàø íèê áóäåò ïðèíóäèòåëüíî "
 "èçìåíåí â òå÷åíèè 20 ñåêóíä."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 "Åñëè âû íå âûïîëíèòå óêàçàííûå ðåêîìåíäàöèè, âàø íèê áóäåò ïðèíóäèòåëüíî "
 "èçìåíåí â òå÷åíèè ìèíóòû."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Ðåæèì èñïîëüçîâàíèÿ èãíîð-ñïèñêà àêòèâèðîâàí."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Ðåæèì èñïîëüçîâàíèÿ èãíîð-ñïèñêà îòêëþ÷åí."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ñïèñîê èãíîðèðóåìûõ íèêîâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Ñïèñîê èãíîðèðóåìûõ íèêîâ ïóñò."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Ñïèñîê áîòîâ:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3859,29 +3626,25 @@ msgstr ""
 "èäåíòèôèöèðîâàòüñÿ  ê  íèêó  â  êà÷åñòâå åãî âëàäåëüöà. Äëÿ áîëåå\n"
 "ïîäðîáíîé èíôîðìàöèè ñì. /msg %S HELP IDENTIFY"
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Çàäàí íåâåðíûé äèàïàçîí. Ñèíòàêñèñ: #îòêóäà-äîêóäà."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Èíôîðìàöèÿ î áîòå %s:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "Èíôîðìàöèÿ î êàíàëå %s:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Âíóòðåííÿÿ îøèáêà - íåâîçìîæíî âûïîëíèòü çàïðîñ."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Óêàçàíî íåâåðíîå çíà÷åíèå ñðîêà èñòå÷åíèÿ."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3889,14 +3652,14 @@ msgstr ""
 "Óêàçàíà íåêîððåêòíàÿ õîñòìàñêà. Òîëüêî ðåàëüíûé õîñò, íå ñîäåðæàùèé íèêîâ è "
 "èäåíòîâ ïîëüçîâàòåëåé, ìîæåò áûòü äîáàâëåí â ñïèñîê èñêëþ÷åíèÿ."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Áûë ââåäåí íåâåðíûé auth-êîä, ïîæàëóéñòà, ïðîâåðüòå âàø e-mail ñíîâà è "
 "ïîïðîáóéòå åùå ðàç."
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3905,308 +3668,324 @@ msgstr ""
 "Íåêîððåêòíîå çíà÷åíèå ëèìèòà. Îíî äîëæíî áûòü öåëûì ÷èñëîì, áîëüøå èëè "
 "ðàâíûì íóëþ, è ìåíüøå %d."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Íåêîððåêòíîå çíà÷åíèå äëÿ ïîðîãà ñåññèé.  êà÷åñòâå ïàðàìåòðà äîëæíî áûòü "
 "öåëîå ÷èñëî >1."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE èìÿ_ñåðâåðà [ïðè÷èíà]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK #êàíàë îïöèÿ {ON|OFF} [ïàðàìåòðû]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK #êàíàë íèê ïðè÷èíà"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS #êàíàë {SET | DIS[ABLE] | LIST | RESET} [ïóíêò [óðîâåíü]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST ìàñêà"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST ìàñêà [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [#êàíàë] [ñïèñîê_çàïèñåé | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "ßçûê ñåðâèñîâ èçìåíåí íà Ðóññêèé."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ïîñëåäíåå âàøå ñîîáùåíèå àäðåñàòó %s óñïåøíî îòìåíåíî."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Ïîñëåäíåå quit-ñîîáùåíèå: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ïîñëåäíÿÿ ìàñêà.........: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Óðîâåíü äîñòóïà ê %s íà êàíàëå %s èçìåíåí íà %d."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Óðîâåíü äîëæåí áûòü ÷èñëîì ìåæäó %d è %d âêëþ÷èòåëüíî."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr ""
 "Ñèñòåìà óðîâíåé íå äîñòóïíà, òàê êàê èñïîëüçóåòñÿ ñèñòåìà ïðèâèëåãèé xOP."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Ñïèñîê íèêîâ ïî ìàñêå %s:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Ñïèñîê íèêîâ â ãðóïïå %s:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Ñïèñîê íèêîâ â âàøåé ãðóïïå:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Ëîêàëüíûå êàíàëû íå ìîãóò áûòü çàðåãèñòðèðîâàíû."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Íîâîñòü ïîä íîìåðîì #%d óäàëåíà."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Íîâîñòü ïîä íîìåðîì #%d íå îáíàðóæåíà."
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Òåêóùèå ñïèñîê íîâîñòåé:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE #êàíàë ðåæèìû"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO èìÿ_ôàéëà"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD èìÿ_ôàéëà"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD èìÿ_ôàéëà"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD èìÿ_ôàéëà"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Ìàñêà âèäà %s óæå ïðèñóòñòâóåò â âàøåì ñïèñêå äîñòóïà."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Ìàñêà äîëæíà áûòü ñòðîãî â ôîðìàòå èäåíò@õîñò."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Çàôèêñèðîâàííûé ìàêñèìóì ïîëüçîâàòåëåé: %d (íà %s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr ""
 "Ñîîáùåíèå %d îò %s (%s). ×òîáû óäàëèòü åãî, íàïèøèòå êîìàíäó: /msg %s DEL %d"
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr ""
 "Ñîîáùåíèå %d îò %s (%s). ×òîáû óäàëèòü åãî, íàïèøèòå êîìàíäó: /msg %s DEL %s "
 "%d"
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Ñîîáùåíèå ïîä íîìåðîì %d áûëî óäàëåíî."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s îòêëþ÷åí."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Ëèìèò ñîáùåíèé äëÿ %s óñòàíîâëåí íà %d."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s óñòàíîâëåí íà 0."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr ""
 "Óêàçàííîå çíà÷åíèå ëèìèòà ÷åðåñ÷óð âåëèêî è áóäåò ïðèíóäèòåëüíî èçìåíåíî äî %"
 "d."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Ìåìî-ñîîáùåíèå äëÿ %s óñïåøíî îòïðàâëåíî."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr ""
 "Ñïèñîê ñîîáùåíèé äëÿ %s. ×òîáû ïðî÷åñòü èõ, íàïèøèòå: /msg %s READ íîìåð"
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr ""
 "Ñîîáùåíèÿ êàíàëà %s. ×òîáû ïðî÷åñòü èõ, íàïèøèòå: /msg %s READ %s íîìåð"
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr ""
+"Ñïèñîê ñîîáùåíèé äëÿ %s. ×òîáû ïðî÷åñòü èõ, íàïèøèòå: /msg %s READ íîìåð"
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr ""
+"Ñîîáùåíèÿ êàíàëà %s. ×òîáû ïðî÷åñòü èõ, íàïèøèòå: /msg %s READ %s íîìåð"
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Ðåæèì ïðèâàòíûõ ñîîáùåíèé"
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "Áëîêèðîâêà ðåæèìà %c íåâîçìîæíà - ðåæèì ïðîèãíîðèðîâàí."
-
-#: language.cpp:1314
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Âñå îïû (+î) êàíàëà %s ëèøåíû ñâîåãî ñòàòóñà."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "Áëîêèðóåìûå ðåæèìû íà êàíàëå %s èçìåíåíû íà %s."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "Áëîêèðîâêà ðåæèìîâ........: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Ìîäóëü %s óñïåøíî çàãðóæåí."
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Ìîäóëü %s óñïåøíî çàãðóæåí."
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Ìîäóëü %s óñïåøíî âûãðóæåí."
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Ìîäóëü: %s Âåðñèÿ: %s Àâòîð: %s Çàãðóæåí: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Ìîäóëü: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} ñåðâåð"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS-àëèàñîâ      : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS-ãðóïï        : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Óðîâåíü äîñòóïà, èñêëþ÷àþùèé îáëàäàòåëÿ èç óñëîâèé êèêîâ áîòà"
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "Íîâîå ìåìî-ñîîáùåíèå"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr ""
 "Íîâûå ñîîáùåíèÿ äëÿ %s. ×òîáû ïðî÷åñòü èõ, íàïèøèòå: /msg %s READ íîìåð"
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr ""
 "Íîâûå ñîîáùåíèÿ íà êàíàëå %s. ×òîáû ïðî÷åñòü èõ, íàïèøèòå: /msg %s READ %"
 "s íîìåð"
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Ñïèñîê íîâîñòåé ïåðåïîëíåí."
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4215,147 +3994,133 @@ msgstr ""
 "Íèê %s áûë çàïðåùåí ê èñïîëüçîâàíèþ %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Óêàçàííûé íèê %s ñîäåðæèò íåäîïóñòèìûå ñèìâîëû."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Íèê %s íà äàííûé ìîìåíò èñïîëüçóåòñÿ êåì-òî äðóãèì."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Ñ ýòîãî ìîìåíòà íèê %s çàïðåùåí ê èñïîëüçîâàíèþ."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Íèê %s ÿâëÿåòñÿ íèêîì îäíîãî èç ñåðâèñíûõ ïñåâäîêëèåíòîâ äàííîé ñåòè."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Íà äàííûé ìîìåíò, íèê %s ñåðâèñàìè íå óäåðæèâàåòñÿ."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "Íèê %s â ñåòè íå îáíàðóæåí."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "Íèê %s íåçàðåãèñòðèðîâàí."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "Íèê %s íå ìîæåò áûòü çàðåãèñòðèðîâàí èëè èñïîëüçîâàí."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "Íèê %s â ñïèñêå èãíîðèðóåìûõ íå îáíàðóæåí."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Íèê %s áûë óñå÷åí äî %d ñèìâîëîâ."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "C ýòîãî ìîìåíòà íèê %s ñíîâà â ðåæèìå èñòå÷åíèÿ."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Ñ ýòîãî ìîìåíòà ðåãèñòðàöèÿ íèêà %s íèêîãäà íå èñòå÷åò."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Íèê %s íå ïîëó÷àë îò âàñ íèêàêèõ ñîîáùåíèé."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Íèê %s óñïåøíî äåèäåíòèôèöèðîâàí."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Íèê %s íàõîäèòñÿ â ðåæèìå ñàñïåíäà."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Ðåæèì ñàñïåíäà ñ íèêà %s óñïåøíî ñíÿò."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Ñ ýòîãî ìîìåíòà íèê %s íàõîäèòñÿ ðåæèìå ñàñïåíäà."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Íèê ÍÅ çàðåãèñòðèðîâàí, ïîïðîáóéòå, ïîæàëóéñòà, ïîçæå."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Ðåãèñòðàöèÿ íèêà %s ïîäòâåðæäåíà."
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Íèê %s óñïåøíî óäàëåí èç áàçû äàííûõ ñåðâèñîâ."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "Íèê %s óæå çàðåãèñòðèðîâàí!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "Íèê %s íå ìîæåò áûòü çàðåãèñòðèðîâàí."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Íèê %s íå çàðåãèñòðèðîâàí."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr ""
 "Íèê %s óñïåøíî çàðåãèñòðèðîâàí, â ACCESS-ñïèñîê äîáàâëåíà õîñòìàñêà: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Íèê %s óñïåøíî çàðåãèñòðèðîâàí."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Ðåãèñòðàöèÿ íèêà %s"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Ïàðîëü äëÿ íèêà %s"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4366,162 +4131,117 @@ msgstr ""
 "àâòîìàòè÷åñêè óäàëÿþòñÿ èç áàçû äàííûõ. Ñðîê ñóùåñòâîâàíèÿ íåàêòèâíûõ\n"
 "íèêîâ: %d äíåé."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "Âû íå óêàçàëè ñèìâîë '#' ïåðåä íàçâàíèåì êàíàëà."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Ðåæèì áåç-áîòà äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Ðåæèì áåç-áîòà äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Íèêè ñ email-àäðåñîì %s íå îáíàðóæåíû."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Áåç áîòîâ"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "Ñïðàâî÷íàÿ èíôîðìàöèÿ ïî %s îòñóòñòâóåò."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Èíôîðìàöèÿ î ìîäóëå %s íåäîñòóïíà. "
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Ñïèñîê íîâîñòåé ïóñò, óäàëÿòü íå÷åãî."
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå AOP'îâ êàíàëà %s íå îáíàðóæåíî."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå HOP'îâ êàíàëà %s íå îáíàðóæåíî."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå SOP'îâ êàíàëà %s íå îáíàðóæåíî."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå VOP'îâ êàíàëà %s íå îáíàðóæåíî."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå äîñòóïà êàíàëà %s íå îáíàðóæåíî."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Ñîâïàäàþùèõ çíà÷åíèé â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàðóæåíî."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Â ñïèñêå ïëîõèõ ñëîâ êàíàëà %s ñîâïàäàþùèõ çàïèñåé íå îáíàðóæåíî."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "Ñîâïàäàþùèõ çíà÷åíèé â ñïèñêå èñêëþ÷åíèé èç ëèìèòà ñåññèé íå îáíàðóæåíî."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Ñîâïàäàþùèõ çàïèñåé íå îáíàðóæåíî."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "Ñîâïàäàþùèõ çàïèñåé íå îáíàðóæåíî."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "Ñîâïàäàþùèõ çàïèñåé íå îáíàðóæåíî."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "Ñîâïàäàþùèõ çàïèñåé íå îáíàðóæåíî."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Íåò ñîîáùåíèé äîñòóïíûõ äëÿ îòìåíû."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "Ñïèñîê ìîäóëåé ïóñò."
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Ñïèñîê îïåð-íîâîñòåé ïóñò, óäàëÿòü íå÷åãî."
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïóñò, óäàëÿòü íå÷åãî."
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Íåò ïðè÷èíû"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Óðîâåíü äîñòóïà, èñêëþ÷àþùèé ïîïàäàíèå ïîä óñëîâèÿ SIGNKICK"
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå AOP'îâ êàíàëà %s íå îáíàðóæåíà."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå HOP'îâ êàíàëà %s íå îáíàðóæåíà."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå SOP'îâ êàíàëà %s íå îáíàðóæåíà."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå VOP'îâ êàíàëà %s íå îáíàðóæåíà."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "îòñóòñòâóþò"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "Óðîâåíü äîñòóïà, çàïðåùàþùèé çàõîäèòü íà êàíàë"
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4533,95 +4253,93 @@ msgstr ""
 "íå ïîñåòèò êàíàë â òå÷åíèè äàííîãî âðåìåíè), áóäåò àâòîìàòè÷åñêè\n"
 "óäàëåí èç áàçû äàííûõ ñåðâèñîâ."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Íîìåð  Ëèìèò  Õîñò"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE íèê +ôëàãè"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "OP-óâåäîìëåíèå"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Ñòàðàÿ èíôîðìàöèÿ î áîòå íå îòëè÷àåòñÿ îò íîâîé."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "Ñòàòóñ Óðîâåíü Íèê"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Ðåæèì OP-óâåäîìëåíèé äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Ðåæèì OP-óâåäîìëåíèé äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Íîâîñòü ïîä íîìåðîì #%d óäàëåíà."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Íîâîñòü ïîä íîìåðîì #%d íå îáíàðóæåíà."
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Ñïèñîê íîâîñòåé äëÿ IRC-îïåðàòîðîâ:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ        : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "OLINE-ôëàãè %s óñïåøíî óñòàíîâëåíû äëÿ ñåññèé ïîëüçîâàòåëÿ %s"
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Íå êèêàòü îïåðàòîðîâ"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Âîçìîæíîñòü íàñòðîéêè îïöèè %s â âàøåé IRC-ñåòè íåäîñòóïíà."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Ïàðîëü äëÿ íèêà %s - %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Ïàðîëü ïðèíÿò - âû ïðèçíàíû êàê âëàäåëåö íèêà."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4629,60 +4347,56 @@ msgstr ""
 "Äëÿ âûïîëíåíèÿ äàííîé êîìàíäû âû äîëæíû èäåíòèôèöèðîâàòüñÿ.\n"
 "Ïîïðîáóéòå ñíîâà ïîñëå òîãî, êàê èñïîëüçóåòå êîìàíäó /msg %s IDENTIFY ïàðîëü."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Ïàðîëü äëÿ %s èçìåíåí íà %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Ïàðîëü äëÿ %s óñïåøíî èçìåíåí."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Ïàðîëü äëÿ íèêà %s - %s"
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Âû óêàçàëè íåâåðíûé ïàðîëü."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Ïàðîëü äëÿ íèêà %s áûë âûñëàí íà åãî email-àäðåñ."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Ñïîêîéñòâèå"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Ðåæèì ñïîêîéñòâèÿ äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Ðåæèì ñïîêîéñòâèÿ äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 msgid "Please contact an Operator to get a vhost assigned to this nick."
 msgstr "Âèðòóàëüíûé õîñò äëÿ âàøåãî íèêà îòñóòñòâóåò."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4691,172 +4405,133 @@ msgstr ""
 "ëåãêî îòãàäûâàåìûì (ò.å. Âàøèì èìåíåì èëè Âàøèì íèêîì), è íå äîëæåí "
 "ñîäåðæàòü ïðîáåëîâ è òàáóëÿöèé."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr ""
 " êà÷åñòâå îñíîâíîãî ïàðàìåòðà âû äîëæíû óêàçàòü ðåàëüíîå èìÿ ñåðåâåðà "
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Âû äîëæíû óêàçàòü ñèìâîë # ïåðåä íàçâàíèåì êàíàëà."
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä è ïîâòîðèòå çàïðîñ."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Ïîäîæäèòå %d ñåêóíä ïåðåä ïîâòîðíûì èñïîëüçîâàíèåì êîìàíäû GROUP."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Ïîäîæäèòå %d ñåêóíä ïåðåä ïîâòîðíûì èñïîëüçîâàíèåì êîìàíäû REGISTER."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr ""
 "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä ïåðåä ïîâòîðíûì èñïîëüçîâàíèåì êîìàíäû RSEND."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä ïåðåä ïîâòîðíûì èñïîëüçîâàíèåì êîìàíäû SEND."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Ïðèâàòíîñòü"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "Ðåæèì ïðèâàòíûé óñïåøíî ñíÿò ñ áîòà ïîä íèêîì %s"
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "Áîò ïîä íèêîì %s óñïåøíî ïîìå÷åí êàê ïðèâàòíûé."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Ðåæèì ïðèâàòíîñòè êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Ðåæèì ïðèâàòíîñòè êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Ðåæèì ïðèâàòíîñòè äëÿ %s îòêëþ÷åí."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Ðåæèì ïðèâàòíîñòè äëÿ %s àêòèâèðîâàí."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Çàùèòà"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Çàùèòà íèêà %s îòêëþ÷åíà."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Çàùèòà íèêà %s àêòèâèðîâàíà,ëèìèò âðåìåíè íà ââîä ïàðîëÿ: 20 ñåêóíä."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Çàùèòà íèêà %s àêòèâèðîâàíà, ëèìèò âðåìåíè íà ââîä ïàðîëÿ: 0 ñåêóíä."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Çàùèòà íèêà %s àêòèâèðîâàíà, ëèìèò âðåìåíè íà ââîä ïàðîëÿ: 60 ñåêóíä."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Çàùèòà íèêà àêòèâèðîâàíà, ëèìèò âðåìåíè íà ââîä ïàðîëÿ: 0 ñåêóíä."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Ïðåäîñòàâëÿåìàÿ êîìàíäà: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [#êàíàë] {ñïèñîê_çàïèñåé | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER íèê [ïàðîëü]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER #êàíàë îïèñàíèå"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER ïàðîëü email"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER ïàðîëü [email]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE íèê [ïàðîëü]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {íèê | #êàíàë} òåêñò"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "Íîâîñòü ïîä íîìåðîì #%d óäàëåíà."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "Íîâîñòü ïîä íîìåðîì #%d íå îáíàðóæåíà."
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4864,296 +4539,307 @@ msgstr ""
 "Âðåìÿ ïåðâîé ÷àñòè ðåãèñòðàöèè èñòåêëî, âîñïîëüçóéòåñü êîìàíäîé \"/msg %s "
 "register <ïàðîëü> <email>\""
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Îãðàíè÷åííûé äîñòóï"
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Ðåæèì îãðàíè÷åííîãî äîñòóïà íà êàíàë %s îòêëþ÷åí."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Ðåæèì îãðàíè÷åííîãî äîñòóïà íà êàíàë %s àêòèâèðîâàí."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASET íèê MSG {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET íèê îïöèÿ ïàðàìåòðû"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET íèê AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET íèê HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET íèê KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET íèê KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET íèê LANGUAGE íîìåð"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET íèê NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET íèê PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET íèê SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET íèê HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY #êàíàë òåêñò"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {íèê | #êàíàë} òåêñò_ñîîáùåíèÿ"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS íèê"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "Êîìàíäà SENDPASS íåäîñòóïíà, òàê êàê âêëþ÷åíî øèôðîâàíèå ïàðîëåé."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST ëèìèò"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <íèê> <õîñòìàñêà>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET (#êàíàë | áîò) îïöèÿ ïàðàìåòð"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET #êàíàë NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET íèê_áîòà PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET #êàíàë îïöèÿ ïàðàìåòð"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET #êàíàë DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET #êàíàë DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET #êàíàë FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET #êàíàë GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET #êàíàë KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET #êàíàë OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET #êàíàë NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET #êàíàë OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET #êàíàë PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET #êàíàë PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET #êàíàë RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET #êàíàë SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET #êàíàë SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET #êàíàë SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET #êàíàë SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET #êàíàë SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET #êàíàë TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET #êàíàë XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET îïöèÿ ïàðàìåòðû"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET îïöèÿ ïàðàìåòðû"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE íîìåð"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [#êàíàë] ïðåäåë"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [íèê | #êàíàë] {ïðåäåë | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <íèê> <õîñòìàñêà>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "Ñïèñîê SNLINE'îâ ïóñò."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5161,357 +4847,341 @@ msgstr ""
 "SNLINE {ADD|DEL|LIST|VIEW|CLEAR} [[+ñðîê_èñòå÷åíèÿ] {ìàñêà | íîìåð_çàïèñè}[:"
 "ïðè÷èíà]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"Ñïèñîê SOP'îâ êàíàëà %s:\n"
-" Íîìåð  Íèê"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "Ñïèñîê SQLINE'îâ ïóñò."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD|DEL|LIST|VIEW|CLEAR} [[+ñðîê_èñòå÷åíèÿ] {ìàñêà | íîìåð_çàïèñè} "
 "[ïðè÷èíà]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Êàíàë %s íåçàðåãèñòðèðîâàí"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Íèê %s â ñåòè îòñóòñòâóåò."
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND #êàíàë ïðè÷èíà"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND #êàíàë [ïðè÷èíà]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND #êàíàë ïðè÷èíà"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND íèê ïðè÷èíà"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK íèê íîâûé_íèê "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "Ñïèñîê SZLINE'îâ ïóñò."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD|DEL|LIST|VIEW|CLEAR} [[+ñðîê_èñòå÷åíèÿ] {ìàñêà | íîìåð_çàïèñè} "
 "[ïðè÷èíà]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Áåçîïàñíîñòü"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Áåçîïàñíîñòü âëàäåëüöà"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Êîíòðîëü ñòàòóñà îïåðàòîðà"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Ðåæèì áåçîïàñíîñòè âëàäåëüöà äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Ðåæèì áåçîïàñíîñòè âëàäåëüöà äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Ðåæèì êîíòðîëÿ çà ñòàòóñîì îïåðàòîðà äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Ðåæèì êîíòðîëÿ çà ñòàòóñîì îïåðàòîðà äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Ðåæèì áåçîïàñíîñòè äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Ðåæèì áåçîïàñíîñòè äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Ðåæèì áåçîïàñíîñòè äëÿ %s îòêëþ÷åí."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Ðåæèì áåçîïàñíîñòè äëÿ %s àêòèâèðîâàí."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Áåçîïàñíîñòü"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Òåêóùåå êîë-âî ñåðâåðîâ: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Íà äàííûé ìîìåíò ñåðâèñû ðàáîòàþò â DEFCON-ðåæèìå. Ïîâòîðèòå ñâîé çàïðîñ "
 "ïîçæå."
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "DEFCON-ðåæèì àêòèâèðîâàí, óðîâåíü çàùèòû: %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: NOEXPIRE-ðåæèì äåàêòèâèðîâàí."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr ""
 "Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: àêòèâèðîâàí NOEXPIRE-ðåæèì (ðåæèì 'íå-"
 "èñòå÷åíèÿ')."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Ñåðâèñû ïåðåøëè â ðåæèì read-only (òîëüêî ÷òåíèå)."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Ñåðâèñû ïåðåøëè â ðåæèì read-write (÷òåíèå-çàïèñü)."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: àêòèâèðîâàí DEBUG-ðåæèì (óðîâåíü %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: àêòèâèðîâàí DEBUG-ðåæèì (îòëàäêà)."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: DEBUG-ðåæèì äåàêòèâèðîâàí."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr ""
 "Íàñòðîéêè mail-ôóíêöèé ñåðâèñîâ íåêîððåêòíû èëè îòêëþ÷åíû, âîçìîæíîñòü "
 "îòïðàâêè email íåäîñòóïíà."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Ñïèñîê èãíîðèðóåìûõ íèêîâ:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
 msgstr ""
-"Âîçìîæíîñòü èçìåíÿòü ðåæèìû ñåðâèñàì íåäîñòóïíà. Âû âîîáùå óâåðåíû, ÷òî "
-"íàñòðîéêè âàøèõ ñåðâåðîâ êîððåêòíû?"
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Âîçìîæíîñòü èçìåíÿòü ðåæèìû ñåðâèñàì íåäîñòóïíà. Âû âîîáùå óâåðåíû, ÷òî U:"
 "line-çàïèñè âàøèõ ñåðâåðîâ êîððåêòíû?"
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Ñåðâèñû ðàáîòàþò: %d äåíü, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Ñåðâèñû ðàáîòàþò: %d äíåé, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
+#, c-format
+msgid "Services up %d hours, %d minutes"
+msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñîâ, %d ìèíóò"
+
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minute"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñ, %d ìèíóòó"
+msgid "Services up %d minutes, %d seconds"
+msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóò, %d ñåêóíä"
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñ, %d ìèíóò"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñ, %d ìèíóò"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñîâ, %d ìèíóò"
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóòó, %d ñåêóíäó"
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóòó, %d ñåêóíä"
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóò, %d ñåêóíäó"
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:163
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóò, %d ñåêóíä"
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Ðåæèì àâòîñòàòóñà äëÿ %s îòêëþ÷åí"
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Ðåæèì àâòîñòàòóñà äëÿ %s àêòèâèðîâàí"
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr ""
 "Ðåæèì ïðèâàòíûõ ñîîáùåíèé äëÿ %s àêòèâèðîâàí, òåïåðü ñåðâèñû áóäóò îòâå÷àòü "
 "åìó â ïðèâàò."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr ""
 "Ðåæèì ïðèâàòíûõ ñîîáùåíèé äëÿ %s îòêëþ÷åí, ñåðâèñû áóäóò îòâå÷àòü åìó "
 "ïîñðåäñòâîì íîòèñîâ."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Êîíôèãóðàöèîííûé ôàéë ñåðâèñîâ áûë ñ÷èòàí çàíîâî."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Âàø íèê îñâîáîæäåí îò óäåðæàíèÿ ñåðâèñàìè."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Ëèìèò ñåññèé äëÿ %s óñòàíîâëåí íà %d."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Îãðàíè÷åíèå ñåññèé îòêëþ÷åíî, ñïèñîê èñêëþ÷åíèé íå òðåáóåòñÿ."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Ñåññèé          : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Ñåññèè    Õîñò"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Íåèçâåñòíûé ïóíêò %s. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ äîñòóïíûõ çíà÷åíèé ñì. /msg %"
 "s HELP LEVELS DESC"
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr ""
 " êà÷åñòâå ïàðàìåòðà äëÿ îïöèè DEBUG âû äîëæíû óêàçàòü ON, OFF, ëèáî "
 "ïîëîæèòåëüíîå ÷èñëî."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr ""
-" êà÷åñòâå ïàðàìåòðà äëÿ îïöèè IGNORE âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr ""
 " êà÷åñòâå ïàðàìåòðà äëÿ îïöèè NOEXPIRE âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr ""
 " êà÷åñòâå ïàðàìåòðà äëÿ îïöèè READONLY âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr ""
 " êà÷åñòâå ïàðàìåòðà äëÿ îïöèè SuperAdmin âû äîëæíû óêàçàòü ëèáî ON, "
 "ëèáî OFF."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Ðåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s îòêëþ÷åí."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Ðåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5520,222 +5190,191 @@ msgstr ""
 "Ðåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèðîâàí,\n"
 "íî áóäåò ðàáîòàòü â çàâèñèìîñòè îò íàñòðîåê óðîâíåé äîñòóïà."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Ðåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèðîâàí."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Ïîäïèñàííûå êèêè"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü èñïîëüçîâàíèÿ êîìàíäû RSEND â âàøåé IRC-ñåòè "
 "íåäîñòóïíà."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Èçâèíèòå, íàçíà÷åíèå áîòîâ íà êàíàë âðåìåííî íåäîñòóïíî."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Èçâèíèòå, íî ñîçäàòü áîòà íåóäàëîñü."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Èçâèíèòå, èçìåíåíèå íàñòðîåê áîòîâ âðåìåííî íåäîñòóïíî."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü íàñòðîéêè îïöèé áîòà âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà AOP'îâ âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr ""
-"Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà HOP'îâ âðåìåííî íåäîñòóïíà."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr ""
-"Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà SOP'îâ âðåìåííî íåäîñòóïíà."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr ""
-"Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà VOP'îâ âðåìåííî íåäîñòóïíà."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà äîñòóïà êàíàëà âðåìåííî "
 "íåäîñòóïíà."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà àâòîêèêîâ êàíàëà âðåìåííî "
 "íåäîñòóïíà."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Èçâèíèòå, èçìåíåíèå áàçû äàííûõ ïëîõèõ ñëîâ âðåìåííî íåâîçìîæíî."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Èçâèíèòå, âîçìîæíîñòü óäàëåíèå êàíàëîâ âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "Èçâèíèòå, âîçìîæíîñòü óñòàíîâêè îïöèé êàíàëîâ âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Èçâèíèòå, ðåãèñòðàöèÿ êàíàëîâ âðåìåííî ïðèîñòàíîâëåíà."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Èçâèíèòå, íî èçìåíèòü ïàðîëü äëÿ %s íåóäàëîñü."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Èçâèíèòå, íî ñãðóïïèðîâàòü íèêè íå óäàëîñü."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Èçâèíèòå, íî èäåíòèôèöèðîâàòü íèê íå óäàëîñü."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü êîíôèãóðàöèè óñëîâèé êèêîâ âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Èçâèíèòå, íî íàñòðîéêà îïöèé ñëóæáû ñîîáùåíèé âðåìåííî íåâîçìîæíà."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü îòïðàâêè ñîîáùåíèé âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü óäàëåíèÿ íèêîâ âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü ãðóïïèðîâêè íèêîâ âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü íàñòðîéêè îïöèé íèêà âðåìåííî íåäîñòóïíà."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Èçâèíèòå, íî ðåãèñòðàöèÿ íèêîâ âðåìåííî ïðèîñòàíîâëåíà."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Èçâèíèòå, íî çàðåãèñòðèðîâàòü íèê íå óäàëîñü."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Èçâèíèòå, íî êîëè÷åñòâî VOP/HOP/AOP/SOP-çàïèñåé íå ìîæåò ïåðâûøàòü %d "
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Èçâèíèòå, â ñïèñêå äîñòóïà êàíàëà ìîæåò áûòü íå áîëåå %d çàïèñåé."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Èçâèíèòå, íî êîëè÷åñòâî çàïèñåé â ñïèñêå äîñòóïà íå ìîæåò ïðåâûøàòü %d"
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Èçâèíèòå, â ñïèñêå äîñòóïà êàíàëà ìîæåò áûòü íå áîëåå %d çàïèñåé."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Ñïèñîê àâòîêèêîâ êàíàëà ìîæåò ñîäåðæàòü íå áîëåå %d çàïèñåé."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Ðàçìåð áàçû äàííûõ ïëîõèõ ñëîâ íå ìîæåò ïðåâûøàòü %d çàïèñåé."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "Èçâèíèòå, íî âû óæå ïðåâûñèëè ëèìèò (%d) çàðåãèñòðèðîâàííûõ êàíàëîâ."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr ""
 "Êîëè÷åñòâî çàðåãèñòðèðîâàííûõ âàìè êàíàëîâ äîñòèãëî %d, à ýòî - ìàêñèìóì."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Ñòàòèñòè÷åñêèå äàííûå ñáðîøåíû."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr ""
 "Ñòàòóñ íà ñåðâèñàõ îáíîâëåí (ìåìî-ñîîáùåíèÿ, âèðóòàëüíûé õîñò, è ò.ä.)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Õâàòèò ôëóäèòü!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Õâàòèò ïîâòîðîâ!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Íàñëåäíèê êàíàë %s óäàëåí."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Íàñëåäíèêîì êàíàëà %s íàçíà÷åí ïîëüçîâàòåëü %s."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "Äèðåêòèâà SuperAdmin îòêëþ÷åíà â êîíôèãóðàöèîííîì ôàéëå ñåðâèñîâ."
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Ñèìáèîç"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Ðåæèì ñèìáèîçà äëÿ êàíàëå %s îòêëþ÷åí."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Ðåæèì ñèìáèîçà äëÿ êàíàëå %s àêòèâèðîâàí."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Ñèíòàêñèñ: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5764,7 +5403,7 @@ msgstr ""
 "2 - áàí âèäà *!*@õîñò\n"
 "3 - áàí âèäà *!*èäåíò@*.äîìåí"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5777,28 +5416,12 @@ msgstr ""
 "Ïîçâîëÿåò óñòàíîâèòü îïèñàíèå êàíàëà, êîòîðîå áóäåò ïîêàçàíî ïðè\n"
 "èñïîëüçîâàíèè êîìàíä LIST è INFO."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Ñèíòàêñèñ: %s #êàíàë ENTRYMSG [òåêñò]\n"
-"\n"
-"Ïîçâîëÿåò  óñòàíîâèòü  \"ñîîáùåíèå  ïðè  âõîäå\",  êîòîðîå  áóäåò\n"
-"îòïðàâëåíî íîòèñîì (notice) êàæäîìó âîøåäøåìó íà êàíàë ïîëüçîâàòåëþ.\n"
-"Åñëè  èñïîëüçîâàòü  êîìàíäó áåç ïàðàìåòðîâ  -  òåêóùåå óñòàíîâëåííîå\n"
-"ñîîáùåíèå áóäåò óäàëåíî."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Ñèíòàêñèñ: %s #êàíàë FOUNDER íèê\n"
@@ -5806,7 +5429,7 @@ msgstr ""
 "Ïîçâîëÿåò ïåðåäàòü ïðàâà íà âëàäåíèå êàíàëîì äðóãîìó ïîëüçîâàòåëþ.\n"
 "Íèê íîâîãî âëàäåëüöà êàíàëà äîëæåí áûòü çàðåãèñòðèðîâàííûì."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5826,76 +5449,7 @@ msgstr ""
 "æå, êàê òîëüêî êàíàë ñíîâà ñòàíåò àêòèâíûì (òî åñòü, íà íåãî îïÿòü\n"
 "êòî-ëèáî çàéäåò)."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Ñèíòàêñèñ: %s #êàíàë MLOCK ðåæèìû\n"
-"\n"
-"MLOCK ïîçâîëÿåò âàì óñòàíîâèòü è çàáëîêèðîâàòü îïðåäåëåííûå ðåæèìû\n"
-"êàíàëà. Âû  ìîæåòå  çàáëîêèðîâàòü îò ñíÿòèÿ/óñòàíîâêè ëþáûå ðåæèìû,\n"
-"êàêèå òîëüêî çàõîòèòå - %S íèêîìó íå ïîçâîëèò èçìåíèòü èõ.\n"
-"\n"
-" êà÷åñòâå ïàðàìåòðà êîìàíäû, âû äîëæíû óêàçàòü ðåæèìû â òîì æå\n"
-"ôîðìàòå, â  êîòîðîì  óêàçûâàåòå  ïðè  ðó÷íîé óñòàíîâêå, ñ ïîìîùüþ\n"
-"êîìàíäû /MODE - ðåæèìû ñ  ïðåôèêñîì + ñ÷èòàþòñÿ âêëþ÷åííûìè, è,\n"
-"ñîîòâåòñòâåííî, áëîêèðóþòñÿ îò ñíÿòèÿ, à  ðåæèìû  ñ  ïðåôèêñîì -\n"
-"ñ÷èòàþòñÿ âûêëþ÷åííûìè è áëîêèðóþòñÿ îò óñòàíîâêè.\n"
-"Ïðèìå÷àíèå: îäíàêî, âû äîëæíû ïîìíèòü, ÷òî ïîâòîðíîå èñïîëüçîâàíèå\n"
-"SET MLOCK óäàëèò âñå ïðåäûäóùèå çàáëîêèðîâàííûå ðåæèìû è çàìåíèò\n"
-"èõ íîâûìè!\n"
-"\n"
-"Âíèìàíèå: åñëè âû óñòàíîâèëè è çàáëîêèðîâàëè êëþ÷ êàíàëà, êàê âî\n"
-"âòîðîì ïðèìåðå íèæå, âû äîëæíû òàêæå óñòàíîâèòü îïöèþ RESTRICTED\n"
-"íà êàíàë (ñì. HELP SET RESTRICTED), èëè ëþáîé, êòî çàéäåò íà êàíàë\n"
-"êîãäà òîò áóäåò ïóñò, ñìîæåò óâèäåòü óñòàíîâëåííûé êëþ÷!\n"
-"\n"
-"Ïðèìåðû:\n"
-"\n"
-"    SET #êàíàë MLOCK +nt-iklps\n"
-"        áëîêèðóåò âêëþ÷åííûìè ðåæèìû n è t, è âûêëþ÷åííûìè i, k, l,\n"
-"        p, è s. Ðåæèì m îñòàåòñÿ ñâîáîäíûì ê óñòàíîâêå/ñíÿòèþ.\n"
-"    SET #êàíàë MLOCK +knst-ilmp ìîé-êëþ÷-ïàðîëü\n"
-"        áëîêèðóåò âêëþ÷åííûì ðåæèìû k, n, s, è t, è âûêëþ÷åííûìè\n"
-"        i, l, m, è p. Òàêæåá óñòàíàâëèâàåò êëþ÷ äëÿ âõîäà íà êàíàë\n"
-"        (\"ìîé-êëþ÷-ïàðîëü\").\n"
-"    SET #êàíàë MLOCK +\n"
-"        óäàëÿåò áëîêèðîâêó ðåæèìîâ. Âñå ðåæèìû êàíàëà ìîãóò áûòü\n"
-"        ñâîáîäíî èçìåíåíû ëþáûì îïåðàòîðîì êàíàëà."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5911,7 +5465,7 @@ msgstr ""
 "Êîãäà îï-óâåäîìëåíèå âêëþ÷åíî, %S áóäåò ïîñûëàòü íîòèñ\n"
 "íà êàíàë êàæäûé ðàç, êîãäà êòî-ëèáî èñïîëüçóåò êîìàíäû OP/DEOP."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5930,7 +5484,7 @@ msgstr ""
 "Ïðèìå÷àíèå: òåì íå ìåíåå ëþáîé, èìåþùèé äîñòóï ê ýòèì êîìàíäàì,\n"
 "ñìîæåò èñïîëüçîâàòü èõ îòíîñèòåëüíî ñåáÿ."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5975,7 +5529,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5988,13 +5542,13 @@ msgstr ""
 "Àêòèâèðóåò/äåàêòèâèðóåò îïöèþ ïðèâàòíîñòè êàíàëà. Äàííûé ðåæèì\n"
 "ïîçâîëÿåò ñêðûòü âàø êàíàë â ñïèñêå êàíàëîâ ïî /msg %S LIST."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Ñèíòàêñèñ: %s #êàíàë RESTRICTED {ON | OFF}\n"
@@ -6003,7 +5557,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -6025,7 +5579,7 @@ msgstr ""
 "ñìîãóò çàïðîñèòü ñòàòóñ äàæå åñëè èìåþò àâòîðèçàöèþ ê ñâîåìó íèêó\n"
 "âñåãî ëèøü ÷åðåç ñïèñîê ìàñîê íà %s."
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -6044,54 +5598,12 @@ msgstr ""
 "ðåàëüíîãî âëàäåëüöà, ïðîïèñàííîãî â ãðàôå Founder (Âëàäåëåö êàíàëà).\n"
 "(è íå âàæíî, êòî òàì èäåíòèôèöèðîâàëñÿ ê êàíàëó ÷åðåç %S ID)."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Ñèíòàêñèñ: %s #êàíàë SECUREOPS {ON | OFF}\n"
-"\n"
-"Àêòèâèðóåò/äåàêòèâèðóåò ðåæèì îãðàíè÷åíèÿ íà ïîëó÷åíèå ñòàòóñà\n"
-"îïåðàòîðà êàíàëà. Äàííûé  ðåæèì  ïîçâîëÿåò  çàïðåòèòü âîçìîæíîñòü\n"
-"ïîëó÷åíèÿ ñòàòóñà îïà òåì ïîëüçîâàòåëÿì, êîòîðûå íå ïðèñóòñòâóþò\n"
-"â  ñïèñêå  äîñòóïà  êàíàëà  èëè  ïðàâà  êîòîðûõ íå ñîîòâåòñòâóþò\n"
-"ïîëó÷àåìîìó ñòàòóñó."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Ñèíòàêñèñ: %s #êàíàë SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Âêëþ÷àåò èëè âûêëþ÷àåò îïöèþ \"ïîäïèñàííûõ êèêîâ\" íà êàíàëå.\n"
-"Àêòèâèðîâàíèå ðåæèìà SIGNKICK çàñòàâèò %S àâòîìàòè÷åñêè\n"
-"äîáàâëÿòü ê ïðè÷èíå êèêà íèê òîãî, êòî èñïîëüçîâàë êîìàíäó KICK.\n"
-"\n"
-" êà÷åñòâå äîïîëíèòåëüíîãî ïàðàìåòðà äëÿ îïöèè SIGNKICK âû ìîæåòå\n"
-"óêàçàòü çíà÷åíèå LEVEL. Ýòî  ïîçâîëèò  áîëåå  òîíêî  ëèìèòèðîâàòü\n"
-"äåéñòâèå äàííîãî ðåæèìà, ïðè  óñëîâèè  êîíå÷íî,  ÷òî âû èñïîëüçóåòå\n"
-"ñèñòåìó LEVELS íà êàíàëå (ñì. /msg %S HELP LEVELS äëÿ\n"
-"áîëåå ïîäðîáíîé èíôîðìàöèè)."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6109,23 +5621,7 @@ msgstr ""
 "êàíàëîì è òîò áóäåò óäàëåí. Êî âñåìó ïðî÷åìó, íèê íàñëåäíèêà êàíàëà\n"
 "äîëæåí áûòü çàðåãèñòðèðîâàííûì íèêîì."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Ñèíòàêñèñ: %s #êàíàë TOPICLOCK {ON | OFF}\n"
-"\n"
-"Âêëþ÷àåò èëè âûêëþ÷àåò îïöèþ áëîêèðîâêè òîïèêà íà êàíàëå. Ïðè\n"
-"âêëþ÷åííîì ðåæèìå áëîêèðîâêè òîïèêà, %S ðàçðåøèò ìåíÿòü\n"
-"òîïèê êàíàëà òîëüêî ÷åðåç ñåðâèñíóþ êîìàíäó TOPIC."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6175,10 +5671,11 @@ msgstr ""
 "Ïåðåêëþ÷åíèå èç ñèñòåìû  xOP â ñèñòåìó  ACCESS  îáû÷íî ïðîõîäèò áåç\n"
 "êàêèõ-ëèáî ïðîáëåì."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6191,18 +5688,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6261,7 +5762,7 @@ msgstr ""
 "The ACCESS VIEW command displays the access list similar\n"
 "to ACCESS LIST bu"
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6308,7 +5809,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        âûâîäèò òåêóùèé ñïèñîê \"äîâåðåííûõ\" õîñòìàñîê."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6321,12 +5822,18 @@ msgstr ""
 "â IRC-êëèåíòå mIRC. Âû äîëæíû óêàçàòü îáà ïàðàìåòðà: òåêñò äåéñòâèÿ\n"
 "è #êàíàë."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6347,15 +5854,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6425,7 +5923,8 @@ msgstr ""
 "\n"
 "Êîìàíäà AKICK CLEAR ïîëíîñòüþ î÷èùàåò ñïèñîê àâòîêèêîâ êàíàëà."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6433,21 +5932,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6518,7 +6017,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR ïîçâîëÿåò  ïîëíîñòüþ  î÷èñòèòü  ñïèñîê AKILL'îâ."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6558,7 +6057,7 @@ msgstr ""
 "Ïðèìå÷àíèå: åñëè âû âèäèòå ìåòêó \"!\" ïåðåä èìåíåì êàíàëà, ýòî\n"
 "çíà÷èò ÷òî îí íàõîäèòñÿ â ðåæèìå NOEXPIRE."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6576,10 +6075,11 @@ msgstr ""
 "íèê ñ óêàçàííûì óðîâíåì èëè âûøå.\n"
 "Äëÿ èñïîëüçîâàíèÿ ýòîé êîìàíäû íåîáõîäèìû ïðàâà Àäìèíèñòðàòîðà ñåðâèñîâ."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6659,7 +6159,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïðèâèëåãèé xOP ñì. ñïðàâî÷íóþ èíôîðìàöèþ\n"
 "ïî /msg %S HELP ACCESS è /msg %S HELP SET XOP."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6673,7 +6173,8 @@ msgstr ""
 "æå ïîñëå óñòàíîâêè, âû ñìîæåòå ñêîíôèãóðèðîâàòü îïöèè áîòà ïî ñâîåìó\n"
 "óñìîòðåíèþ."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6705,7 +6206,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6751,7 +6252,7 @@ msgstr ""
 " êà÷åñòâå äîïîëíèòåëüíîãî ïàðàìåòðà, âû ìîæåòå óêàçàòü ñèìâîëüíóþ\n"
 "ìàñêó, ÷òî  ïîçâîëèò  âàì  ïîëó÷èòü  ñïèñîê ñ êîíêðå"
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6767,7 +6268,7 @@ msgstr ""
 "Ïî-óìîë÷àíèþ,  äàííàÿ  êîìàíäà  ìîæåò  áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6811,7 +6312,7 @@ msgstr ""
 "ëþáîé, êòî èñïîëüçóåò ýòîò íèê íà ìîìåíò ñîçäàíèÿ áîòà  -  áóäåò òóò\n"
 "æå îòêëþ÷åí îò ñåòè."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6821,7 +6322,7 @@ msgstr ""
 "\n"
 "Âûâåäåò ñïèñîê âñåõ äîñòóïíûõ äëÿ óñòàíîâêè áîòîâ."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6833,7 +6334,7 @@ msgstr ""
 "Îòìåíÿåò ïîñëåäíåå ñîîáùåíèå, îòïðàâëåííîå âàìè óêàçàííîìó íèêó\n"
 "èëè êàíàëó, òåì ñàìûì ïðåäîõðàíÿÿ åãî îò ïðî÷òåíèÿ àäðåñàòîì."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6845,7 +6346,7 @@ msgstr ""
 "óêàçàííîé ïðè÷èíîé íà óêàçàííûé ïðîìåæóòîê âðåìåíè.  êà÷åñòâå ìàñêè\n"
 "AKILL'îâ áóäóò èñïîëüçîâàíû ìàñêè ïîñåòèòåëåé êàíàëà âèäà èäåíò@õîñò."
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6868,7 +6369,7 @@ msgstr ""
 "Äîïîëíèòåëüíûé ïàðàìåòð SECRET ïîçâîëÿåò ïîëó÷èòü ñïèñîê êàíàëîâ\n"
 "ñ ðåæèìàìè +s/+p, ñîâïàäàþùèõ ñ óêàçàííîé ñèìâîëüíîé ìàñêîé."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6881,66 +6382,33 @@ msgstr ""
 "óêàçàííûì íèêîì.\n"
 "Ïðèìå÷àíèå: êîìàíäà ðàáîòàåò òîëüêî äëÿ íèêîâ, íå äëÿ êàíàëîâ."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Ñèíòàêñèñ: CLEAR #êàíàë ÷òî_èìåííî\n"
-"\n"
-"Ïîñûëàåò %S çàïðîñ íà î÷èñòêó îïðåäåëåíûõ ðåæèìîâ êàíàëà.\n"
-"Âàëèäíûå çíà÷åíèÿ:\n"
+"Ñèíòàêñèñ: DEOWNER #êàíàë\n"
 "\n"
-"    MODES     ñáðîñ âñåõ ðåæèìîâ êàíàëà (i,k,l,m,n,p,s,t è ò. ä.)\n"
-"    BANS      óäàëåíèå âñåõ áàíîâ êàíàëà\n"
-"    EXCEPTS   óäàëåíèå âñåõ èñêëþ÷åíèé èç áàíà\n"
-"    INVITES   óäàëåíèå âñåõ èñêëþ÷åíèé íà ïðèãëàøåíèå\n"
-"    OPS       ñíÿòèå ñòàòóñà îïåðàòîðà ñî âñåõ îïåðàòîðîâ êàíàëà.\n"
-"                If supported, removes channel-admin (mode +a) and\n"
-"                channel-owner (mode +q) as well.\n"
-"    HOPS      ñíÿòèå ñòàòóñà ïîëóîïåðàòîðà ñî âñåõ õîïîâ êàíàëà\n"
-"    VOICES    ñíÿòèå ñòàòóñà âîéñà ñî âñåõ âîéñîâ êàíàëà\n"
-"    USERS     ìàññîâûé êèê âñåõ ïîñåòèòåëåé êàíàëà\n"
+"Ñíèìàåò  ñ  èñïîëüçóþùåãî  ñòàòóñ âëàäåëüöà êàíàëà.\n"
 "\n"
 "Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà òîëüêî\n"
 "âëàäåëüöåì êàíàëà."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Ñèíòàêñèñ: CLEARMODES #êàíàë [ALL]\n"
-"\n"
-"Î÷èùàåò âñå äâîè÷íûå ðåæèìû (i,k,l,m,n,p,s,t) è áàíû íà óêàçàííîì\n"
-"êàíàëå. Ñ äîïîëíèòåëüíûì ïàðàìåòðîì ALL - ñíèìåò ñî âñåõ ñòàòóñû\n"
-"îïåðàòîðîâ/âîéñîâ (ðåæèìû +o è +v)."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6966,7 +6434,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6980,12 +6448,14 @@ msgstr ""
 "êàñàòüñÿ íå òîëüêî ðàáîòû ñàìèõ ñåðâèñîâ, íî è ôóíêöèîíèðîâàíèÿ ñåòè\n"
 "â öåëîì, ÷òî, ïîðîþ, âåñüìà ïîëåçíî ïðè ðàçíîãî ðîäà àòàêàõ íà ñåòü."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -7002,7 +6472,7 @@ msgstr ""
 "èëè ëèöàìè ñ óðîâíåì äîñòóïà 4 è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -7012,11 +6482,12 @@ msgstr ""
 "\n"
 "Óäàëÿåò âèðòóàëüíûé õîñò íàçíà÷åííûé óêàçàííîìó íèêó."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -7048,22 +6519,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      óäàëèò âñå ñîîáùåíèÿ ñ 2-ãî ïî 5-îå è ñ 7-ãî ïî 9-îå."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Ñèíòàêñèñ: DELALL <íèê>.\n"
 "\n"
 "Óäàëÿåò âèðòóàëüíûå õîñòû ó âñåõ íèêîâ óêàçàííîé ãðóïïû."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -7077,30 +6551,36 @@ msgstr ""
 "Ïî-óìîë÷àíèþ,  äàííàÿ  êîìàíäà  ìîæåò  áûòü  èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Ñèíòàêñèñ: DEOWNER #êàíàë\n"
+"Ñèíòàêñèñ: DEOP #êàíàë [íèê]\n"
 "\n"
-"Ñíèìàåò  ñ  èñïîëüçóþùåãî  ñòàòóñ âëàäåëüöà êàíàëà.\n"
+"Ñíèìàåò  ñòàòóñ  îïåðàòîðà  êàíàëà  ñ  óêàçàííîãî  íèêà íà óêàçàííîì\n"
+"êàíàëå. Åñëè íèê íå óêàçàí, ñíèìàåò ñòàòóñ îïåðàòîðà ñ èñïîëüçóþùåãî\n"
+"êîìàíäó.\n"
 "\n"
-"Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà òîëüêî\n"
-"âëàäåëüöåì êàíàëà."
+"Ïî-óìîë÷àíèþ,  äàííàÿ  êîìàíäà  ìîæåò  áûòü  èñïîëüçîâàíà AOP'àìè èëè\n"
+"ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Ñèíòàêñèñ: DEPROTECT #êàíàë [íèê]\n"
 "\n"
@@ -7112,12 +6592,14 @@ msgstr ""
 "ëèöàìè ñ óðîâíåì äîñòóïà 10 (SOP) è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -7133,7 +6615,7 @@ msgstr ""
 "èëè ëèöàìè  ñ  óðîâíåì  äîñòóïà  3 è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7145,7 +6627,7 @@ msgstr ""
 "Óäàëÿåò óêàçàííûé êàíàë èç áàçû äàííûõ ñåðâèñîâ. Èñïîëüçîâàòü DROP\n"
 "ìîæåò ëèøü âëàäåëåö êàíàëà."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7159,9 +6641,10 @@ msgstr ""
 "Êàê Àäìèíèñòðàòîð ñåðâèñîâ, âû ìîæåòå óäàëèòü ëþáîé çàðåãèñòðèðîâàííûé\n"
 "êàíàë ñåòè áåç êàêîé-ëèáî èäåíòèôèêàöèè ê íåìó."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7169,6 +6652,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7185,7 +6672,7 @@ msgstr ""
 "ê óäàëÿåìîñó íèêó (èëè ãðóïïå íèêîâ). Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè\n"
 "ñì. /msg %S HELP IDENTIFY"
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7206,8 +6693,8 @@ msgstr ""
 "ëþáîé íèê èç âàøåé ãðóïïû, íå èìåÿ êàêèõ-ëèáî îñîáûõ ïðèâèëåãèé.\n"
 "Óäàëèòü àáñîëþòíî ëþáîé íèê ìîãóò òîëüêî Àäìèíèñòðàòîðû ñåðâèñîâ."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7218,7 +6705,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7240,7 +6727,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7297,7 +6784,7 @@ msgstr ""
 "õîñòà. Ñëèøêîì áîëüøîé ñïèñîê èñêëþ÷åíèé ñ øèðîêèìè ìàñêàìè â\n"
 "äîñòàòî÷íîé ìåðå âëèÿåò íà ïðîèçâîäèòåëüíîñòü ñåðâèñîâ."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7314,7 +6801,7 @@ msgstr ""
 "Ïðèìå÷àíèå: â çàâèñèìîñòè îò íàñòðîåê ñåðâèñîâ, ïðè÷èíà ìîæåò\n"
 "áûòü ïàðàìåòðîì êàê îïöèîíàëüíûì, òàê è íåîáõîäèìûì."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7330,7 +6817,7 @@ msgstr ""
 "\n"
 " íåêîòîðûõ ñåòÿõ, ïðè÷èíà ÿâëÿåòñÿ îáÿçàòåëüíûì ïàðàìåòðîì."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7345,7 +6832,7 @@ msgstr ""
 "ñîîáùåíèå, âêëþ÷àþùåå íèê âûçâàâøåãî êîìàíäó è óêàçàííûé email,\n"
 "áóäåò çàïèñàíî â ëîã-ôàéë ñåðâèñîâ."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7355,16 +6842,15 @@ msgstr ""
 "\n"
 "Ïîçâîëÿåò çàïðîñèòü ó ñåðâèñîâ êëþ÷-ïàðîëü êàíàëà."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Ñèíòàêñèñ: GETPASS íèê\n"
 "\n"
@@ -7375,14 +6861,14 @@ msgstr ""
 "Îäíîâðåìåííî ñ ýòèì, ñîáûòèå áóäåò çàïèñàíî â ëîã-ôàéë.\n"
 "Ïðèìå÷àíèå 2: êîìàíäà íåäîñòóïíà, åñëè âêëþ÷åíî øèôðîâàíèå ïàðîëåé."
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7406,7 +6892,7 @@ msgstr ""
 "îòêëþ÷àåìîãî íèêà. Äîïóñòèìî èñïîëüçîâàíèå äàííîé êîìàíäû äàæå ïðè\n"
 "èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åðåç ñïèñîê õîñòìàñîê."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7416,7 +6902,7 @@ msgstr ""
 "\n"
 "Âûâîäèò ñïèñîê íèêîâ â âàøåé ãðóïïå."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7433,7 +6919,7 @@ msgstr ""
 "ïîêàæåò âñå íèêè íàõîäÿùèåñÿ â ãðóïïå óêàçàííîãî íèêà.\n"
 "Äëÿ èñïîëüçîâàíèÿ ýòîé êîìàíäû íåîáõîäèìû ïðàâà Àäìèíèñòðàòîðà ñåðâèñîâ."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7447,7 +6933,7 @@ msgstr ""
 "âñåì ïîëüçîâàòåëÿì ñåòè.  êà÷åñòâå íèêà îòïðàâèòåëÿ áóäåò óêàçàí\n"
 "%s."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7460,7 +6946,7 @@ msgstr ""
 "Ýòà êîìàíäà ïîçâîëÿåò ïîëüçîâàòåëÿì óñòàíîâèòü âèðòóàëüíûé õîñò\n"
 "ñ èõ ÒÅÊÓÙÅÃÎ íèêà íà âñå íèêè ãðóïïû."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7522,16 +7008,17 @@ msgstr ""
 "íèêàê íåìîæåò.\n"
 "Ïðèìå÷àíèå 2: ó âñåõ íèêîâ â ãðóïïå - åäèíûé ïàðîëü."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Ñèíòàêñèñ: HALFOP #êàíàë [íèê]\n"
 "\n"
@@ -7544,10 +7031,11 @@ msgstr ""
 "èëè ëèöàìè ñ óðîâíåì äîñòóïà 4 è âûøå  (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7623,7 +7111,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïðèâèëåãèé xOP ñì. ñïðàâî÷íóþ èíôîðìàöèþ\n"
 "ïî /msg %S HELP ACCESS è /msg %S HELP SET XOP."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7642,9 +7130,20 @@ msgstr ""
 "ïàðîëÿ âû äîëæíû óêàçàòü òîò ñàìûé ïàðîëü, êîòîðûé óêàçûâàëè ïðè\n"
 "ðåãèñòðàöèè âàøåãî íèêà."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7673,7 +7172,7 @@ msgstr ""
 "Ïîëüçîâàòåëè ñî ñòàòóñîì  IRC-îïåðàòîðà  èãíîðèðîâàòüñÿ  ñåðâèñàìè íå\n"
 "áóäóò, äàæå åñëè îíè ïðèñóòñòâóþò â ñïèñêå èãíîðà."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7692,7 +7191,7 @@ msgstr ""
 "Ïðèìå÷àíèå: ïî-óìîë÷àíèþ, èñïîëüçîâàòü êîìàíäó ñ ïàðàìåòðîì ALL\n"
 "ìîæåò òîëüêî âëàäåëåö êàíàëà."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7709,7 +7208,7 @@ msgstr ""
 "ïàðàìåòð ALL, ÷òîáû ïîëó÷èòü âñþ äîñòóïíóþ èíôîðìàöèþ, â òîì ÷èñëå\n"
 "è òó, êîòîðàÿ ñêðûòà."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7725,7 +7224,7 @@ msgstr ""
 "âû ìîæåòå ïðèíÿòü. Åñëè  âû  óêàæåòå  â êà÷åñòâå ïàðàìåòðà êàíàë - \n"
 "âûâåäåò àíàëîãè÷íóþ èíôîðìàöèþ îá óêàçàííîì êàíàëå."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7751,7 +7250,7 @@ msgstr ""
 "óêàçàííîì íèêå.\n"
 "Äàííûé ïàðàìåòð ìîãóò èñïîëüçîâàòü òîëüêî Àäìèíèñòðàòîðû ñåðâèñîâ."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7770,12 +7269,12 @@ msgstr ""
 "îïöèè).\n"
 "Ïðèìå÷àíèå: äàííûå áóäóò ïîñëàíû îò ëèöà %S"
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7787,14 +7286,15 @@ msgstr ""
 "Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7813,7 +7313,7 @@ msgstr ""
 "Ïðèìå÷àíèå: ïàðàìåòð ïðè÷èíà ÿâëÿåòñÿ íå îáÿçàòåëüíûì, åñëè âû åãî\n"
 "íå óêàæåòå, áóäåò èñïîëüçîâàíà ñòàíäàðòíàÿ, âèäà: \"Juped by <íèê>\"."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7829,7 +7329,7 @@ msgstr ""
 "Ïî-óìîë÷àíèþ,  äàííàÿ  êîìàíäà  ìîæåò áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7855,7 +7355,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7883,12 +7383,14 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7934,14 +7436,14 @@ msgstr ""
 "Ïðèìå÷àíèå: äîñòóï ê ýòîé êîìàíäå îïðåäåëÿåòñÿ óðîâíåì äîñòóïà ê\n"
 "êîìàíäå SET (ñèñòåìà LEVELS)."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7956,7 +7458,25 @@ msgstr ""
 "\n"
 "*** SpamMan was kicked by %S (Alcan (Flood))"
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7975,7 +7495,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -8017,7 +7537,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -8036,7 +7556,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -8065,7 +7585,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -8081,7 +7601,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -8100,7 +7620,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -8118,8 +7638,8 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -8129,17 +7649,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -8171,7 +7691,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -8206,7 +7726,7 @@ msgstr ""
 "Ëèìèò îäíîâðåìåííî ïîêàçûâàåìûõ çàïèñåé îãðàíè÷åí ÷èñëîì, óêàçàííûì\n"
 "â êîíôèãóðàöèîííîì ôàéëå ñåðâèñîâ äèðåêòèâîé NSListMax."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8224,7 +7744,7 @@ msgstr ""
 "Ïðèìå÷àíèå: ïðè ïîèñêå êàíàëîâ íà÷èíàþùèõñÿ ñ \"#\",  ñàì ñèìâîë\n"
 "\"#\" óêàçûâàòü íå íàäî - îí çàðåçåðâèðîâàí äëÿ ñïèñêà (ñì. âûøå)."
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8262,7 +7782,8 @@ msgstr ""
 "        Ïîêàæåò âñå íèêè, ïðèíàäëåæàùèå ïîëüçîâàòåëÿì\n"
 "        â äîìåíå bar.org."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8290,7 +7811,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Ñèíòàêñèñ: LIST ìàñêà [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8321,13 +7841,14 @@ msgstr ""
 "       Ïîêàæåò âñå çàðåãèñòðèðîâàííûå íèêè ó êîòîðûõ âêëþ÷åíà îïöèÿ\n"
 "       NOEXPIRE."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8343,11 +7864,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      ïîêàæåò ñîîáùåíèÿ ñ 2-ãî ïî 5-îå è ñ 7-ãî ïî 9-îå."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Ñèíòàêñèñ: LOGONNEWS ADD òåêñò"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8382,11 +7903,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Ñèíòàêñèñ: LOGONNEWS DEL {íîìåð | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8402,7 +7923,7 @@ msgstr ""
 "Ïðèìå÷àíèå: òåì íå  ìåíåå,  ïîñëå  èñïîëüçîâàíèÿ  äàííîé  êîìàíäû,\n"
 "ñåðâèñû íå ïîøëþò âàì çàïðîñ î íåîáõîäèìîñòè èäåíòèôèêàöèè ê íèêó."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8428,12 +7949,13 @@ msgstr ""
 "Èñïîëüçîâàòü ïàðàìåòðû íèê è REVALIDATE ìîãóò ëèøü Àäìèíèñòðàòîðû\n"
 "ñåðâèñîâ."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Ñèíòàêñèñ: MODE #êàíàë ðåæèìû\n"
@@ -8443,7 +7965,34 @@ msgstr ""
 "òîì æå ôîðìàòå, â êîòîðîì óêàçûâàåòå ïðè ðó÷íîé óñòàíîâêå, ñ ïîìîùüþ\n"
 "êîìàíäû /MODE."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8453,7 +8002,7 @@ msgstr ""
 "\n"
 "Âûâîäèò ïîäðîáíóþ èíôîðìàöèþ î êîíêðåòíîì çàãðóæåííîì ìîäóëå."
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8465,7 +8014,7 @@ msgstr ""
 "ïàðàìåòðà âû ìîæåòå óêàçàòü òèï ìîäóëÿ - ýòî ïîçâîëèò ïîëó÷èòü ñïèñîê,\n"
 "îòâå÷àþùèé óêàçàííûì òðåáîâàíèÿì."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8477,7 +8026,7 @@ msgstr ""
 "Ïîçâîëÿåò çàãðóçèòü êàêîé-ëèáî äîïîëíèòåëüíûé ìîäóëü èç äèðåêòîðèè\n"
 "ñ ìîäóëÿìè (modules/). "
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8489,7 +8038,7 @@ msgstr ""
 "Ïîçâîëÿåò çàãðóçèòü êàêîé-ëèáî äîïîëíèòåëüíûé ìîäóëü èç äèðåêòîðèè\n"
 "ñ ìîäóëÿìè (modules/). "
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8501,10 +8050,12 @@ msgstr ""
 "Âûãðóæàåò óêàçàííûé ìîäóëü (åñëè ìîäóëü çàãðóæåí è åñëè óñëîâèÿ\n"
 "ïîçâîëÿþò åãî âûãðóçèòü)."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8527,7 +8078,7 @@ msgstr ""
 "\n"
 "Ïðèìå÷àíèå: íàëè÷èå ñåðâåðà â ñåòè ñåðâèñàìè íå ïðîâåðÿåòñÿ."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8539,7 +8090,7 @@ msgstr ""
 "Äåàêòèâèðóåò âàø òåêóùèé âèðòóàëüíûé õîñò, ïðè óñëîâèè, êîíå÷íî,\n"
 "÷òî òàêîâîé óñòàíîâëåí íà ìîìåíò èñïîëüçîâàíèÿ êîìàíäû."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8556,7 +8107,7 @@ msgstr ""
 "\n"
 "Äëÿ èñïîëüçîâàíèÿ ýòîé êîìàíäû íåîáõîäèìû ïðàâà Ñóïåð-Àäìèíèñòðàòîðà."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8570,12 +8121,14 @@ msgstr ""
 "çàìåíåí íà âèðòóàëüíûé, è, ñîîòâåòñòâåííî, îí è áóäåò ïîêàçàí â\n"
 "/WHOIS-èíôîðìàöèè âàøåãî íèêà."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8589,11 +8142,11 @@ msgstr ""
 "Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Ñèíòàêñèñ: OPERNEWS ADD òåêñò"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8629,31 +8182,38 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Ñèíòàêñèñ: OPERNEWS DEL {íîìåð | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Ñèíòàêñèñ: OWNER #êàíàë\n"
+"Ñèíòàêñèñ: OP #êàíàë [íèê]\n"
 "\n"
-"Óñòàíàâëèâàåò ñòàòóñ âëàäåëüöà êàíàëà èñïîëüçóþùåìó êîìàíäó.\n"
+"Ïîçâîëÿåò óñòàíîâèòü ñòàòóñ îïåðàòîðà êàíàëà óêàçàííîìó íèêó íà\n"
+"óêàçàííîì êàíàëå.  Åñëè  íèê  íå óêàçàí, ñòàòóñ îïåðàòîðà áóäåò\n"
+"âûäàí èñïîëüçóþùåìó êîìàíäó.\n"
 "\n"
-"Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà òîëüêî\n"
-"âëàäåëüöåì êàíàëà."
+"Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
+"ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8668,10 +8228,11 @@ msgstr ""
 "ëèöàìè ñ óðîâíåì äîñòóïà 10 (SOP) è âûøå  (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8744,7 +8305,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8763,11 +8324,11 @@ msgstr ""
 "îøèáêè, ñîõðàíåíèÿ êîòîðûõ íóæíî èçáåæàòü.\n"
 "Äëÿ íîðìàëüíîãî çàâåðøåíèÿ ðàáîòû ñåðâèñîâ èñïîëüçóéòå êîìàíäó SHUTDOWN."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Ñèíòàêñèñ: RANDOMNEWS ADD òåêñò"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8796,18 +8357,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Ñèíòàêñèñ: RANDOMNEWS DEL {íîìåð | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8824,7 +8386,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      âûâåäåò òåêñò âñåõ ñîîáùåíèé ñ 2-ãî ïî 5-îå è ñ 7-ãî ïî 9-îå."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8882,7 +8444,8 @@ msgstr ""
 "èçìåíÿåìîãî íèêà. Äîïóñòèìî èñïîëüçîâàíèå äàííîé êîìàíäû äàæå ïðè\n"
 "èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åðåç ñïèñîê õîñòìàñîê."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8893,7 +8456,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8924,24 +8487,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8989,15 +8553,15 @@ msgstr ""
 "ñ îáùåé äëÿ íèõ èíôîðìàöèåé, íàñòðîéêàìè, ñïèñêîì äîñòóïà. Äëÿ áîëåå\n"
 "ïîäðîáíîé èíôîðìàöèè ñì. /msg %S HELP GROUP"
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -9021,7 +8585,7 @@ msgstr ""
 "óäåðæèâàåìîãî íèêà. Äîïóñòèìî èñïîëüçîâàíèå  äàííîé êîìàíäû  äàæå ïðè\n"
 "èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åðåç ñïèñîê õîñòìàñîê."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -9036,7 +8600,7 @@ msgstr ""
 "òðåáóåò  ïîëíîãî  ïåðåçàïóñêà  ñåðâèñîâ  (íàïðèìåð: èçìåíåíèå íèêîâ\n"
 "ñåðâèñîâ, àêòèâàöèÿ ëèìèòèðîâàíèÿ ñåññèé, è ò.ä.)"
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -9048,7 +8612,7 @@ msgstr ""
 "Êîìàíäà RESEND ïîçâîëÿåò çàíîâî âûñëàòü íîâûé auth-êîä (êîäîâóþ\n"
 "ôðàçó) íà email-àäðåñ ïîëüçîâàòåëÿ, èñïîëüçóþùåãî ýòó êîìàíäó."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -9059,7 +8623,7 @@ msgstr ""
 "Sends a code key to the nickname with the instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -9070,13 +8634,14 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò ñåðâèñû ñîõðàíèòü âñå áàçû äàííûõ è òóò æå ïåðåçàïóñòèòüñÿ."
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -9091,24 +8656,26 @@ msgstr ""
 "Ñàìî ñîáîé ðàçóìååòñÿ, ÷òî íèê/êàíàë îòïðàâèòåëÿ/ïîëó÷àòåëÿ äîëæíû\n"
 "áûòü çàðåãèñòðèðîâàíû."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Ñèíòàêñèñ: SASET íèê îïöèÿ ïàðàìåòðû.\n"
 "\n"
 "Ïîçâîëÿåò Àäìèíèñòðàòîðàì ñåðâèñîâ íàñòðàèâàòü êàêèå-ëèáî îïöèè äëÿ\n"
 "óêàçàííîãî íèêà áåç èäåíòèôèêàöèè ê íåìó. Ñïèñîê îïöèè:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Ñèíòàêñèñ: SASET íèê AUTOOP {ON | OFF}\n"
 "\n"
@@ -9117,7 +8684,7 @@ msgstr ""
 "âëàäåëüöó íèêà ñòàòóñ ïðè âõîäå íà êàíàë. Ñîîòâåòñòâåííî OFF  -\n"
 "äëÿ îòêëþ÷åíèÿ."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -9131,7 +8698,7 @@ msgstr ""
 "ïðîïèñàí.\n"
 "Ïðèìå÷àíèå: íîâûé ãëàâíûé íèê äîëæåí ñîñòîÿòü â ãðóïïå íèêà."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -9142,7 +8709,7 @@ msgstr ""
 "Àññîöèèðóåò email-àäðåñ ñ óêàçàííûì íèêîì. Äàííûé email áóäåò ïîêàçàí\n"
 "â èíôîðìàöèè îá óêàçàííîì íèêå, ïðåäîñòàâëÿåìîé ïî êîìàíäå INFO."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -9158,7 +8725,7 @@ msgstr ""
 "÷òî äëÿ îòîáðàæåíèÿ ïðèâåòñâèÿ, íà êàíàëå äîëæíà áûòü àêòèâèðîâàíà\n"
 "îïöèÿ GREET è íèê äîëæåí èìåòü ñîîòâåòñòâóþùèé óðîâåíü äîñòóïà."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9186,22 +8753,22 @@ msgstr ""
 " êà÷åñòâå òðåòüåãî ïàðàìåòðà âû äîëæíû óêàçàòü ëèáî ON ëèáî OFF.\n"
 "Ïåðâûé àêòèâèðóåò ñêðûòèå, âòîðîé, ñîîòâåòñòâåííî, äåàêòèâèðóåò."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Ñèíòàêñèñ: SASET íèê KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9222,7 +8789,7 @@ msgstr ""
 "Ïðèìå÷àíèå: âîçìîæíîñòü óñòàíîâêè ìåòîäà çàùèòû IMMED ìîæåò áûòü\n"
 "îòêëþ÷åíà â âàøåé IRC-ñåòè."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -9240,7 +8807,7 @@ msgstr ""
 "  êà÷åñòâå  íîìåðà  âû  äîëæíû óêàçàòü êîíêðåòíûé íîìåð ÿçûêà èç\n"
 "ñïèñêà ïîääåðæèâàåìûõ ÿçûêîâ: /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -9257,7 +8824,7 @@ msgstr ""
 "óâåäîìëåíèé (notice, íîòèñû).\n"
 "Ïðèìå÷àíèå: íàñòðîéêà äàííîé îïöèè ìîæåò áûòü çàáëîêèðîâàíà."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9270,18 +8837,19 @@ msgstr ""
 "ïî âðåìåíè. Óêàæèòå ON, ÷òî áû àêòèâèðîâàòü òàê íàçûâàåìûé ðåæèì\n"
 "'íå-èñòå÷åíèÿ'. Ïàðàìåòð OFF ñíîâà âîçâðàùàåò íèê â ðåæèì èñòå÷åíèÿ."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Ñèíòàêñèñ: SASET íèê PASSWORD íîâûé_ïàðîëü \n"
 "\n"
 "Ïîçâîëÿåò èçìåíèòü ïàðîëü íèêà, èñïîëüçóåìûé äëÿ èäåíòèôèêàöèè\n"
 "â êà÷åñòâå âëàäåëüöà íèêà."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9300,16 +8868,16 @@ msgstr ""
 "Ïðèìå÷àíèå: òåì íå ìåíåå ëþáîé, êòî çíàåò òî÷íîå íàïèñàíèå íèêà,\n"
 "èìååò âîçìîæíîñòü ïîëó÷èòü èíôîðìàöèþ î íåì èñïîëüçóÿ êîìàíäó INFO."
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9329,7 +8897,7 @@ msgstr ""
 "áû îäíà õîñòìàñêà, ñîâïàäàþùàÿ ñ òåêóùåé õîñòìàñêîé ïîëüçîâàòåëÿ,\n"
 "âçÿâøåãî íèê. Ðåæèì îïöèè KILL ïðè ýòîì çíà÷åíèÿ íå èìååò."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9339,13 +8907,14 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò áîòà ïîñëàòü óêàçàííûé òåêñò íà óêàçàííûé #êàíàë."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Ñèíòàêñèñ: SEND {íèê | #êàíàë} òåêñò_ñîîáùåíèÿ\n"
@@ -9356,9 +8925,11 @@ msgstr ""
 "Ïðèìå÷àíèå: ïîëó÷àòåëü, áóäü òî íèê èëè êàíàë, äîëæåí áûòü\n"
 "çàðåãèñòðèðîâàí, äëÿ âîçìîæíîñòè îòïðàâêè/ïîëó÷åíèÿ ìåìî-ñîîáùåíèé."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Ñèíòàêñèñ: SENDALL òåêñò_ñîîáùåíèÿ\n"
@@ -9366,7 +8937,7 @@ msgstr ""
 "Îòïðàâëÿåò ìàññîâîå ìåìî-ñîîáùåíèå âñåì çàðåãèñòðèðîâàííûì\n"
 "ïîëüçîâàòåëÿì ñåòè."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9385,7 +8956,7 @@ msgstr ""
 "Ïðèìå÷àíèå: SENDPASS ìîæåò áûòü îãðàíè÷åí äëÿ èñïîëüçîâàíèÿ òîëüêî\n"
 "IRC-îïåðàòîðàìè äàííîé ñåòè."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9421,7 +8992,7 @@ msgstr ""
 "ñåññèé è êàê óñòàíîâèòü îòäåëüíûé ëèìèò ñåññèé äëÿ îïðåäåëåííîãî\n"
 "õîñòà èëè ãðóïïû õîñòîâ."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9436,7 +9007,67 @@ msgstr ""
 "ôîðìàò SET <íèê> <èäåíò>@<õîñòìàñêà> äëÿ óñòàíîâêè âèðòóàëüíûõ\n"
 "èäåíòà è õîñòà îäíîâðåìåííî."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Ñèíòàêñèñ: %s #êàíàë SECUREOPS {ON | OFF}\n"
+"\n"
+"Àêòèâèðóåò/äåàêòèâèðóåò ðåæèì îãðàíè÷åíèÿ íà ïîëó÷åíèå ñòàòóñà\n"
+"îïåðàòîðà êàíàëà. Äàííûé  ðåæèì  ïîçâîëÿåò  çàïðåòèòü âîçìîæíîñòü\n"
+"ïîëó÷åíèÿ ñòàòóñà îïà òåì ïîëüçîâàòåëÿì, êîòîðûå íå ïðèñóòñòâóþò\n"
+"â  ñïèñêå  äîñòóïà  êàíàëà  èëè  ïðàâà  êîòîðûõ íå ñîîòâåòñòâóþò\n"
+"ïîëó÷àåìîìó ñòàòóñó."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Ñèíòàêñèñ: %s #êàíàë SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Âêëþ÷àåò èëè âûêëþ÷àåò îïöèþ \"ïîäïèñàííûõ êèêîâ\" íà êàíàëå.\n"
+"Àêòèâèðîâàíèå ðåæèìà SIGNKICK çàñòàâèò %S àâòîìàòè÷åñêè\n"
+"äîáàâëÿòü ê ïðè÷èíå êèêà íèê òîãî, êòî èñïîëüçîâàë êîìàíäó KICK.\n"
+"\n"
+" êà÷åñòâå äîïîëíèòåëüíîãî ïàðàìåòðà äëÿ îïöèè SIGNKICK âû ìîæåòå\n"
+"óêàçàòü çíà÷åíèå LEVEL. Ýòî  ïîçâîëèò  áîëåå  òîíêî  ëèìèòèðîâàòü\n"
+"äåéñòâèå äàííîãî ðåæèìà, ïðè  óñëîâèè  êîíå÷íî,  ÷òî âû èñïîëüçóåòå\n"
+"ñèñòåìó LEVELS íà êàíàëå (ñì. /msg %S HELP LEVELS äëÿ\n"
+"áîëåå ïîäðîáíîé èíôîðìàöèè)."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Ñèíòàêñèñ: %s #êàíàë TOPICLOCK {ON | OFF}\n"
+"\n"
+"Âêëþ÷àåò èëè âûêëþ÷àåò îïöèþ áëîêèðîâêè òîïèêà íà êàíàëå. Ïðè\n"
+"âêëþ÷åííîì ðåæèìå áëîêèðîâêè òîïèêà, %S ðàçðåøèò ìåíÿòü\n"
+"òîïèê êàíàëà òîëüêî ÷åðåç ñåðâèñíóþ êîìàíäó TOPIC."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9447,6 +9078,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9471,7 +9103,7 @@ msgstr ""
 "Ïðèìå÷àíèå: äîñòóï ê ýòîé êîìàíäå îïðåäåëÿåòñÿ óðîâíåì äîñòóïà ê\n"
 "êîìàíäå SET (ñèñòåìà LEVELS)."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9483,7 +9115,7 @@ msgstr ""
 "îáû÷íûì ïîëüçîâàòåëÿì èñïîëüçîâàòü åãî. Äîñòóï ê íåìó áóäåò òîëüêî\n"
 "ó àäìèíèñòðàöèè ñåòè."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9497,7 +9129,7 @@ msgstr ""
 "Ïîçâîëÿåò âëàäåëüöó êàíàëà ìåíÿòü ðàçëè÷íûå íàñòðîéêè êàíàëà.\n"
 "Äîñòóïíûå îïöèè:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9512,7 +9144,7 @@ msgstr ""
 "âñåõ îïåðàòîðîâ êàíàëà, íå âàæíî, ñîîòâåòñòâóåò èõ óðîâåíü äîñòóïà\n"
 "çíà÷åíèþ óñòàíîâêè NOKICK èëè íåò."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9527,7 +9159,7 @@ msgstr ""
 "âñåõ âîéñîâ êàíàëà, íå âàæíî, ñîîòâåòñòâóåò èõ óðîâåíü äîñòóïà\n"
 "çíà÷åíèþ óñòàíîâêè NOKICK èëè íåò."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9581,7 +9213,7 @@ msgstr ""
 "!deprotect, !owner è !deowner  -  ìîãóò áûòü íåäîñòóïíû â âàøåé\n"
 "ñåòè."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9597,7 +9229,22 @@ msgstr ""
 "âñåõ òåõ ïîëüçîâàòåëåé, êîòîðûå èìåþò äîñòàòî÷íûé óðîâåíü äîñòóïà\n"
 "íà êàíàëå è óñòàíîâèëè ñåáå òåêñò ïðèâåòñòâèÿ (ñì. íàñòðîéêè íèêà)."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9613,7 +9260,7 @@ msgstr ""
 "Åñëè áîò óæå óñòàíîâëåí íà êàíàëå, îí áóäåò àâòîìàòè÷åñêè óäàëåí ñ\n"
 "íåãî ñðàçó æå ïîñëå âêëþ÷åíèÿ äàííîé îïöèè."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9627,7 +9274,7 @@ msgstr ""
 "èñòå÷åíèÿ åãî ðåãèñòðàöèè ïî âðåìåíè. Ñîîòâåòñòâåííî äåàêòèâèðîâàíèå\n"
 "ðåæèìà âåðíåò âñå íà êðóãè ñâîÿ."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9645,26 +9292,17 @@ msgstr ""
 "áîò ñîâåðøàë îò ñåáÿ, íàïðèìåð òàêèå, êàê: ñìåíà ðåæèìîâ, óñòàíîâêà\n"
 "áàíîâ, êèêè ïîëüçîâàòåëåé è ò. ä."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Ñèíòàêñèñ: SET îïöèÿ ïàðàìåòðû\n"
-"\n"
-"Êîìàíäà SET ïîçâîëÿåò âàì íàñòðîèòü ðàçëè÷íûå îïöèè íèêà.\n"
-"Ñïèñîê îïöèé:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9680,7 +9318,18 @@ msgstr ""
 "Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè î êîíêðåòíîé îïöèè âîñïîëüçóéòåñü\n"
 "êîìàíäîé /msg %S HELP SET îïöèÿ."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Ñèíòàêñèñ: SET îïöèÿ ïàðàìåòðû\n"
+"\n"
+"Êîìàíäà SET ïîçâîëÿåò âàì íàñòðîèòü ðàçëè÷íûå îïöèè íèêà.\n"
+"Ñïèñîê îïöèé:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9690,7 +9339,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Ñèíòàêñèñ: SET îïöèÿ ïàðàìåòð\n"
@@ -9707,7 +9355,7 @@ msgstr ""
 "    SUPERADMIN àêòèâàöèÿ/äåàêòèâàöèÿ ðåæèìà Ñóïåð-Àäìèíèñòðàòîðà\n"
 "                 (îòíîñèòåëüíî èñïîëüçóþùåãî êîìàíäó)"
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9720,31 +9368,7 @@ msgstr ""
 "Óêàæèòå ON, åñëè õîòèòå ÷òî áû ñåðâèñû àâòîìàòè÷åñêè äàâàëè âàì\n"
 "ñòàòóñ ïðè âõîäå íà êàíàë. Ñîîòâåòñòâåííî OFF - äëÿ îòêëþ÷åíèÿ."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Ñèíòàêñèñ: SET DEBUG {ON | OFF | óðîâåíü}\n"
-"\n"
-"Âêëþ÷àåò èëè âûêëþ÷àåò îòëàäî÷íûé ðåæèì ðàáîòû ñåðâèñîâ. Àêòèâàöèÿ\n"
-"äàííîãî ðåæèìà ïîçâîëèò áîëåå äåòàëüíî ëîãèðîâàòü ðàáîòó ñåðâèñîâ,\n"
-"â ÷àñòíîñòè - çàïèñûâàòü â ëîã âñå ïîñëàííûå è ïðèíÿòûå ñåðâèñàìè\n"
-"äàííûå, è îïåðàöèè ñ ýòèìè ñàìûìè äàííûìè.  êà÷åñòâå ïàðàìåòðà âû\n"
-"ìîæååò óêàçàòü óðîâåíü äåòàëüíîñòü îòëàäî÷íîãî ðåæèìà, ÷åì âûøå\n"
-"óðîâåíü - òåì áîëåå äåòàëüíûìè (è îáüåìíûìè, õåõ) áóäóò ëîãè.\n"
-"\n"
-"Àêòèâèðîâàíèå äàííîé îïöèè ýêâèâàëåíòíî çàïóñêó ñåðâèñîâ ñ êëþ÷îì\n"
-"-debug."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9757,7 +9381,7 @@ msgstr ""
 "îòîáðàæàòüñÿ â ñïèñêå äîñòóïà êàíàëîâ, ãäå âû ïðîïèñàíû.\n"
 "Ïðèìå÷àíèå: íîâûé ãëàâíûé íèê äîëæåí ñîñòîÿòü â âàøåé ãðóïïå íèêîâ."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9770,7 +9394,7 @@ msgstr ""
 "Àññîöèèðóåò email-àäðåñ ñ âàøèì íèêîì. Äàííûé email áóäåò ïîêàçàí\n"
 "â èíôîðìàöèè î âàøåì íèêå, ïðåäîñòàâëÿåìîé ïî êîìàíäå INFO."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9786,7 +9410,7 @@ msgstr ""
 "÷òî äëÿ îòîáðàæåíèÿ ïðèâåòñòâèÿ, íà êàíàëå äîëæíà áûòü àêòèâèðîâàíà\n"
 "îïöèÿ GREET è âû äîëæíû èìåòü ñîîòâåòñòâóþùèé óðîâåíü äîñòóïà."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9814,19 +9438,7 @@ msgstr ""
 " êà÷åñòâå òðåòüåãî ïàðàìåòðà âû äîëæíû óêàçàòü ëèáî ON ëèáî OFF.\n"
 "Ïåðâûé àêòèâèðóåò ñêðûòèå, âòîðîé, ñîîòâåòñòâåííî, äåàêòèâèðóåò."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Ñèíòàêñèñ: SET IGNORE {ON | OFF}\n"
-"\n"
-"Ïîçâîëÿåò àêòèâèðîâàòü/äåàêòèâèðîâàòü îáðàáîòêó ñåðâèñíîãî ñïèñêà\n"
-"èãíîðèðóåìûõ  íèêîâ.  Âêëþ÷èòå äàííûé ðåæèì, åñëè õîòèòå ÷òî áû\n"
-"ñåðâèñû èãíîðèðîâàëè çàïðîñû îò íèêîâ ÷èñëÿùèõñÿ â ñïèñêå èãíîðà."
-
-#: language.cpp:2853
+#: modules/core/ns_set_kill.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9841,7 +9453,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Ñèíòàêñèñ: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9862,7 +9474,7 @@ msgstr ""
 "Ïðèìå÷àíèå: âîçìîæíîñòü óñòàíîâêè ìåòîäà çàùèòû IMMED ìîæåò áûòü\n"
 "îòêëþ÷åíà â âàøåé IRC-ñåòè."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9880,7 +9492,7 @@ msgstr ""
 " êà÷åñòâå íîìåðà, âû äîëæíû óêàçàòü êîíêðåòíûé íîìåð ÿçûêà èç\n"
 "ñïèñêà ïîääåðæèâàåìûõ ÿçûêîâ:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9897,7 +9509,7 @@ msgstr ""
 "âîçìîæíîñòü ïðèíÿòèÿ ñîîáùåíèé.\n"
 "Ìàêñèìàëüíî äîïóñòèìîå çíà÷åíèå: %d."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9939,7 +9551,7 @@ msgstr ""
 "ïðèâèëåãèè. Îíè íå ìîãóò óäàëèòü ñâîé ëèìèò, íå ìîãóò óñòàíîâèòü\n"
 "ëèìèò âûøå %d, è íå ìîãóò èñïîëüçîâàòü îïöèþ HARD."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9949,7 +9561,7 @@ msgstr ""
 "\n"
 "Îòîáðàæàåò ñòàòóñ ðàçëè÷íûõ ñåðâèñíûõ íàñòðîåê (âêë/âûêë)."
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9965,10 +9577,11 @@ msgstr ""
 "çàñòàâèò ñåðâèñû èñïîëüçîâàòü ðåæèì óâåäîìëåíèé (notice, íîòèñû).\n"
 "Ïðèìå÷àíèå: íàñòðîéêà äàííîé îïöèè ìîæåò áûòü çàáëîêèðîâàíà."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9984,7 +9597,7 @@ msgstr ""
 "Àêòèâèðîâàíèå äàííîé îïöèè ýêâèâàëåíòíî çàïóñêó ñåðâèñîâ ñ êëþ÷îì\n"
 "-noexpire."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -10024,7 +9637,7 @@ msgstr ""
 "\n"
 "Ïàðàìåòð ON ÿâëÿåòñÿ êîìáèíàöèåé çíà÷åíèé LOGON è NEW."
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -10036,7 +9649,7 @@ msgstr ""
 "Ïîçâîëÿåò èçìåíèòü ïàðîëü íèêà, èñïîëüçóåìûé äëÿ èäåíòèôèêàöèè ê\n"
 "íåìó â êà÷åñòâå ïîëíîïðàâíîãî âëàäåëüöà."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -10055,7 +9668,7 @@ msgstr ""
 "Ïðèìå÷àíèå: òåì íå ìåíåå, ëþáîé, êòî çíàåò âàø íèê, èìååò âîçìîæíîñòü\n"
 "ïîëó÷èòü èíôîðìàöèþ î âàñ èñïîëüçóÿ êîìàíäó INFO."
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -10087,16 +9700,16 @@ msgstr ""
 "Àêòèâèðîâàíèå äàííîé îïöèè ýêâèâàëåíòíî çàïóñêó ñåðâèñîâ ñ êëþ÷îì\n"
 "-readonly."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -10116,7 +9729,7 @@ msgstr ""
 "õîñòìàñêà, ñîâïàäàþùàÿ ñ âàøåé òåêóùåé. Ðåæèì îïöèè KILL ïðè ýòîì\n"
 "çíà÷åíèÿ íå èìååò."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -10137,14 +9750,15 @@ msgstr ""
 "íåîáõîäèìîñòè. Îòêëþ÷èòå åå ñðàçó, êàê òîëüêî ïåðåñòàíåòå íóæäàòüñÿ\n"
 "â íåé."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Ñèíòàêñèñ: SETALL <íèê> <õîñòìàñêà>.\n"
@@ -10158,7 +9772,7 @@ msgstr ""
 "íèêîâ óêàçàííîé ãðóïïû è íå áóäåò àâòîìàòè÷åñêè îáíîâëåí äëÿ íîâîãî\n"
 "íèêà, âíåñåííîãî â ãðóïïó óæå ïîñëå óñòàíîâêè âèðòóàëüíîãî õîñòà."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -10168,10 +9782,11 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò ñåðâèñû ñîõðàíèòü âñå áàçû äàííûõ è çàâåðøèòü ñâîþ ðàáîòó."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -10207,7 +9822,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -10262,10 +9877,11 @@ msgstr ""
 "\n"
 "SNLINE CLEAR ïîçâîëÿåò  ïîëíîñòüþ  î÷èñòèòü  ñïèñîê SNLINE'îâ."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -10343,7 +9959,8 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïðèâèëåãèé xOP ñì. ñïðàâî÷íóþ èíôîðìàöèþ\n"
 "ïî /msg %S HELP ACCESS è /msg %S HELP SET XOP."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10359,31 +9976,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10440,21 +10057,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR ïîçâîëÿåò  ïîëíîñòüþ  î÷èñòèòü  ñïèñîê SQLINE'îâ."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10465,9 +10068,11 @@ msgstr ""
 "Âûâîäèò ñïèñîê ïðèâèëåãèðîâàííûõ íà ñåðâèñàõ ïîëüçîâàòåëåé (òàêèõ\n"
 "êàê Àäìèíèñòðàòîðû èëè Îïåðàòîðû ñåðâèñîâ) è èõ òåêóùèé ñòàòóñ."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Ñèíòàêñèñ: STAFF òåêñò_ñîîáùåíèÿ\n"
@@ -10475,7 +10080,7 @@ msgstr ""
 "Ïîçâîëÿåò îòïðàâèòü ìåìî-ñîîáùåíèå âñåì îïåðàòîðàì/àäìèíèñòðàòîðàì\n"
 "ñåðâèñîâ ñåòè."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10524,7 +10129,7 @@ msgstr ""
 "Ïàðàìåòð ALL âûâåäåò îáùóþ ñòàòèñòèêó â êîìáèíàöèè ñ äàííûìè èç\n"
 "MEMORY è UPLINK."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10548,12 +10153,13 @@ msgstr ""
 "\n"
 "    STATUS ERROR ñîîáùåíèå_îá_îøèáêå"
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10592,7 +10198,7 @@ msgstr ""
 "âñå ëèøíèå áóäó ïðîèãíîðèðîâàíû. Åñëè ïàðàìåòð íå óêàçàí - êîìàíäà\n"
 "âåðíåò âàø òåêóùèé ñòàòóñ íà ñåðâèñàõ."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10615,7 +10221,7 @@ msgstr ""
 "Ïðèìå÷àíèå: â  çàâèñèìîñòè  îò  íàñòðîåê  ñåðâèñîâ,  ïðè÷èíà ìîæåò\n"
 "áûòü ïàðàìåòðîì êàê îïöèîíàëüíûì, òàê è íåîáõîäèìûì."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10625,7 +10231,8 @@ msgstr ""
 "\n"
 "Ïîçâîëÿåò ïðèíóäèòåëüíî èçìåíèòü óêàçàííûé íèê íà íîâûé_íèê."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10638,31 +10245,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10716,7 +10323,7 @@ msgstr ""
 "\n"
 "SZLINE CLEAR ïîçâîëÿåò  ïîëíîñòüþ  î÷èñòèòü  ñïèñîê SZLINE'îâ."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10741,7 +10348,7 @@ msgstr ""
 "Ïî-óìîë÷àíèþ, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà òîëüêî\n"
 "âëàäåëüöåì êàíàëà."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10758,7 +10365,7 @@ msgstr ""
 "\n"
 "Äëÿ èñïîëüçîâàíèÿ ýòîé êîìàíäû íåîáõîäèìû ïðàâà Ñóïåð-Àäìèíèñòðàòîðà."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10775,7 +10382,7 @@ msgstr ""
 "äàííûå è íàñòðîéêè êàíàëà áóäó ñîõðàíåíû. Â äàëüíåéøåì, ýòî ïîçâîëèò\n"
 "âàì ïåðåíàçíà÷èòü áîòà íà êàíàë ñ âîññòàíîâëåíèåì âñåõ ñòàðûõ íàñòðîåê."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, fuzzy, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10794,7 +10401,7 @@ msgstr ""
 "Ïî-óìîë÷àíèþ,  äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà AOP'àìè\n"
 "èëè ëèöàìè ñ óðîâíåì äîñòóïà 5 è âûøå."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10811,7 +10418,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10822,7 +10429,7 @@ msgstr ""
 "\n"
 "Ïîëíîñòüþ âîññòàíàâëèâàåò àêòèâíîñòü ïðèîñòàíîâëåííîãî êàíàëà."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10833,7 +10440,7 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò ñåðâèñû íåìåäëåííî ñîõðàíèòü âñå áàçû äàííûõ íà äèñê."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10858,12 +10465,14 @@ msgstr ""
 "ñ ðåæèìîì +i, äàííûå êîòîðûõ ñîâïàäàþò ñ óêàçàííîé â êà÷åñòâå âòîðîãî\n"
 "ïàðàìåòðà õîñòìàñêîé."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10880,10 +10489,11 @@ msgstr ""
 "èëè ëèöàìè ñ óðîâíåì äîñòóïà 3 è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10959,7 +10569,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïðèâèëåãèé xOP ñì. ñïðàâî÷íóþ èíôîðìàöèþ\n"
 "ïî /msg %S HELP ACCESS è /msg %S HELP SET XOP."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10975,7 +10585,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10986,7 +10596,7 @@ msgstr ""
 "Ïðèìå÷àíèå: â ðåæèìå ñàñïåíäà íèê èñêëþ÷åí èç óñëîâèé èñòå÷åíèÿ ïî\n"
 "âðåìåíè."
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10994,7 +10604,7 @@ msgstr ""
 "Syntax: UNSUSPEND íèê\n"
 "Îñâîáîæäàåò íèê èç ðåæèìà ñàñïåíäà (çàìîðîçêè)."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -11007,56 +10617,57 @@ msgstr ""
 "âñåõ êàíàëàõ, ãäå ó âàñ åñòü ñòàòóñ (ModeonID), îáíîâëÿåò âàøè\n"
 "âèðòóàëüíûå õîñòû è íàñòðîéêè (äàòà ïîñëåäíåãî ïîñåùåíèÿ IRC, è ò.ä.)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC #êàíàë [òåêñò_òîïèêà]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "Âîçìîæíîñòü óñòàíîâêè ðåæèìà IMMED â âàøåé IRC-ñåòè íåäîñòóïíà."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "Ñïèñîê AKILL'îâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Óðîâåíü DEFCON òåïåðü ðàâåí %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Ñ ýòîãî ìîìåíòà, email-àäðåñ íèêà %s áóäåò ñêðûò èç èíôîðìàöèè ïî %s INFO."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr ""
 "Òåïåðü, email-àäðåñ íèêà %s áóäåò ïîêàçûâàòüñÿ â èíôîðìàöèè ïî %s INFO."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "Ñïèñîê SNLINE'îâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "Ñïèñîê SQLINE'îâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "Ñïèñîê SZLINE'îâ ïîëíîñòüþ î÷èùåí."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Êàíàë %s íå èìååò êëþ÷à (no key)."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Íèæå ïðåäñòàâëåí ñïèñîê âñåõ äîñòóïíûõ êîìàíä/ôóíêöèé è èõ îïèñàíèå.\n"
@@ -11065,40 +10676,40 @@ msgstr ""
 "êîìàíä/ôóíêöèé ðàñöåíèâàþòñÿ êàê ìèíèìàëüíûå (ìèíèìàëüíî íåîáõîäèìûé\n"
 "óðîâåíü äëÿ èñïîëüçîâàíèÿ)."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr ""
 "Êîëè÷åñòâî ñåññèé ñ õîñòà %s: %d, äîïóñòèìûé ìàêñèìóì äëÿ äàííîãî õîñòà: %d"
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr ""
 "Ïîñëåäíåå ñîîáùåíèå, êîòîðîå âû ïîñûëàëè äëÿ %s (à áûëî ýòî %s) óæå "
 "ïðî÷èòàíî."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Ïîñëåäíåå ñîîáùåíèå, êîòîðîå âû ïîñûëàëè äëÿ %s (à áûëî ýòî %s) åùå íå "
 "ïðî÷èòàíî."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Ïîñëåäíåå quit-ñîîáùåíèå äëÿ %s òåïåðü áóäåò ñêðûòî èç èíôîðìàöèè ïî %s INFO."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 "Ïîñëåäíåå quit-ñîîáùåíèå äëÿ %s òåïåðü áóäåò ïîêàçûâàòüñÿ â èíôîðìàöèè ïî %s "
 "INFO."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
@@ -11106,7 +10717,7 @@ msgstr ""
 "Ïîñëåäíÿÿ ìàñêà (èäåíò@õîñò) äëÿ %s òåïåðü áóäåò ñêðûòà èç èíôîðìàöèè ïî %s "
 "INFO."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
@@ -11114,34 +10725,34 @@ msgstr ""
 "Ïîñëåäíÿÿ ìàñêà (èäåíò@õîñò) äëÿ %s òåïåðü áóäåò ïîêàçûâàòüñÿ â èíôîðìàöèè "
 "ïî %s INFO."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s íå ìîæåò áûòü èçìåíåí."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr ""
 "Íîâûé ãëàâíûé íèê äëÿ %s äîëæåí áûòü çàðåãèñòðèðîâàííûì íèêîì è ñîñòîÿòü â "
 "åãî ãðóïïå!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Îñíîâíîé íèê ãðóïïû èçìåíåí íà %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Íèê ïîëüçîâàòåëÿ %s áûë èçìåíåí íà %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
@@ -11149,19 +10760,19 @@ msgstr ""
 "Óðîâåíü äîñòóïà ê ñåðâèñàì äëÿ %s òåïåðü áóäåò ñêðûò èç èíôîðìàöèè ïî %s "
 "INFO."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Óðîâåíü äîñòóïà ê ñåðâèñàì äëÿ %s òåïåðü áóäåò ïîêàçûâàòüñÿ â èíôîðìàöèè ïî %"
 "s INFO."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "%d ñîîáùåíèé íà êàíàëå %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -11169,7 +10780,7 @@ msgstr ""
 "Ñïèñîê äîñòóïíûõ áîòîâ ïóñò.\n"
 "Ïî âîïðîñàì ñîçäàíèÿ áîòîâ îáðàùàéòåñü ê Àäìèíèñòðàòîðàì ñåðâèñîâ."
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -11178,12 +10789,12 @@ msgstr ""
 "Ñëèøêîì ìíîãî íèêîâ â ãðóïïå %s. Ïðîâåðüòå ñïèñîê è óäàëèòå íåíóæíûå.\n"
 "Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè ñì. /msg %s HELP GLIST è /msg %s HELP DROP"
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "%d ñîîáùåíèå íà êàíàëå %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -11191,28 +10802,28 @@ msgstr ""
 "Äëÿ êàíàëà %s ïðèøëî íîâîå ñîîáùåíèå.\n"
 "Íàïèøèòå /msg %s READ %s %d ÷òîáû ïðî÷èòàòü åãî."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Áîò ñ êàíàëà %s óñïåøíî óäàëåí."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Ñïèñîê íîâîñòåé ïóñò."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Ñïèñîê îïåð-íîâîñòåé ïóñò."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïóñò."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "Äëÿ âàøåãî íèêà íå óñòàíîâëåí email-àäðåñ."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -11227,32 +10838,28 @@ msgstr ""
 "    PRIVATE       îãðàíè÷èòü óêàçàííîãî áîòà äî èñïîëüçîâàíèÿ åãî\n"
 "                  òîëüêî àäìèíèñòðàöèåé ñåòè."
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "Èñïîëüçîâàòü ýòîò êàíàë çàïðåùåíî àäìèíèñòðàöèåé ñåòè."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ýòîò êàíàë áûë çàðåãèñòðèðîâàí ñ ïîìîùüþ %s"
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "Àêòèâíîñòü äàííîãî êàíàëà áûëà ïðèîñòàíîâëåíà àäìèíèñòðàöèåé ñåòè."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Èñïîëüçîâàíèå äàííîãî êàíàëà çàïðåùåíî."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Äîïîëíèòåëüíî: ðåãèñòðàöèÿ ýòîãî êàíàëà íèêîãäà íå èñòå÷åò."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "Ýòîò ìîäóëü íå ìîæåò áûòü âûãðóæåí."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -11261,14 +10868,14 @@ msgstr ""
 "ðåãèñòðàöèþ çàïðàøèâàëè èìåííî âû, ïðîâåðüòå âàø e-mail íà ïðåäìåò ïîëó÷åíèÿ "
 "auth-êîäà."
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
 msgstr ""
 "Ýòîò íèê îæèäàåò ïîäòâåðæäåíèÿ ÷åðåç e-mail ïåðåä çàâåðøåíèåì ðåãèñòðàöèè."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -11277,20 +10884,20 @@ msgstr ""
 "Åñëè ýòî âàø íèê, èäåíòèôèöèðóéòåñü êîìàíäîé /msg %s IDENTIFY ïàðîëü\n"
 " ïðîòèâíîì ñëó÷àå - âûáåðèòå äðóãîé íèê."
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Ýòîò íèê çàðåãèñòðèðîâàí êåì-òî äðóãèì, âû íå ìîæåòå åãî èñïîëüçîâàòü."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "Äîïîëíèòåëüíî: ýòîò íèê íàõîäèòñÿ â ðåæèìå ñàñïåíäà (çàìîðîæåí)."
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Äîïîëíèòåëüíî: ýòîò íèê íàõîäèòñÿ â ðåæèìå ñàñïåíäà ïî ïðè÷èíå: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -11300,16 +10907,16 @@ msgstr ""
 "Åñëè ýòî âàø íèê, èäåíòèôèöèðóéòåñü êîìàíäîé /msg %s IDENTIFY ïàðîëü.\n"
 "Èíà÷å, âûáåðèòå, ïîæàëóéñòà, äðóãîé íèê."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr ""
 "Âûáðàííûé âàìè íèê çàïðåùåí ê èñïîëüçîâàíèþ. Âîçüìèòå êàêîé-íèáóäü äðóãîé."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Äîïîëíèòåëüíî: ðåãèñòðàöèÿ ýòîãî íèêà íèêîãäà íå èñòå÷åò."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -11317,44 +10924,35 @@ msgstr ""
 "×òî áû íàéòè êàíàë, íà÷èíàþùèéñÿ ñ ñèìâîëà #, ïðîñòî óêàæèòå åãî\n"
 "íàçâàíèå áåç #. Íàïðèìåð anope âìåñòî #anope."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Áëîêèðîâêà òîïèêà"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Õðàíåíèå òîïèêà"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Ðåæèì áëîêèðîâêè òîïèêà äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Ðåæèì áëîêèðîâêè òîïèêà äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Ðåæèì õðàíåíèÿ òîïèêà äëÿ êàíàëà %s îòêëþ÷åí."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Ðåæèì õðàíåíèÿ òîïèêà äëÿ êàíàëà %s àêòèâèðîâàí."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Âûêëþ÷è CapsLOCK!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè ñì. /msg %S HELP êîìàíäà\n"
@@ -11363,7 +10961,7 @@ msgstr ""
 "   Èçìåíèòü ýòè óñëîâèÿ âû ìîæåòå ñ ïîìîùüþ òîíêîé íàñòðîéêè ÷åðåç\n"
 "   %s LEVELS."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -11373,7 +10971,7 @@ msgstr ""
 "âîñïîëüçóéòåñü êîìàíäîé /msg %S HELP SASET îïöèÿ\n"
 "Ïîìíèòå, âû äîëæíû óêàçàòü íèê, îïöèè êîòîðîãî âû õîòèòå èçìåíèòü."
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -11381,7 +10979,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -11389,7 +10987,7 @@ msgstr ""
 "Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè î êàêîé-ëèáî êîíêðåòíîé îïöèè, ñì.\n"
 "ñïðàâêó ïî /msg %S HELP îïöèÿ"
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -11399,127 +10997,108 @@ msgstr ""
 "àäðåñ.\n"
 "Íå âîëíóéòåñü, äàííûé email-àäðåñ çíàòü áóäåòå ëèøü âû è Àäìèíèñòðàöèÿ ñåòè."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Íàïèøèòå /msg %s LIST NEW ÷òîáû ïîñìîòðåòü ñïèñîê ñîîáùåíèé."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Íàïèøèòå /msg %s READ %d ÷òîáû ïðî÷èòàòü åãî."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Íàïèøèòå /msg %s READ LAST ÷òîáû ïðî÷èòàòü åãî."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE íèê ðåæèìû"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN #êàíàë"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN #êàíàë [nick]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND #êàíàë"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND íèê"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Íåâîçìîæíî çàãðóçèòü ìîäóëü %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Íåâîçìîæíî âûãðóçèòü ìîäóëü %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Íåèçâåñòíàÿ SASET-îïöèÿ %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Íåèçâåñòíàÿ SET-îïöèÿ %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Íåèçâåñòíûé STATS-ïàðàìåòð %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Íåèçâåñòíàÿ êîìàíäà %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Íåèçâåñòíàÿ êîìàíäà %s. Ñïèñîê êîìàíä äîñòóïåí ïî /msg %s HELP"
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Íåèçâåñòíûé ðåæèì %c - ïðîèãíîðèðîâàí."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Íåèçâåñòíàÿ îïöèÿ %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Íåèçâåñòíàÿ îïöèÿ %s.\n"
-"Èñïîëüçóéòå /msg %S HELP KICK äëÿ ïîëó÷åíèÿ áîëåå ïîëíîé èíôîðìàöèè."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Íåèçâåñòíàÿ îïöèÿ %s.\n"
 "Íàïèøèòå /msg %S HELP SET äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Îáíîâëåíèå áàç äàííûõ..."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink-ñåðâåð: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "Ïîëüçîâàòåëü %s íå íàéäåí â ñåðâèñíîé áàçå äàííûõ íèêîâ."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Ïîëüçîâàòåëåé   : %6d çàïèñåé, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11528,13 +11107,13 @@ msgstr ""
 "×òîáû îñâîáîäèòü âàø íèê îò óäåðæàíèÿ åãî ñåðâèñàìè, èñïîëüçóéòå êîìàíäó\n"
 "/msg %s RELEASE %s èëè ïðîñòî íåìíîãî ïîäîæäèòå (âðåìÿ îæèäàíèÿ: %s)."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr ""
 "Îäíà èç ìàñîê â ñïèñêå èñêëþ÷åíèé êàíàëà ñîâïàäàåò ñ õîñòìàñêîé óêàçàííîãî "
 "ïîëüçîâàòåëÿ. ×òîáû çàáàíèòü åãî, âû äîëæíû óäàëèòü èñêëþ÷åíèÿ."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11542,66 +11121,77 @@ msgstr ""
 "Ñïèñîê ïîëüçîâàòåëåé:\n"
 "Íèê                  Ìàñêà"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Íå êèêàòü âîéñîâ"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"Ñïèñîê VOP'îâ êàíàëà %s:\n"
-" Íîìåð  Íèê"
+"Âíèìàíèå: âû ïðåâûñèëè ëèìèò ìàêñèìàëüíî äîïóñòèìîãî ÷èñëà õðàíèìûõ "
+"ñîîáùåíèé (%d). Âû íå ñìîæåòå ïðèíèìàòü íîâûå ñîîáùåíèÿ, ïîêà âû íå óäàëèòå "
+"ëèøíèå."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Íå êèêàòü âîéñîâ"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Âíèìàíèå: âû äîñòèãëè ìàêñèìàëüíî äîïóñòèìîãî ÷èñëà õðàíèìûõ ñîîáùåíèé (%d). "
+"Âû íå ñìîæåòå ïðèíèìàòü íîâûå ñîîáùåíèÿ, ïîêà íå óäàëèòå ëèøíèå."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Ñëåäè çà ñâîèì ÿçûêîì!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Âû óæå ñîñòîèòå â ãðóïïå %s."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "Âû óæå èäåíòèôèöèðîâàíû."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "Ðåæèì Ñóïåð-Àäìèíèñòðàòîðà äåàêòèâèðîâàí."
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Âàì íå ðàçðåøåíî íàõîäèòüñÿ íà ýòîì êàíàëå."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Âàì çàïðåùåíî èçìåíÿòü ñâîé ëèìèò ñîîáùåíèé."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "Ðåæèì Ñóïåð-Àäìèíèñòðàòîðà àêòèâèðîâàí."
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "Òåïåðü âû IRC-îïåðàòîð."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11609,39 +11199,44 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Âû óñïåøíî âíåñåíû â ãðóïïó %s."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Âû íå ìîæåòå çàïðîñèòü èíôîðìàöèþ î ïîëó÷åíèè, êîãäà ïîñûëàåòå ñîîáùåíèå "
 "ñåáå."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Âû íå ìîæåòå çàêðûòü ñâîþ ñåññèþ!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Íåâîçìîæíî äåèäåíòèôèöèðîâàòü %s òàê êàê îí Àäìèíèñòðàòîð ñåðâèñîâ."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr ""
 "Ýýý... âû íå ìîæåòå èñïîëüçîâàòü êîìàíäó RECOVER îòíîñèòåëüíî ñàìîãî ñåáÿ."
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11652,7 +11247,7 @@ msgstr ""
 "Äëÿ ìîäèôèêàöèè ñïèñêà äîñòóïà èñïîëüçóéòå êîìàíäû VOP, AOP è SOP.\n"
 "Áîëåå ïîäðîáíàÿ èíôîðìàöèÿ äîñòóïíà ïî /msg %s HELP êîìàíäà"
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11663,7 +11258,7 @@ msgstr ""
 "Äëÿ ìîäèôèêàöèè ñïèñêà äîñòóïà èñïîëüçóéòå êîìàíäû VOP, HOP, AOP è SOP.\n"
 "Áîëåå ïîäðîáíàÿ èíôîðìàöèÿ äîñòóïíà ïî /msg %s HELP êîìàíäà"
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11671,67 +11266,67 @@ msgstr ""
 "Âû íå ìîæåòå èñïîëüçîâàòü ýòó êîìàíäó, âìåñòî íåå èñïîëüçóéòå ACCESS.\n"
 "Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè ñì. /msg %s HELP ACCESS"
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Âû íå ìîæåòå óñòàíîâèòü ëèìèò ñîîáùåíèé äëÿ %s áîëüøå ÷åì %d."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Âû íå ìîæåòå óñòàíîâèòü ëèìèò ñîîáùåíèé áîëüøå ÷åì %d."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "Âîçìîæíîñòü óäàëåíèÿ email-àäðåñà â âàøåé IRC-ñåòè íåäîñòóïíà."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé, %d èç íèõ íå ïðî÷èòàíî."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé, 1 èç íèõ íå ïðî÷èòàíî."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr ""
 "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé, íè îäíî èç íèõ íå ïðî÷èòàíî."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ 1 íîâîå, íåïðî÷èòàííîå ñîîáùåíèå."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ 1 ñîîáùåíèå."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Íà äàííûé ìîìåíò ó âàñ íåò ñîîáùåíèé."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "Âàì ïðèøëî %d íîâûõ ñîîáùåíèé."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "Âàì ïðèøëî 1 íîâîå ñîîáùåíèå."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11739,33 +11334,37 @@ msgstr ""
 "Âàì ïðèøëî íîâîå ñîîáùåíèå îò %s.\n"
 "Íàïèøèòå /msg %s READ %d ÷òîáû ïðî÷èòàòü åãî."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Âû áûëè ðàçáàíåíû íà êàíàëå %s."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Ó âàñ íåò îãðàíè÷åíèÿ íà êîëè÷åñòâî õðàíèìûõ ñîîáùåíèé."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Âàø ñïèñîê ìåìî-ñîîáùåíèé ïóñò."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Ó âàñ íåò íîâûõ ñîîáùåíèé."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Çíà÷åíèå ïàðàìåòðà \"âðåìÿ\" óêàçàíî íå âåðíî."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11773,26 +11372,18 @@ msgstr ""
 "Ïåðåä òåì, êàê èñïîëüçîâàòü ýòó êîìàíäó, âû äîëæíû íàçíà÷èòü áîòà íà\n"
 "êàíàë. Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè ñì.  /msg %S HELP ASSIGN."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr "×òîáû çàðåãèñòðèðîâàòü êàíàë, âû äîëæíû áûòü åãî îïåðàòîðîì."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "×òîáû íà÷àòü ðåãèñòðàöèþ âàøåãî òåêóùåãî íèêà, âû äîëæíû èñïîëüçîâàòü åãî íå "
 "ìåíåå %d ñåêóíä"
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "Ïåðåä áëîêèðîâêîé ðåæèìà +K, âû ñïåðâà äîëæíû çàáëîêèðîâàòü ðåæèì +i."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "Ïåðåä áëîêèðîâêîé ðåæèìà +L, âû ñïåðâà äîëæíû çàáëîêèðîâàòü ðåæèì +l."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11803,43 +11394,43 @@ msgstr ""
 "ïîçâîëèò âàì èñïîëüçîâàòü ôóíêöèþ âîññòàíîâëåíèÿ ïàðîëÿ, åñëè âû åãî "
 "çàáóäåòå."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Âû áóäåòå óâåäîìëåíû î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå èäåíòèôèêàöèè ê íèêó èëè "
 "ïðè ïîñòóïëåíèè íîâûõ ñîîáùåíèé."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr ""
 "Âû áóäåòå óâåäîìëåíû î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå èäåíòèôèêàöèè ê íèêó"
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Âû áóäåòå óâåäîìëåíû î íîâûõ ñîîáùåíèÿõ ñðàçó ïðè ïîñòóïëåíèè îíûõ."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Ëèìèò ñîîáùåíèé óñòàíîâëåí íà 0, âîçìîæíîñòü èõ ïîëó÷åíèÿ îòêëþ÷åíà."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "Îïîâåùåíèå î íîâûõ ñîîáùåíèÿõ ïîñðåäñòâîì email îòêëþ÷åíî"
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Óâåäîìëåíèå î íîâûõ ñîîáùåíèÿõ îòêëþ÷åíî."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr ""
 "Ñ ýòîãî ìîìåíòà, âû áóäåòå ïîëó÷àòü óâåäîìëåíèÿ î íîâûõ ñîîáùåíèÿõ ïî email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11847,34 +11438,54 @@ msgstr ""
 "IRCd âàøåé ñåòè íå ïîääåðæèâàåò âèðòóàëüíûå èäåíòû. Åñëè ýòî íå òàê, "
 "ñîîáùèòå íàì (ðàçðàáîò÷êàì) î äàííîì ôàêòå."
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Âàø ñïèñîê äîñòóïà ïóñò."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "Ñïèñîê àâòîêèêîâ êàíàëà %s ïóñò."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Ñïèñîê èãíîðèðóåìûõ íèêîâ ïóñò."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Ëèìèòèòèðîâàíèå âàøåãî ñïèñêà ñîîáùåíèé îòêëþ÷åíî."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Ëèìèò ñîîáùåíèé áûë óñòàíîâëåí íà %d."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Âàø ëèìèò ñîîáùåíèé ðàâåí %d è íå ìîæåò áûòü èçìåíåí."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Âàø ëèìèò ñîîáùåíèé ðàâåí %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Âàø ëèìèò ñîîáùåíèé ðàâåí 0 è ïðèíèìàòü èõ âû íå ìîæåòå."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11882,181 +11493,739 @@ msgstr ""
 "Âàø ëèìèò ñîîáùåíèé ðàâåí 0, ó âàñ íåò âîçìîæíîñòè ïðèíèìàòü ñîîáùåíèÿ è/èëè "
 "èçìåíÿòü ëèìèò."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Äåèäåíòèôèêàöèÿ âûïîëíåíà óñïåøíî."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr ""
 "Ïåðåä âíåñåíèåì íèêà â ãðóïïó, âû äîëæíû óäàëèòü åãî êîìàíäîé /msg %s DROP."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Âàø íèê íåçàðåãèñòðèðîâàí."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Âàø íèê óñïåøíî óäàëåí èç áàçû äàííûõ ñåðâèñîâ."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Âàø íèê èçìåíåí íà %s"
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Âàø êîä àóòåíôèêàöèè áûë çàíîâî âûñëàí íà %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
 "Ïàðîëü äëÿ âàøåãî íèêà - %s - çàïîìíèòå åãî, îí ïðèãîäèòñÿ âàì â äàëüíåéøåì!"
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 "Âû óêàçàëè ñëèøêîì äëèííûé ïàðîëü, ïîïðîáóéòå åùå ðàç ñ áîëåå êîðîòêèì."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Âàø âèðòóàëüíûé õîñò %s àêòèâèðîâàí."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Âàø âèðòóàëüíûé õîñò %s@%s àêòèâèðîâàí."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Íîâîñòè ñåòè - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Îïåð-íîâîñòè - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Ñëó÷àéíàÿ íîâîñòü - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "îòêëþ÷åí"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "íèêîãäà íå èñòå÷åò"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "âêëþ÷åí"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "èñòåêàåò ïðè áëèæàéøåì îáíîâëåíèè ÁÄ"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "èñòå÷åò ÷åðåç %d äíåé"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "èñòå÷åò ÷åðåç %d äíåé"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "èñòå÷åò ÷åðåç %d ÷àñîâ %d ìèíóò"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "èñòå÷åò ÷åðåç %d ÷àñîâ, %d ìèíóò"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "èñòå÷åò ÷åðåç %d ÷àñîâ, %d ìèíóò"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "èñòå÷åò ÷åðåç %d ÷àñîâ, %d ìèíóò"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "èñòå÷åò ÷åðåç %d ìèíóò"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "èñòå÷åò ÷åðåç %d ìèíóò"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Âèðòóàëüíûé õîñò äëÿ %s óäàëåí."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Âèðòóàëüíûé õîñò äëÿ %s óñòàíîâëåí íà %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Âèðòóàëüíûé õîñò äëÿ %s óñòàíîâëåí íà %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Âèðòóàëüíûé õîñò äëÿ ãðóïïû %s óñòàíîâëåí íà %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Âèðòóàëüíûé õîñò äëÿ ãðóïïû %s óñòàíîâëåí â %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "Âñå âèðòóàëüíûå õîñòû äëÿ ãðóïïû %s áûëè óäàëåíû."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "Ñèñòåìà ïðèâåëåãèé xOP"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "Ñèñòåìà ïðèâåëåãèé xOP äëÿ êàíàëà %s îòêëþ÷åíà."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "Ñèñòåìà ïðèâåëåãèé xOP äëÿ êàíàëà %s àêòèâèðîâàíà."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "Ñèñòåìà ïðèâåëåãèé xOP íåäîñòóïíà."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {íèê | #êàíàë} òåêñò_ñîîáùåíèÿ"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s óñïåøíî äîáàâëåí â AOP'û êàíàëà %s."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s óñïåøíî äîáàâëåí â HOP'û êàíàëà %s."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s óñïåøíî äîáàâëåí â SOP'û êàíàëà %s."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s óñïåøíî äîáàâëåí â VOP'û êàíàëà %s."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s óñïåøíî óäàëåí èç ñïèñêà HOP'îâ êàíàëà %s."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s óñïåøíî óäàëåí èç SOP'îâ êàíàëà %s."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s óñïåøíî óäàëåí èç VOP'îâ êàíàëà %s."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s ïåðåìåùåí â HOP'û êàíàëà %s."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s ïåðåìåùåí â SOP'û êàíàëà %s."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s ïåðåìåùåí â VOP'û êàíàëà %s."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "Íèê %s â ñïèñêå HOP'îâ êàíàëà %s íå îáíàðóæåí."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "Íèê %s â ñïèñêå SOP'îâ êàíàëà %s íå îáíàðóæåí."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "Íèê %s â ñïèñêå VOP'îâ êàíàëà %s íå îáíàðóæåí."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   âûáîð ÿçûêà, ïîñðåäñòâîì êîòîðîãî ñåðâèñû áóäóò ñ\n"
+#~ "               óêàçàííûì íèêîì."
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr "    PRIVATE    ñêðûòèå âàøåãî íèêà â ñïèñêå íèêîâ ïî /msg %S LIST"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d äíåé"
+
+#~ msgid "%d hours"
+#~ msgstr "%d ÷àñîâ"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d ìèíóò"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d ñåêóíä"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "Ñïèñîê HOP'îâ êàíàëà %s ïóñò."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "Ñïèñîê SOP'îâ êàíàëà %s ïóñò."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "Ñïèñîê VOP'îâ êàíàëà %s ïóñò."
+
+#~ msgid "1 day"
+#~ msgstr "1 äåíü"
+
+#~ msgid "1 hour"
+#~ msgstr "1 ÷àñ"
+
+#~ msgid "1 minute"
+#~ msgstr "1 ìèíóòà"
+
+#~ msgid "1 second"
+#~ msgstr "1 ñåêóíäà"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "Óðîâåíü äîñòóïà ê êîìàíäå CLEAR"
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "Óðîâåíü äîñòóïà ê êîìàíäàì HALFOP/DEHALFOP"
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Ñïèñîê HOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Ñïèñîê SOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Ñïèñîê VOP'îâ êàíàëà %s áûë ïîëíîñòüþ î÷èùåí."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà HOP'îâ êàíàëà %s."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SOP'îâ êàíàëà %s."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà VOP'îâ êàíàëà %s."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà HOP'îâ êàíàëà %s."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà SOP'îâ êàíàëà %s."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà VOP'îâ êàíàëà %s."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "Email-àäðåñ äëÿ âàøåãî íèêà óäàëåí."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Êîíåö ñïèñêà ïîëüçîâàòåëåé."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "Ñîîáùåíèå ïðè âõîäå íà êàíàë %s óäàëåíî."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Íà äàííûé ìîìåíò, áîò íå ïðèñóòñòâóåò íà êàíàëå %s."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "Ñîîáùåíèå ïðè âõîäå.......: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Ñïèñîê äîñòóïà äëÿ %s ïóñò."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "Ñïèñîê äîñòóïà äëÿ %s:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "Ñîîáùåíèå ïðè âõîäå íà êàíàë %s èçìåíåíî."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "FANTASY-ðåæèì äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Ðåæèì ïðèâåòñòâèé äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Ñïèñîê HOP'îâ êàíàëà %s:\n"
+#~ "  Íîìåð  Íèê"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Âíóòðåííÿÿ îøèáêà - íåâîçìîæíî âûïîëíèòü çàïðîñ."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Íîâîñòü ïîä íîìåðîì #%d óäàëåíà."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Íèê %s íå çàðåãèñòðèðîâàí."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Ðåãèñòðàöèÿ íèêà %s"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Ïàðîëü äëÿ íèêà %s"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "Âû íå óêàçàëè ñèìâîë '#' ïåðåä íàçâàíèåì êàíàëà."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Ðåæèì áåç-áîòà äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå HOP'îâ êàíàëà %s íå îáíàðóæåíî."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå SOP'îâ êàíàëà %s íå îáíàðóæåíî."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "Ñîâïàäàþùèõ çàïèñåé â ñïèñêå VOP'îâ êàíàëà %s íå îáíàðóæåíî."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå AOP'îâ êàíàëà %s íå îáíàðóæåíà."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå HOP'îâ êàíàëà %s íå îáíàðóæåíà."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå SOP'îâ êàíàëà %s íå îáíàðóæåíà."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "Çàïèñü ïîä íîìåðîì #%d â ñïèñêå VOP'îâ êàíàëà %s íå îáíàðóæåíà."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Ðåæèì OP-óâåäîìëåíèé äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Ðåæèì ñïîêîéñòâèÿ äëÿ êàíàëà %s îòêëþ÷åí."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr ""
+#~ "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä ïåðåä ïîâòîðíûì èñïîëüçîâàíèåì "
+#~ "êîìàíäû SEND."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "Ðåæèì ïðèâàòíûé óñïåøíî ñíÿò ñ áîòà ïîä íèêîì %s"
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Ðåæèì ïðèâàòíîñòè êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Ðåæèì ïðèâàòíîñòè äëÿ %s îòêëþ÷åí."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Çàùèòà íèêà %s îòêëþ÷åíà."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Çàùèòà íèêà àêòèâèðîâàíà, ëèìèò âðåìåíè íà ââîä ïàðîëÿ: 0 ñåêóíä."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER ïàðîëü [email]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Ðåæèì îãðàíè÷åííîãî äîñòóïà íà êàíàë %s îòêëþ÷åí."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Ñïèñîê SOP'îâ êàíàëà %s:\n"
+#~ " Íîìåð  Íèê"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Êàíàë %s íåçàðåãèñòðèðîâàí"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND #êàíàë [ïðè÷èíà]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Ðåæèì áåçîïàñíîñòè âëàäåëüöà äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Ðåæèì êîíòðîëÿ çà ñòàòóñîì îïåðàòîðà äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Ðåæèì áåçîïàñíîñòè äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Ðåæèì áåçîïàñíîñòè äëÿ %s îòêëþ÷åí."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Âîçìîæíîñòü èçìåíÿòü ðåæèìû ñåðâèñàì íåäîñòóïíà. Âû âîîáùå óâåðåíû, ÷òî "
+#~ "íàñòðîéêè âàøèõ ñåðâåðîâ êîððåêòíû?"
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d äåíü, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñ, %d ìèíóòó"
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñ, %d ìèíóò"
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d ÷àñ, %d ìèíóò"
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóòó, %d ñåêóíäó"
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóòó, %d ñåêóíä"
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Ñåðâèñû ðàáîòàþò: %d ìèíóò, %d ñåêóíäó"
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Ðåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà HOP'îâ âðåìåííî íåäîñòóïíà."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà SOP'îâ âðåìåííî íåäîñòóïíà."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr ""
+#~ "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà VOP'îâ âðåìåííî íåäîñòóïíà."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr ""
+#~ "Èçâèíèòå, íî êîëè÷åñòâî VOP/HOP/AOP/SOP-çàïèñåé íå ìîæåò ïåðâûøàòü %d "
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Ðåæèì ñèìáèîçà äëÿ êàíàëå %s îòêëþ÷åí."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Ñèíòàêñèñ: RANDOMNEWS ADD òåêñò"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR #êàíàë ÷òî_èìåííî"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Ñèíòàêñèñ: OPERNEWS ADD òåêñò"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Ñèíòàêñèñ: SET DEBUG {ON | OFF | óðîâåíü}\n"
+#~ "\n"
+#~ "Âêëþ÷àåò èëè âûêëþ÷àåò îòëàäî÷íûé ðåæèì ðàáîòû ñåðâèñîâ. Àêòèâàöèÿ\n"
+#~ "äàííîãî ðåæèìà ïîçâîëèò áîëåå äåòàëüíî ëîãèðîâàòü ðàáîòó ñåðâèñîâ,\n"
+#~ "â ÷àñòíîñòè - çàïèñûâàòü â ëîã âñå ïîñëàííûå è ïðèíÿòûå ñåðâèñàìè\n"
+#~ "äàííûå, è îïåðàöèè ñ ýòèìè ñàìûìè äàííûìè.  êà÷åñòâå ïàðàìåòðà âû\n"
+#~ "ìîæååò óêàçàòü óðîâåíü äåòàëüíîñòü îòëàäî÷íîãî ðåæèìà, ÷åì âûøå\n"
+#~ "óðîâåíü - òåì áîëåå äåòàëüíûìè (è îáüåìíûìè, õåõ) áóäóò ëîãè.\n"
+#~ "\n"
+#~ "Àêòèâèðîâàíèå äàííîé îïöèè ýêâèâàëåíòíî çàïóñêó ñåðâèñîâ ñ êëþ÷îì\n"
+#~ "-debug."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Ñèíòàêñèñ: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Ïðèâåòñòâèå äëÿ %s óäàëåíî."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "Ýòîò ìîäóëü íå ìîæåò áûòü âûãðóæåí."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Ðåæèì áëîêèðîâêè òîïèêà äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Ðåæèì õðàíåíèÿ òîïèêà äëÿ êàíàëà %s îòêëþ÷åí."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Íåèçâåñòíàÿ êîìàíäà %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Íåèçâåñòíàÿ îïöèÿ %s.\n"
+#~ "Èñïîëüçóéòå /msg %S HELP KICK äëÿ ïîëó÷åíèÿ áîëåå ïîëíîé èíôîðìàöèè."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "Ïîëüçîâàòåëü %s íå íàéäåí â ñåðâèñíîé áàçå äàííûõ íèêîâ."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "Ñïèñîê VOP'îâ êàíàëà %s:\n"
+#~ " Íîìåð  Íèê"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "Áîò ïîä íèêîì %s óñïåøíî óäàëåí."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr ""
+#~ "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîðûå âû ïîñûëàëè %s, áûëî ïðî÷èòàíî."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr ""
+#~ "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîðûå âû ïîñûëàëè %s, áûëî ïðî÷èòàíî."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "Ïîñëåäíåå âàøå ñîîáùåíèå àäðåñàòó %s óñïåøíî îòìåíåíî."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Âàø âèðòóàëüíûé õîñò %s àêòèâèðîâàí."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "Áîò ïîä íèêîì %s óñïåøíî óäàëåí."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "Ñèñòåìà ïðèâåëåãèé xOP äëÿ êàíàëà %s îòêëþ÷åíà."
diff --git a/lang/anope.tr_TR.po b/language/anope.tr_TR.po
index 024672542..9be5062d3 100644
--- a/lang/anope.tr_TR.po
+++ b/language/anope.tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-06 04:20-0400\n"
+"POT-Creation-Date: 2011-02-04 15:27-0500\n"
 "PO-Revision-Date: 2010-09-19 21:13-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Turkish\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: language.cpp:151
+#: include/language.h:11
 msgid "%R%s HELP %s for more information."
 msgstr "Daha fazla bilgi için /msg %s HELP %s yazýnýz."
 
-#: language.cpp:2643
+#: modules/core/ns_help.cpp:33
 msgid ""
 "%S allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -35,7 +35,7 @@ msgstr ""
 "/msg %S komut yazýn. Belirli bir komut hakkýnda daha \n"
 "fazla bilgi için, /msg %S HELP komut yazýn."
 
-#: language.cpp:4837
+#: modules/core/bs_help.cpp:35
 msgid ""
 "%S allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
@@ -53,14 +53,15 @@ msgstr ""
 "daha fazla bilgi için, /msg %S HELP komut\n"
 "yazýn."
 
-#: language.cpp:3338
+#: modules/core/cs_help.cpp:35
+#, fuzzy
 msgid ""
 "%S allows you to register and control various\n"
-"aspects of channels.  %S can often prevent\n"
+"aspects of channels. %S can often prevent\n"
 "malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges.  Available\n"
+"who is allowed channel operator privileges. Available\n"
 "commands are listed below; to use them, type\n"
-"%R%S command.  For more information on a\n"
+"%R%S command. For more information on a\n"
 "specific command, type %R%S HELP command."
 msgstr ""
 "%S kanallarýnýzý kayýt etmenizi ve kontrol etmenizi\n"
@@ -72,12 +73,12 @@ msgstr ""
 "/msg %S HELP komut yazýn.\n"
 " "
 
-#: language.cpp:4183
-#, c-format
+#: modules/core/ms_help.cpp:33
+#, fuzzy, c-format
 msgid ""
 "%S is a utility allowing IRC users to send short\n"
 "messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*).  Both the sender's\n"
+"the time or not, or to channels(*). Both the sender's\n"
 "nickname and the target nickname or channel must be\n"
 "registered in order to send a memo.\n"
 "%S's commands include:"
@@ -89,122 +90,106 @@ msgstr ""
 "\n"
 "%S'ün mevcut komutlarý:"
 
-#: language.cpp:2304
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s Changed the DEFCON level to %d"
 
-#: language.cpp:999
-#, c-format
-msgid "%s added to %s AOP list."
-msgstr "%s %s kanalinin AOP listesine eklenmistir."
-
-#: language.cpp:1028
-#, c-format
-msgid "%s added to %s HOP list."
-msgstr "%s %s kanali HOP listesine eklendi."
-
-#: language.cpp:970
-#, c-format
-msgid "%s added to %s QOP list."
-msgstr "%s added to %s QOP list."
-
-#: language.cpp:1057
-#, c-format
-msgid "%s added to %s SOP list."
-msgstr "%s %s kanali SOP listesine eklendi."
-
-#: language.cpp:1086
-#, c-format
-msgid "%s added to %s VOP list."
-msgstr "%s %s kanali VOP listesine eklendi."
-
-#: language.cpp:1133
+#: modules/core/cs_access.cpp:238
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s nicki %s kanalinin access listesine %d seviyeden eklendi."
 
-#: language.cpp:1172
+#: modules/core/cs_akick.cpp:281
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s nicki %s kanalýnýn akick listesine eklendi."
 
-#: language.cpp:1888
+#: modules/core/bs_badwords.cpp:174
 #, c-format
 msgid "%s added to %s bad words list."
 msgstr "%s %s kanalýnýn küfür listesine eklendi."
 
-#: language.cpp:2085
+#: modules/core/os_akill.cpp:196
 #, c-format
 msgid "%s added to the AKILL list."
 msgstr "%s AKILL listesine eklendi."
 
-#: language.cpp:2119
+#: modules/core/os_snline.cpp:210
 #, c-format
 msgid "%s added to the SNLINE list."
 msgstr "%s SNLINE listesinde eklendi."
 
-#: language.cpp:2146
+#: modules/core/os_sqline.cpp:190
 #, c-format
 msgid "%s added to the SQLINE list."
 msgstr "%s SQLINE listesine eklendi."
 
-#: language.cpp:2173
+#: modules/core/os_szline.cpp:194
 #, c-format
 msgid "%s added to the SZLINE list."
 msgstr "%s SZLINE listesine eklendi."
 
-#: language.cpp:490
+#: modules/core/ns_access.cpp:70
 #, c-format
 msgid "%s added to your access list."
 msgstr "%s access listenize eklendi."
 
-#: language.cpp:1886
+#: modules/core/ms_ignore.cpp:54
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s access listenize eklendi."
+
+#: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s zaten %s kanalýnýn küfür listesinde var."
 
-#: language.cpp:1168
+#: modules/core/cs_akick.cpp:260
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s nicki %s kanalýnýn akick listesinde zaten var."
 
-#: language.cpp:2079
+#: src/operserv.cpp:508
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s zaten AKILL listesinde."
 
-#: language.cpp:2377
+#: src/sessions.cpp:266
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: language.cpp:2117
+#: src/operserv.cpp:576
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s zaten SNLINE listesinde."
 
-#: language.cpp:2144
+#: src/operserv.cpp:686
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s zaten SQLINE listesinde mevcut."
 
-#: language.cpp:2169
+#: src/operserv.cpp:811
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s zaten SZLINE listesinde."
 
-#: language.cpp:1809
+#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
+#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
+#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
+#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
+#: modules/core/bs_kick.cpp:359
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s deðeri kullanýlamaz."
 
-#: language.cpp:2057
+#: modules/core/os_umode.cpp:47
 #, c-format
 msgid "%s changed your usermodes."
 msgstr "%s changed your usermodes."
 
-#: language.cpp:2265
+#: modules/core/os_chanlist.cpp:38
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -213,132 +198,113 @@ msgstr ""
 "%s kanal listesi:\n"
 "Ýsim              Kullanici Modlari  Konu"
 
-#: language.cpp:1009
-#, c-format
-msgid "%s deleted from %s AOP list."
+#: modules/core/cs_xop.cpp:252
+#, fuzzy, c-format
+msgid "%s deleted from %s %s list."
 msgstr "%s %s kanali AOP listesinden silindi."
 
-#: language.cpp:1038
-#, c-format
-msgid "%s deleted from %s HOP list."
-msgstr "%s %s kanali HOP listesinden silindi."
-
-#: language.cpp:980
-#, c-format
-msgid "%s deleted from %s QOP list."
-msgstr "%s deleted from %s QOP list."
-
-#: language.cpp:1067
-#, c-format
-msgid "%s deleted from %s SOP list."
-msgstr "%s %s kanali SOP listesinden silindi."
-
-#: language.cpp:1096
-#, c-format
-msgid "%s deleted from %s VOP list."
-msgstr "%s %s kanali VOP listesinden silindi."
-
-#: language.cpp:1139
+#: modules/core/cs_access.cpp:268
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s %s kanalýnýn access listesinden silindi."
 
-#: language.cpp:1182
+#: modules/core/cs_akick.cpp:331
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s %s kanalýnýn akick listesinden silindi."
 
-#: language.cpp:1894
+#: modules/core/bs_badwords.cpp:211
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s %s kanalýnýn küfür listesinden çýkarýldý."
 
-#: language.cpp:2358
+#: modules/core/os_session.cpp:312
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s session-limit exception listesinden silindi."
 
-#: language.cpp:2093
+#: modules/core/os_akill.cpp:275
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s AKILL listesinden silindi."
 
-#: language.cpp:2125
+#: modules/core/os_snline.cpp:291
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s SNLINE listesinden silindi."
 
-#: language.cpp:2152
+#: modules/core/os_sqline.cpp:271
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s SQLINE listesinden silindi."
 
-#: language.cpp:2179
+#: modules/core/os_szline.cpp:275
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s SZLINE listesinden silindi."
 
-#: language.cpp:494
+#: modules/core/ns_access.cpp:89
 #, c-format
 msgid "%s deleted from your access list."
 msgstr "%s access listenizden silindi."
 
-#: language.cpp:1218
+#: modules/core/cs_access.cpp:598
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s %s kanalýnda iptal edildi."
 
-#: language.cpp:1296
+#: modules/core/cs_invite.cpp:65
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: language.cpp:1302
+#: modules/core/cs_unban.cpp:55
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: language.cpp:844
+#: modules/core/cs_set_founder.cpp:53
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s çok fazla kanala sahip."
 
-#: language.cpp:2081
+#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
+#: src/operserv.cpp:815
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s zaten %s tarafýndan deðiþtirildi."
 
-#: language.cpp:860
+#: modules/core/ms_ignore.cpp:57
+#, fuzzy, c-format
+msgid "%s is already on your ignore list."
+msgstr "%s access listenize eklendi."
+
+#: modules/core/cs_set_bantype.cpp:34
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s geçerli bir ban tipi deðil."
 
-#: language.cpp:1673
+#: modules/core/bs_info.cpp:217
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s geçerli bir bot yada kanal deðil."
 
-#: language.cpp:216
+#: include/language.h:35
 #, c-format
 msgid "%s is not a valid e-mail address."
 msgstr "%s geçerli bir mail adresi deðil."
 
-#: language.cpp:1180
-#, c-format
-msgid "%s is not always active anymore on channel %s."
-msgstr "%s artik %s kanalinda sürekli aktif degil."
-
-#: language.cpp:185
+#: include/language.h:23
 #, c-format
 msgid "%s is not currently on channel %s."
 msgstr "%s su anda %s kanalinda degil."
 
-#: language.cpp:1178
-#, c-format
-msgid "%s is now always active on channel %s."
-msgstr "%s artik %s kanalinda sürekli aktif."
+#: modules/core/ms_ignore.cpp:69
+#, fuzzy, c-format
+msgid "%s is not on your ignore list."
+msgstr "%s not found on ignore list."
 
-#: language.cpp:1354
+#: include/language.h:90
 #, c-format
 msgid ""
 "%s matches an except on %s and cannot be banned until the except have been "
@@ -347,107 +313,72 @@ msgstr ""
 "%s matches an except on %s and cannot be banned until the except have been "
 "removed."
 
-#: language.cpp:1001
-#, c-format
-msgid "%s moved to %s AOP list."
+#: modules/core/cs_xop.cpp:189
+#, fuzzy, c-format
+msgid "%s moved to %s %s list."
 msgstr "%s moved to %s AOP list."
 
-#: language.cpp:1030
-#, c-format
-msgid "%s moved to %s HOP list."
-msgstr "%s moved to %s HOP list."
-
-#: language.cpp:972
-#, c-format
-msgid "%s moved to %s QOP list."
-msgstr "%s moved to %s QOP list."
-
-#: language.cpp:1059
-#, c-format
-msgid "%s moved to %s SOP list."
-msgstr "%s moved to %s SOP list."
-
-#: language.cpp:1088
-#, c-format
-msgid "%s moved to %s VOP list."
-msgstr "%s moved to %s VOP list."
-
-#: language.cpp:1005
-#, c-format
-msgid "%s not found on %s AOP list."
+#: modules/core/cs_xop.cpp:240
+#, fuzzy, c-format
+msgid "%s not found on %s %s list."
 msgstr "%s %s kanali AOP listesinde bulunamadi."
 
-#: language.cpp:1034
-#, c-format
-msgid "%s not found on %s HOP list."
-msgstr "%s %s kanali HOP listesinde bulunamadi."
-
-#: language.cpp:976
-#, c-format
-msgid "%s not found on %s QOP list."
-msgstr "%s not found on %s QOP list."
-
-#: language.cpp:1063
-#, c-format
-msgid "%s not found on %s SOP list."
-msgstr "%s %s kanali SOP listesinde bulunamadi."
-
-#: language.cpp:1092
-#, c-format
-msgid "%s not found on %s VOP list."
-msgstr "%s %s kanali VOP listesinde bulunamadi."
-
-#: language.cpp:1135
+#: modules/core/cs_access.cpp:263
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s %s kanalýnýn access listesinde bulunamadý."
 
-#: language.cpp:1174
+#: modules/core/cs_akick.cpp:322
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s %s kanalýnýn akick listesinde bulunamadý."
 
-#: language.cpp:1890
+#: modules/core/bs_badwords.cpp:203
 #, c-format
 msgid "%s not found on %s bad words list."
 msgstr "%s %s kanalýnýn küfür listesinde bulunamadý."
 
-#: language.cpp:2385
+#: modules/core/os_session.cpp:155
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s session listesinde bulunamadý."
 
-#: language.cpp:2354
+#: modules/core/os_session.cpp:316
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s session-limit exception listesinde bulunamadý."
 
-#: language.cpp:2089
+#: modules/core/os_akill.cpp:268
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s AKILL listesinde bulunamadý."
 
-#: language.cpp:2121
+#: modules/core/os_snline.cpp:284
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s SNLINE listesinde bulunamadý."
 
-#: language.cpp:2148
+#: modules/core/os_sqline.cpp:264
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s SQLINE listesinde bulunamadi."
 
-#: language.cpp:2175
+#: modules/core/os_szline.cpp:268
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s SZLINE listesinde bulunamadý."
 
-#: language.cpp:492
+#: modules/core/ns_access.cpp:85
 #, c-format
 msgid "%s not found on your access list."
 msgstr "%s access listenizde bulunamadý."
 
-#: language.cpp:2275
+#: modules/core/ms_ignore.cpp:66
+#, fuzzy, c-format
+msgid "%s removed from your ignore list."
+msgstr "%s access listenizden silindi."
+
+#: modules/core/os_userlist.cpp:35
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -456,31 +387,31 @@ msgstr ""
 "%s kullanýcý listesi:\n"
 "Nick                 Mask"
 
-#: language.cpp:2252
+#: modules/core/os_ignore.cpp:216
 #, c-format
 msgid "%s will no longer be ignored."
 msgstr "%s will no longer be ignored."
 
-#: language.cpp:2248
+#: modules/core/os_ignore.cpp:176
 #, c-format
 msgid "%s will now be ignored for %s."
 msgstr "%s will now be ignored for %s."
 
-#: language.cpp:2250
+#: modules/core/os_ignore.cpp:174
 #, c-format
 msgid "%s will now permanently be ignored."
 msgstr "%s will now permanently be ignored."
 
-#: language.cpp:4416
+#: modules/core/os_help.cpp:36
 #, c-format
 msgid "Notice: All commands sent to %S are logged!"
 msgstr "Not: %S'e gönderilen tüm komutlarýn kaydý tutulur!"
 
-#: language.cpp:163
+#: include/language.h:15
 msgid "Notice: Services is in read-only mode; changes will not be saved!"
 msgstr "Not: Servisler read-only modunda; deðiþiklikler kaydedilmeyecektir!"
 
-#: language.cpp:2083
+#: src/operserv.cpp:484
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -488,11 +419,11 @@ msgstr ""
 "Hatýrlatma: AKILL maskýna nick eklenemez; AKILL maskýna nick "
 "eklemediðinizden emin olun."
 
-#: language.cpp:2171
+#: src/operserv.cpp:795
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Hatýrlatma: SZLINE listesine sadece IP masklarýný ekleyebilirsiniz."
 
-#: language.cpp:3851
+#: modules/core/cs_access.cpp:500
 msgid ""
 "User access levels\n"
 " \n"
@@ -533,41 +464,38 @@ msgstr ""
 "yenileri eklenebilir, bilgi için /msg %S HELP LEVELS \n"
 "yazýn."
 
-#: language.cpp:1392
-#, c-format
-msgid ""
-"Warning: You are over your maximum number of memos (%d).  You will be unable "
-"to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Dikkat: Maksimum mesaj sayýnýzý aþtýnýz (%d).  Þimdiki mesajlarýnýzdan bir "
-"kaçýný silmezseniz yeni mesaj alamayacaksýnýz."
-
-#: language.cpp:1390
-#, c-format
-msgid ""
-"Warning: You have reached your maximum number of memos (%d).  You will be "
-"unable to receive any new memos until you delete some of your current ones."
-msgstr ""
-"Dikkat: Maksimum mesaj sayýnýza ulaþtýnýz (%d).  Þimdiki mesajlarýnýzdan bir "
-"kaçýný silmezseniz yeni mesaj alamayacaksýnýz."
-
-#: language.cpp:1586
+#: src/memoserv.cpp:370
 msgid "[auto-memo] The memo you sent has been viewed."
 msgstr "[auto-memo] The memo you sent has been viewed."
 
-#: language.cpp:1588
+#: src/memoserv.cpp:368
 #, c-format
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] The memo you sent to %s has been viewed."
 
-#: language.cpp:2650
-#, c-format
+#: modules/core/ns_register.cpp:350
+#, fuzzy
+msgid "password email"
+msgstr "REGISTER þifreniz emailiniz"
+
+#: modules/core/ns_register.cpp:352
+#, fuzzy
+msgid "password [email]"
+msgstr "REGISTER þifreniz emailiniz"
+
+#: modules/core/ns_group.cpp:173
+#, fuzzy
+msgid "target password"
+msgstr "GROUP hedef þifre"
+
+#: modules/core/ns_help.cpp:51
+#, fuzzy, c-format
 msgid ""
 " \n"
 "NOTICE: This service is intended to provide a way for\n"
 "IRC users to ensure their identity is not compromised.\n"
 "It is NOT intended to facilitate \"stealing\" of\n"
-"nicknames or other malicious actions.  Abuse of %S\n"
+"nicknames or other malicious actions. Abuse of %S\n"
 "will result in, at minimum, loss of the abused\n"
 "nickname(s)."
 msgstr ""
@@ -577,7 +505,7 @@ msgstr ""
 "amaçlý deðildir. %S 'ün kötüye Kullanýmý kötüye \n"
 "kullanýlan kiþinin nickini kaybetmesiyle sonuçlanacaktýr."
 
-#: language.cpp:4115
+#: modules/core/cs_help.cpp:50
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -588,7 +516,7 @@ msgstr ""
 "Servis adminleri kanalýn kaydýný þifreyle tanýtmadan silebilir,\n"
 "ve access, Akick ve seviye ayarlarýný görüntüleyebilirler."
 
-#: language.cpp:3171
+#: modules/core/ns_help.cpp:43
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -599,368 +527,384 @@ msgstr ""
 "kaydýný silebilir(drop) ve herhangi bir nickin access listesini \n"
 "görüntüleyebilir. (/msg %S ACCESS LIST nick)."
 
-#: language.cpp:1737
+#: modules/core/bs_info.cpp:214
 #, c-format
 msgid "            Options : %s"
 msgstr "         Özellikler : %s"
 
-#: language.cpp:526
+#: modules/core/ns_info.cpp:115
 #, c-format
 msgid "            vhost: %s"
 msgstr "                 vhost: %s"
 
-#: language.cpp:528
+#: modules/core/ns_info.cpp:113
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: language.cpp:1687
+#: modules/core/bs_info.cpp:80
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Botun nicki : %s"
 
-#: language.cpp:1689
+#: modules/core/bs_info.cpp:82
 msgid "           Bot nick : not assigned yet."
 msgstr "           Botun nicki : þu an yok."
 
-#: language.cpp:532
+#: include/language.h:61
 #, c-format
 msgid "          Options: %s"
 msgstr "            Özellikler: %s"
 
-#: language.cpp:1703
+#: modules/core/bs_info.cpp:110
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "     Büyük yazýda atma : %s"
 
-#: language.cpp:1701
+#: modules/core/bs_info.cpp:105
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "     Büyük yazýda atma : %s (%d tanede ban; minimum %d/%d%%)"
 
-#: language.cpp:1699
+#: modules/core/bs_info.cpp:107
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "     Büyük yazýda atma : %s (minimum %d/%d%%)"
 
-#: language.cpp:1242
+#: modules/core/cs_info.cpp:62
 #, c-format
 msgid "        Founder: %s"
 msgstr "        Founder: %s"
 
-#: language.cpp:1258
+#: modules/core/cs_info.cpp:80
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Ban tipi: %d"
 
-#: language.cpp:1695
+#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "     Kalýn yazýda atma : %s"
 
-#: language.cpp:1697
+#: modules/core/bs_info.cpp:96
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "     Kalýn yazýda atma : %s (%d tanede ban)"
 
-#: language.cpp:1713
+#: modules/core/bs_info.cpp:128
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "          Floodda atma : %s"
 
-#: language.cpp:1711
+#: modules/core/bs_info.cpp:123
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "          Floodda atma : %s (%d tanede ban; %d sýra %ds)"
 
-#: language.cpp:1709
+#: modules/core/bs_info.cpp:125
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "          Floodda atma : %s (%d sýra %ds)"
 
-#: language.cpp:1677
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "               Mask : %s@%s"
 
-#: language.cpp:1705
+#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "    Renkli yazýda atma : %s"
 
-#: language.cpp:1707
+#: modules/core/bs_info.cpp:114
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "    Renkli yazýda atma : %s (%d tanede ban)"
 
-#: language.cpp:1284
+#: modules/core/cs_info.cpp:106
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: language.cpp:1252
+#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
+#: modules/core/bs_info.cpp:180
+#, fuzzy, c-format
+msgid "      Fantasy reply : %s"
+msgstr "       Ban tipi: %d"
+
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "      Last used: %s"
 msgstr " Son kullanýlýþ: %s"
 
-#: language.cpp:1282
+#: modules/core/cs_info.cpp:100
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "     Mod kilidi: %s"
 
-#: language.cpp:1719
+#: modules/core/bs_info.cpp:137
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "         Tekrarda atma : %s"
 
-#: language.cpp:1717
+#: modules/core/bs_info.cpp:132
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "         Tekrarda atma : %s (%d tanede ban; %d kez)"
 
-#: language.cpp:1715
+#: modules/core/bs_info.cpp:134
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "         Tekrarda atma : %s (%d kez)"
 
-#: language.cpp:1244
+#: modules/core/cs_info.cpp:65
 #, c-format
 msgid "      Successor: %s"
 msgstr "      Successor: %s"
 
-#: language.cpp:207
+#: modules/core/cs_info.cpp:109
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspended: [%s] %s"
 
-#: language.cpp:1729
+#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s"
+msgstr "     Büyük yazýda atma : %s"
+
+#: modules/core/bs_info.cpp:168
+#, fuzzy, c-format
+msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
+msgstr "     Kalýn yazýda atma : %s (%d tanede ban)"
+
+#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "        Italics kicker : %s"
 
-#: language.cpp:1731
+#: modules/core/bs_info.cpp:159
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "        Italics kicker : %s (%d kick(s) to ban)"
 
-#: language.cpp:1254
+#: modules/core/cs_info.cpp:74
 #, c-format
 msgid "     Last topic: %s"
 msgstr "      Son topic: %s"
 
-#: language.cpp:1250
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "     Registered: %s"
 msgstr "   Kayýt tarihi: %s"
 
-#: language.cpp:1226
+#: modules/core/cs_access.cpp:635
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: language.cpp:3951
+#: modules/core/cs_access.cpp:709
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: language.cpp:1222
+#: modules/core/cs_access.cpp:630
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (kapatýldý)"
 
-#: language.cpp:1224
+#: modules/core/cs_access.cpp:633
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (sadece founder)"
 
-#: language.cpp:2601
+#: modules/core/ns_access.cpp:185
 msgid "    ACCESS     Modify the list of authorized addresses"
 msgstr "    ACCESS     Ýzinli adreslerin listesini düzenler"
 
-#: language.cpp:3288
+#: modules/core/cs_access.cpp:746
 msgid "    ACCESS     Modify the list of privileged users"
 msgstr "    ACCESS     Ayrýcalýklý kullanýcýlarý belirler deðiþtirir"
 
-#: language.cpp:4827
+#: modules/core/bs_act.cpp:76
 msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
 msgstr ""
 "ACT                Makes the bot do the equivalent of a \"/me\" command"
 
-#: language.cpp:3292
+#: modules/core/ns_ajoin.cpp:110
+#, fuzzy
+msgid "    AJOIN      Manage your auto join list"
+msgstr "    AKICK      Autokick listesini düzenler"
+
+#: modules/core/cs_akick.cpp:564
 msgid "    AKICK      Maintain the AutoKick list"
 msgstr "    AKICK      Autokick listesini düzenler"
 
-#: language.cpp:4351
+#: modules/core/os_akill.cpp:459
 msgid "    AKILL       Manipulate the AKILL list"
 msgstr "    AKILL       AKILL listesini düzenler"
 
-#: language.cpp:2619
+#: modules/core/ns_alist.cpp:162
 msgid "    ALIST      List channels you have access on"
 msgstr "    ALIST      List channels you have access on"
 
-#: language.cpp:3284
+#: modules/core/cs_xop.cpp:530
 msgid "    AOP        Modify the list of AOP users"
 msgstr "    AOP        AOP listesini düzenler"
 
-#: language.cpp:4819
+#: modules/core/bs_assign.cpp:86
 msgid "    ASSIGN         Assigns a bot to a channel"
 msgstr "ASSIGN             Kanala bot sokar"
 
-#: language.cpp:2814
+#: modules/core/ns_set_autoop.cpp:64
 msgid "    AUTOOP     Should services op you automatically.    "
 msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: language.cpp:2924
+#: modules/core/ns_set_autoop.cpp:92
 msgid "    AUTOOP     Turn autoop on or off"
 msgstr "    AUTOOP     Turn autoop on or off"
 
-#: language.cpp:4825
+#: modules/core/bs_badwords.cpp:317
 msgid "    BADWORDS       Maintains bad words list"
 msgstr "BADWORDS           Küfür listesi oluþturur"
 
-#: language.cpp:3296
+#: modules/core/cs_ban.cpp:95
 msgid "    BAN        Bans a selected nick on a channel"
 msgstr "    BAN        Bans a selected nick on a channel"
 
-#: language.cpp:3399
+#: modules/core/cs_set_bantype.cpp:68
 msgid "    BANTYPE       Set how Services make bans on the channel"
 msgstr "    BANTYPE       Servislerin kanalda ne tip ban koyacaðýný belirler"
 
-#: language.cpp:4835
+#: modules/core/bs_bot.cpp:416
 msgid "    BOT            Maintains network bot list"
 msgstr "BOT                Networkün bot listesini düzenler"
 
-#: language.cpp:4817
+#: modules/core/bs_botlist.cpp:76
 msgid "    BOTLIST        Lists available bots"
 msgstr "BOTLIST            Mevcut botlarý listeler"
 
-#: language.cpp:4163
+#: modules/core/ms_cancel.cpp:73
 msgid "    CANCEL Cancel last memo you sent"
 msgstr "    CANCEL Son gönderilen mesajý iptal eder"
 
-#: language.cpp:4396
+#: modules/core/os_chankill.cpp:104
 msgid "    CHANKILL    AKILL all users on a specific channel"
 msgstr "    CHANKILL    AKILL all users on a specific channel"
 
-#: language.cpp:4359
+#: modules/core/os_chanlist.cpp:92
 msgid "    CHANLIST    Lists all channel records"
 msgstr "    CHANLIST    Tüm kanal kayýtlarýný listeler"
 
-#: language.cpp:4177
+#: modules/core/ms_check.cpp:85
 msgid "    CHECK  Checks if last memo to a nick was read"
 msgstr "    CHECK  Checks if last memo to a nick was read"
 
-#: language.cpp:3298
-msgid "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+#: modules/core/cs_clearusers.cpp:70
+#, fuzzy
+msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
 msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
 
-#: language.cpp:4349
-msgid "    CLEARMODES  Clear modes of a channel"
-msgstr "    CLEARMODES  Bir kanalýn modlarýný temizler"
+#: modules/core/cs_clone.cpp:170
+#, fuzzy
+msgid "    CLONE      Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2589
+#: modules/core/ns_register.cpp:172
 msgid "    CONFIRM    Confirm a nickserv auth code"
 msgstr "    CONFIRM    Confirm a nickserv auth code"
 
-#: language.cpp:1681
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "    Created : %s"
 msgstr "          Yaratýlýþ : %s"
 
-#: language.cpp:4394
+#: modules/core/os_defcon.cpp:132
 msgid "    DEFCON      Manipulate the DefCon system"
 msgstr "    DEFCON      Manipulate the DefCon system"
 
-#: language.cpp:3322
+#: modules/core/cs_modes.cpp:321
 msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
 msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
 
-#: language.cpp:5172
+#: modules/core/hs_del.cpp:61
 msgid "    DEL         Delete the vhost of another user"
 msgstr "    DEL         Delete the vhost of another user"
 
-#: language.cpp:4169
+#: modules/core/ms_del.cpp:153
 msgid "    DEL    Delete a memo or memos"
 msgstr "    DEL    Mesajlarý silmenizi saðlar"
 
-#: language.cpp:5174
+#: modules/core/hs_delall.cpp:66
 msgid "    DELALL      Delete the vhost for all nicks in a group"
 msgstr "    DELALL      Delete the vhost for all nicks in a group"
 
-#: language.cpp:3336
+#: modules/core/cs_modes.cpp:160
 msgid "    DEOP       Deops a selected nick on a channel"
 msgstr "    DEOP       Deops a selected nick on a channel"
 
-#: language.cpp:3324
+#: modules/core/cs_modes.cpp:482
 msgid "    DEOWNER    Removes your owner status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: language.cpp:3326
+#: modules/core/cs_modes.cpp:402
 msgid "    DEPROTECT  Deprotects a selected nick on a channel"
 msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
 
-#: language.cpp:3394
+#: modules/core/cs_set_description.cpp:53
 msgid "    DESC          Set the channel description"
 msgstr "    DESC          Kanal açýklamasýný belirler"
 
-#: language.cpp:3300
+#: modules/core/cs_modes.cpp:238
 msgid "    DEVOICE    Devoices a selected nick on a channel"
 msgstr "    DEVOICE    Devoices a selected nick on a channel"
 
-#: language.cpp:2911
+#: modules/core/ns_saset.cpp:174
 msgid "    DISPLAY    Set the display of the group in Services"
 msgstr "    DISPLAY    Set the display of the group in Services"
 
-#: language.cpp:2792
+#: modules/core/ns_set.cpp:168
 msgid "    DISPLAY    Set the display of your group in Services"
 msgstr "    DISPLAY    Grubunuzun servislerde nasýl görüneceðini ayarlar"
 
-#: language.cpp:3294
+#: modules/core/cs_drop.cpp:105
 msgid "    DROP       Cancel the registration of a channel"
 msgstr "    DROP       Kanal kaydýný siler"
 
-#: language.cpp:2607
+#: modules/core/ns_drop.cpp:152
 msgid "    DROP       Cancel the registration of a nickname"
 msgstr "    DROP       Nickin kaydýný siler"
 
-#: language.cpp:1246
+#: modules/core/cs_info.cpp:67
 #, c-format
 msgid "    Description: %s"
 msgstr "       Açýklama: %s"
 
-#: language.cpp:2915
+#: modules/core/ns_set_email.cpp:96
 msgid "    EMAIL      Associate an E-mail address with the nickname"
 msgstr "    EMAIL      Associate an E-mail address with the nickname"
 
-#: language.cpp:2799
+#: modules/core/ns_set_email.cpp:75
 msgid "    EMAIL      Associate an E-mail address with your nickname"
 msgstr "    EMAIL      Nickinizle bir email adresini iliþkilendirir"
 
-#: language.cpp:3396
-msgid ""
-"    ENTRYMSG      Set a message to be sent to users when they\n"
-"                     enter the channel"
-msgstr ""
-"    ENTRYMSG      Kanala giren kullanýcýlara gönderilecek mesajý\n"
-"                   belirler"
-
-#: language.cpp:4372
+#: modules/core/os_session.cpp:503
 msgid "    EXCEPTION   Modify the session-limit exception list"
 msgstr "    EXCEPTION   Session-limit exception listesini düzenler"
 
-#: language.cpp:3268
+#: modules/core/cs_forbid.cpp:116
 msgid "    FORBID     Prevent a channel from being used"
 msgstr "    FORBID     Kanalý kullanýma kapatýr"
 
-#: language.cpp:2637
+#: modules/core/ns_forbid.cpp:105
 msgid "    FORBID     Prevents a nickname from being registered"
 msgstr "    FORBID     Bir nickin kullanýlmasýný yasaklar"
 
-#: language.cpp:3390
+#: modules/core/cs_set_founder.cpp:89
 msgid "    FOUNDER       Set the founder of a channel"
 msgstr "    FOUNDER       Kanal founderýný belirler"
 
-#: language.cpp:2635
+#: modules/core/ns_getemail.cpp:72
 msgid ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
@@ -968,70 +912,75 @@ msgstr ""
 "    GETEMAIL   Matches and returns all users that registered using given "
 "email"
 
-#: language.cpp:3302
+#: modules/core/cs_getkey.cpp:65
 msgid "    GETKEY     Returns the key of the given channel"
 msgstr "    GETKEY     Returns the key of the given channel"
 
-#: language.cpp:2633
+#: modules/core/ns_getpass.cpp:80
 msgid "    GETPASS    Retrieve the password for a nickname"
 msgstr ""
 "    GETPASS    Bir nickin þifresini öðrenmek içindir\n"
 "               (Sadece þifreleme(encryption) devre dýþýysa)"
 
-#: language.cpp:2617
+#: modules/core/ns_ghost.cpp:96
 msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: language.cpp:2621
+#: modules/core/ns_group.cpp:305
 msgid "    GLIST      Lists all nicknames in your group"
 msgstr "    GLIST      Lists all nicknames in your group"
 
-#: language.cpp:4339
+#: modules/core/os_global.cpp:50
 msgid "    GLOBAL      Send a message to all users"
 msgstr "    GLOBAL      Tüm kullanýcýlara mesaj gönderir"
 
-#: language.cpp:2917
+#: modules/core/ns_set_greet.cpp:83
 msgid "    GREET      Associate a greet message with the nickname"
 msgstr "    GREET      Associate a greet message with the nickname"
 
-#: language.cpp:2801
+#: modules/core/ns_set_greet.cpp:59
 msgid "    GREET      Associate a greet message with your nickname"
 msgstr "    GREET      Nickiniz için bir karþýlama mesajý belirler"
 
-#: language.cpp:5166
+#: modules/core/hs_group.cpp:53
 msgid "    GROUP       Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Syncs the vhost for all nicks in a group"
 
-#: language.cpp:2595
+#: modules/core/ns_group.cpp:178
 msgid "    GROUP      Join a group"
 msgstr "    GROUP      Bir gruba dahil eder"
 
-#: language.cpp:530
+#: modules/core/ns_info.cpp:118
 #, c-format
 msgid "    Greet message: %s"
 msgstr "      Karþýlama mesajý: %s"
 
-#: language.cpp:3328
+#: modules/core/cs_modes.cpp:279
 msgid "    HALFOP     Halfops a selected nick on a channel"
 msgstr "    HALFOP     Halfops a selected nick on a channel"
 
-#: language.cpp:2810
+#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
 msgid "    HIDE       Hide certain pieces of nickname information"
 msgstr "    HIDE       Nickinizle ilgili bazý bilgileri saklar"
 
-#: language.cpp:3330
+#: modules/core/cs_xop.cpp:594
 msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
 msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
 
-#: language.cpp:2599
+#: modules/core/ns_identify.cpp:124
 msgid "    IDENTIFY   Identify yourself with your password"
 msgstr "    IDENTIFY   Þifrenizle nickinizi tanýtýr"
 
-#: language.cpp:4379
+#: modules/core/os_ignore.cpp:284
 msgid "    IGNORE      Modify the Services ignore list"
 msgstr "    IGNORE      Modify the Services ignore list"
 
-#: language.cpp:4829
+#: modules/core/ms_ignore.cpp:104
+#, fuzzy
+msgid "    IGNORE Manage your memo ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/bs_info.cpp:240
 msgid ""
 "    INFO           Allows you to see BotServ information about a channel or "
 "a bot"
@@ -1039,47 +988,47 @@ msgstr ""
 "INFO               Allows you to see BotServ information about a channel or "
 "a bot"
 
-#: language.cpp:2623
+#: modules/core/ns_info.cpp:167
 msgid "    INFO       Displays information about a given nickname"
 msgstr "    INFO       Displays information about a given nickname"
 
-#: language.cpp:3304
+#: modules/core/cs_info.cpp:135
 msgid "    INFO       Lists information about the named registered channel"
 msgstr "    INFO       Lists information about the named registered channel"
 
-#: language.cpp:4173
+#: modules/core/ms_info.cpp:217
 msgid "    INFO   Displays information about your memos"
 msgstr "    INFO   Displays information about your memos"
 
-#: language.cpp:3306
+#: modules/core/cs_invite.cpp:89
 msgid "    INVITE     Tells ChanServ to invite you into a channel"
 msgstr "    INVITE     Tells ChanServ to invite you into a channel"
 
-#: language.cpp:4377
+#: modules/core/os_jupe.cpp:70
 msgid "    JUPE        \"Jupiter\" a server"
 msgstr "    JUPE        Bir server'ý \"Kullanýlmaz\" yapar"
 
-#: language.cpp:3403
+#: modules/core/cs_set_keeptopic.cpp:64
 msgid "    KEEPTOPIC     Retain topic when channel is not in use"
 msgstr "    KEEPTOPIC     Kanalda kimse olmasa bile topiði hatýrlar"
 
-#: language.cpp:4823
+#: modules/core/bs_kick.cpp:534
 msgid "    KICK           Configures kickers"
 msgstr "KICK               Atma özelliklerini ayarlar"
 
-#: language.cpp:4347
+#: modules/core/os_kick.cpp:74
 msgid "    KICK        Kick a user from a channel"
 msgstr "    KICK        Bir kullanýcýyý kanaldan atar"
 
-#: language.cpp:3308
+#: modules/core/cs_kick.cpp:81
 msgid "    KICK       Kicks a selected nick from a channel"
 msgstr "    KICK       Kicks a selected nick from a channel"
 
-#: language.cpp:2803
+#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
 msgid "    KILL       Turn protection on or off"
 msgstr "    KILL       Korumayý açar kapatýr"
 
-#: language.cpp:2796
+#: modules/core/ns_set_language.cpp:81
 msgid ""
 "    LANGUAGE   Set the language Services will use when\n"
 "                   sending messages to you"
@@ -1087,182 +1036,166 @@ msgstr ""
 "    LANGUAGE   Servislerin size hitap edeceði \n"
 "                  dili belirler"
 
-#: language.cpp:2926
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-msgstr ""
-"    LANGUAGE   Set the language Services will use when\n"
-"               sending messages to nickname"
-
-#: language.cpp:3290
+#: modules/core/cs_access.cpp:747
 msgid "    LEVELS     Redefine the meanings of access levels"
 msgstr "    LEVELS     Access seviyelerini isteðinize göre düzenler"
 
-#: language.cpp:5176
+#: modules/core/hs_list.cpp:117
 msgid "    LIST        Displays one or more vhost entries."
 msgstr "    LIST        Displays one or more vhost entries."
 
-#: language.cpp:2625
+#: modules/core/ns_list.cpp:236
 msgid "    LIST       List all registered nicknames that match a given pattern"
 msgstr ""
 "    LIST       List all registered nicknames that match a given pattern"
 
-#: language.cpp:3310
+#: modules/core/cs_list.cpp:142
 msgid "    LIST       Lists all registered channels matching the given pattern"
 msgstr ""
 "    LIST       Lists all registered channels matching the given pattern"
 
-#: language.cpp:4165
+#: modules/core/ms_list.cpp:165
 msgid "    LIST   List your memos"
 msgstr "    LIST   Mesajlarýnýzý listeler"
 
-#: language.cpp:4363
+#: modules/core/os_news.cpp:324
 msgid "    LOGONNEWS   Define messages to be shown to users at logon"
 msgstr ""
 "    LOGONNEWS   Baðlantý sýrasýnda kullanýcýnýn göreceði mesajý \n"
 "                belirler"
 
-#: language.cpp:2627
+#: modules/core/ns_logout.cpp:95
 msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
 msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
 
-#: language.cpp:1200
+#: modules/core/cs_akick.cpp:124
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: language.cpp:3401
-msgid "    MLOCK         Lock channel modes on or off"
-msgstr "    MLOCK         Kanal modlarýný kitler yada açar"
-
-#: language.cpp:4345
+#: modules/core/os_mode.cpp:61
 msgid "    MODE        Change a channel's modes"
 msgstr "    MODE        Bir kanalýn modlarýný deðiþtirir"
 
-#: language.cpp:4410
+#: modules/core/cs_mode.cpp:312
+#, fuzzy
+msgid "    MODE       Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Bir kanalýn modlarýný temizler"
+
+#: modules/core/os_modinfo.cpp:82
 msgid "    MODINFO     Info about a loaded module"
 msgstr "    MODINFO     Info about a loaded module"
 
-#: language.cpp:4412
+#: modules/core/os_modlist.cpp:218
 msgid "    MODLIST     List loaded modules"
 msgstr "    MODLIST     List loaded modules"
 
-#: language.cpp:4404
+#: modules/core/os_modload.cpp:70
 msgid "    MODLOAD     Load a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4408
+#: modules/core/os_modreload.cpp:96
 #, fuzzy
 msgid "    MODRELOAD   Reload a module"
 msgstr "    MODLOAD     Load a module"
 
-#: language.cpp:4406
+#: modules/core/os_modunload.cpp:78
 msgid "    MODUNLOAD   Un-Load a module"
 msgstr "    MODUNLOAD   Un-Load a module"
 
-#: language.cpp:2812
+#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
 msgid "    MSG        Change the communication method of Services"
 msgstr "    MSG        Change the communication method of Services"
 
-#: language.cpp:3427
+#: modules/core/cs_saset_noexpire.cpp:61
 msgid "    NOEXPIRE      Prevent the channel from expiring"
 msgstr "    NOEXPIRE      Prevent the channel from expiring"
 
-#: language.cpp:2922
+#: modules/core/ns_saset_noexpire.cpp:63
 msgid "    NOEXPIRE   Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 
-#: language.cpp:4374
+#: modules/core/os_noop.cpp:85
 msgid ""
 "    NOOP        Temporarily remove all O:lines of a server \n"
 "                remotely"
 msgstr "    NOOP        Geçici olarak tüm O:line larý kaldýrýr"
 
-#: language.cpp:5164
+#: modules/core/hs_off.cpp:51
 msgid "    OFF         Deactivates your assigned vhost"
 msgstr "    OFF         Deactivates your assigned vhost"
 
-#: language.cpp:4398
+#: modules/core/os_oline.cpp:70
 msgid "    OLINE       Give Operflags to a certain user"
 msgstr "    OLINE       Give Operflags to a certain user"
 
-#: language.cpp:5162
+#: modules/core/hs_on.cpp:61
 msgid "    ON          Activates your assigned vhost"
 msgstr "    ON          Activates your assigned vhost"
 
-#: language.cpp:3312
+#: modules/core/cs_modes.cpp:122
 msgid "    OP         Gives Op status to a selected nick on a channel"
 msgstr "    OP         Gives Op status to a selected nick on a channel"
 
-#: language.cpp:4368
+#: modules/core/os_news.cpp:364
 msgid "    OPERNEWS    Define messages to be shown to users who oper"
 msgstr ""
 "    OPERNEWS    Oper olan kullanýcýlarýn görüntüleyeceði mesajý \n"
 "                belirler"
 
-#: language.cpp:3405
+#: modules/core/cs_set_opnotice.cpp:63
 msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
 msgstr "    OPNOTICE      OP/DEOP komutlarý kullanýldýðýnda mesaj yollar"
 
-#: language.cpp:3332
+#: modules/core/cs_modes.cpp:442
 msgid "    OWNER      Gives you owner status on channel"
 msgstr "    OWNER      Gives you owner status on channel"
 
-#: language.cpp:1685
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Options : %s"
 msgstr "    Ayarlar : %s"
 
-#: language.cpp:2913
+#: modules/core/ns_saset.cpp:245
 msgid "    PASSWORD   Set the nickname password"
 msgstr "    PASSWORD   Set the nickname password"
 
-#: language.cpp:2794
+#: modules/core/ns_set.cpp:230
 msgid "    PASSWORD   Set your nickname password"
 msgstr "    PASSWORD   Nickinize þifre belirtir"
 
-#: language.cpp:3407
+#: modules/core/cs_set_peace.cpp:63
 msgid "    PEACE         Regulate the use of critical commands"
 msgstr "    PEACE         kritik komutlarin kullanilmasini engeller"
 
-#: language.cpp:3425
+#: modules/core/cs_set_persist.cpp:135
 msgid "    PERSIST       Set the channel as permanent"
 msgstr "    PERSIST       Set the channel as permanent"
 
-#: language.cpp:3409
+#: modules/core/cs_set_private.cpp:62
 msgid "    PRIVATE       Hide channel from LIST command"
 msgstr "    PRIVATE       LIST komutuyla kanal listelenmez"
 
-#: language.cpp:2919
-msgid ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   %R%S LIST"
+#: modules/core/ns_set_private.cpp:67
+#, fuzzy
+msgid "    PRIVATE    Prevent the nickname from appearing in a %R%S LIST"
 msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %S LIST"
 
-#: language.cpp:2807
-msgid ""
-"    PRIVATE    Prevent your nickname from appearing in a\n"
-"                   %R%S LIST"
-msgstr ""
-"    PRIVATE    Nickinizin /msg %S LIST yazýldýðýnda görünmesini\n"
-"                  engeller"
-
-#: language.cpp:3334
+#: modules/core/cs_modes.cpp:362
 msgid "    PROTECT    Protects a selected nick on a channel"
 msgstr "    PROTECT    Protects a selected nick on a channel"
 
-#: language.cpp:3282
+#: modules/core/cs_xop.cpp:463
 msgid "    QOP        Modify the list of QOP users"
 msgstr "    QOP        Modify the list of QOP users"
 
-#: language.cpp:4390
+#: modules/core/os_quit.cpp:49
 msgid "    QUIT        Terminate the Services program with no save"
 msgstr "    QUIT        Servis programýný kapatýr"
 
-#: language.cpp:4365
+#: modules/core/os_news.cpp:401
 msgid ""
 "    RANDOMNEWS  Define messages to be randomly shown to users \n"
 "                at logon"
@@ -1270,240 +1203,243 @@ msgstr ""
 "    RANDOMNEWS  Baglanti sirasina kullaniciya gönderilen karisik\n"
 "                mesajlari belirler"
 
-#: language.cpp:4167
+#: modules/core/ms_read.cpp:150
 msgid "    READ   Read a memo or memos"
 msgstr "    READ   Mesajlarý okumanýzý saðlar"
 
-#: language.cpp:2609
+#: modules/core/ns_recover.cpp:124
 msgid "    RECOVER    Kill another user who has taken your nick"
 msgstr "    RECOVER    Nickinizi kullanan birini kill ler"
 
-#: language.cpp:2593
+#: modules/core/cs_register.cpp:131
+#, fuzzy
+msgid "    REGISTER   Register a channel"
+msgstr "    REGISTER   Nickinizi kaydeder"
+
+#: modules/core/ns_register.cpp:357
 msgid "    REGISTER   Register a nickname"
 msgstr "    REGISTER   Nickinizi kaydeder"
 
-#: language.cpp:2611
+#: modules/core/ns_release.cpp:101
 msgid "    RELEASE    Regain custody of your nick after RECOVER"
 msgstr ""
 "    RELEASE    RECOVER komutundan sonra nickinizi serbest \n"
 "               býrakýr"
 
-#: language.cpp:4383
+#: modules/core/os_reload.cpp:53
 msgid "    RELOAD      Reload services' configuration file"
 msgstr "    RELOAD      Servislerin conf dosyasýný yeniden yükler"
 
-#: language.cpp:2591
+#: modules/core/ns_register.cpp:409
 msgid "    RESEND     Resend a nickserv auth code"
 msgstr "    RESEND     Resend a nickserv auth code"
 
-#: language.cpp:2615
+#: modules/core/ns_resetpass.cpp:64
 msgid "    RESETPASS  Helps you reset lost passwords"
 msgstr "    RESETPASS  Helps you reset lost passwords"
 
-#: language.cpp:4388
+#: modules/core/os_restart.cpp:46
 msgid "    RESTART     Save databases and restart Services"
 msgstr ""
 "    RESTART     Veritabanýný kaydeder ve servisleri yeniden \n"
 "                baþlatýr"
 
-#: language.cpp:3411
+#: modules/core/cs_set_restricted.cpp:65
 msgid "    RESTRICTED    Restrict access to the channel"
 msgstr "    RESTRICTED    Kanala izinli giriþ gerektirir"
 
-#: language.cpp:4175
+#: modules/core/ms_rsend.cpp:80
 msgid "    RSEND  Sends a memo and requests a read receipt"
 msgstr "    RSEND  Sends a memo and requests a read receipt"
 
-#: language.cpp:1721
+#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "        Ctrl+R de atma : %s"
 
-#: language.cpp:1723
+#: modules/core/bs_info.cpp:141
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "        Ctrl+R de atma : %s (%d tanede ban)"
 
-#: language.cpp:3280
+#: modules/core/cs_saset.cpp:102
 msgid "    SASET      Forcefully set channel options and information"
 msgstr "    SASET      Forcefully set channel options and information"
 
-#: language.cpp:2605
+#: modules/core/ns_saset.cpp:105
 msgid "    SASET      Set SET-options on another nickname"
 msgstr "    SASET      Set SET-options on another nickname"
 
-#: language.cpp:4831
+#: modules/core/bs_say.cpp:78
 msgid ""
 "    SAY            Makes the bot say the given text on the given channel"
 msgstr ""
 "SAY                Makes the bot say the given text on the given channel"
 
-#: language.cpp:3413
+#: modules/core/cs_set_secure.cpp:64
 #, c-format
 msgid "    SECURE        Activate %S security features"
 msgstr "    SECURE        %S güvenlik özelliklerini aktifleþtirir"
 
-#: language.cpp:2805
+#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
 msgid "    SECURE     Turn nickname security on or off"
 msgstr "    SECURE     Nick güvenliðini açar kapatýr"
 
-#: language.cpp:3417
+#: modules/core/cs_set_securefounder.cpp:71
 msgid "    SECUREFOUNDER Stricter control of channel founder status"
 msgstr "    SECUREFOUNDER Kanal founderý durumunun sýký kontrolünü saðlar"
 
-#: language.cpp:3415
+#: modules/core/cs_set_secureops.cpp:62
 msgid "    SECUREOPS     Stricter control of chanop status"
 msgstr "    SECUREOPS     Kanal opu durumunun sýký kontrolünü saðlar"
 
-#: language.cpp:4161
+#: modules/core/ms_send.cpp:49
 msgid "    SEND   Send a memo to a nick or channel"
 msgstr "    SEND   Nicke veya kanala mesaj gönderir"
 
-#: language.cpp:4179
+#: modules/core/ms_sendall.cpp:62
 msgid "    SENDALL  Send a memo to all registered users"
 msgstr "    SENDALL  Send a memo to all registered users"
 
-#: language.cpp:2613
+#: modules/core/ns_sendpass.cpp:75
 msgid "    SENDPASS   Forgot your password? Try this"
 msgstr "    SENDPASS   Þifrenizimi unuttunuz? Bunu deneyin"
 
-#: language.cpp:4370
+#: modules/core/os_session.cpp:215
 msgid "    SESSION     View the list of host sessions"
 msgstr "    SESSION     Host session(oturum) larýn listesini gösterir"
 
-#: language.cpp:4821
+#: modules/core/bs_set.cpp:301
 msgid "    SET            Configures bot options"
 msgstr "SET                Bot özelliklerini ayarlar"
 
-#: language.cpp:5168
+#: modules/core/hs_set.cpp:115
 msgid "    SET         Set the vhost of another user"
 msgstr "    SET         Set the vhost of another user"
 
-#: language.cpp:4381
+#: modules/core/os_set.cpp:243
 msgid "    SET         Set various global Services options"
 msgstr "    SET         Çeþitli global servis özelliklerini ayarlar"
 
-#: language.cpp:3278
+#: modules/core/cs_set.cpp:106
 msgid "    SET        Set channel options and information"
 msgstr "    SET        Kanal özelliklerini ve bilgisini ayarlar"
 
-#: language.cpp:2603
+#: modules/core/ns_set.cpp:102
 msgid "    SET        Set options, including kill protection"
 msgstr "    SET        Ayarlar, kill korumasýný içerir"
 
-#: language.cpp:4171
+#: modules/core/ms_set.cpp:302
 msgid "    SET    Set options related to memos"
 msgstr "    SET    Mesajlarla ilgili ayarlarý yapar"
 
-#: language.cpp:5170
+#: modules/core/hs_setall.cpp:122
 msgid "    SETALL      Set the vhost for all nicks in a group"
 msgstr "    SETALL      Set the vhost for all nicks in a group"
 
-#: language.cpp:4392
+#: modules/core/os_shutdown.cpp:44
 msgid "    SHUTDOWN    Terminate the Services program with save"
 msgstr "    SHUTDOWN    Servisler programýný kayýt ederek kapatýr"
 
-#: language.cpp:3419
+#: modules/core/cs_set_signkick.cpp:76
 msgid "    SIGNKICK      Sign kicks that are done with KICK command"
 msgstr "    SIGNKICK      KICK komutuyla yapýlan atmalarý iþaretler"
 
-#: language.cpp:4353
+#: modules/core/os_snline.cpp:475
 msgid "    SNLINE      Manipulate the SNLINE list"
 msgstr "    SNLINE      SNLINE listesini düzenler"
 
-#: language.cpp:3286
+#: modules/core/cs_xop.cpp:659
 msgid "    SOP        Modify the list of SOP users"
 msgstr "    SOP        SOP listesini düzenler"
 
-#: language.cpp:4355
+#: modules/core/os_sqline.cpp:455
 msgid "    SQLINE      Manipulate the SQLINE list"
 msgstr "    SQLINE      SQLINE listesini düzenler"
 
-#: language.cpp:5235
-msgid "    SQLSYNC     Import your databases to SQL"
-msgstr "    SQLSYNC     Import your databases to SQL"
-
-#: language.cpp:4343
+#: modules/core/os_staff.cpp:63
 msgid "    STAFF       Display Services staff and online status"
 msgstr "    STAFF       Display Services staff and online status"
 
-#: language.cpp:4181
+#: modules/core/ms_staff.cpp:60
 msgid "    STAFF  Send a memo to all opers/admins"
 msgstr "    STAFF      Send a memo to all opers/admins"
 
-#: language.cpp:4341
+#: modules/core/os_stats.cpp:289
 msgid "    STATS       Show status of Services and network"
 msgstr "    STATS       Servislerin ve networkun durumunu gösterir"
 
-#: language.cpp:3275
+#: modules/core/cs_status.cpp:59
+#, fuzzy
 msgid ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
+"    STATUS     Returns the current access level of a user               on a "
+"channel"
 msgstr "    STATUS     Kullanýcýnýn kanaldaki access seviyesini söyler"
 
-#: language.cpp:2629
+#: modules/core/ns_status.cpp:79
 msgid "    STATUS     Returns the owner status of the given nickname"
 msgstr "    STATUS     Returns the owner status of the given nickname"
 
-#: language.cpp:3392
+#: modules/core/cs_set_successor.cpp:96
 msgid "    SUCCESSOR     Set the successor for a channel"
 msgstr "    SUCCESSOR     Kanal successorýný belirler"
 
-#: language.cpp:3270
+#: modules/core/cs_suspend.cpp:96
+#, fuzzy
 msgid ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
+"               \tchannel data and settings"
 msgstr ""
 "    SUSPEND    Prevent a channel from being used preserving\n"
 "               channel data and settings"
 
-#: language.cpp:2639
+#: modules/core/ns_suspend.cpp:103
 msgid "    SUSPEND    Suspend a given nick"
 msgstr "    SUSPEND    Suspend a given nick"
 
-#: language.cpp:4402
+#: modules/core/os_svsnick.cpp:83
 msgid "    SVSNICK     Forcefully change a user's nickname"
 msgstr "    SVSNICK     Forcefully change a user's nickname"
 
-#: language.cpp:4357
+#: modules/core/os_szline.cpp:455
 msgid "    SZLINE      Manipulate the SZLINE list"
 msgstr "    SZLINE      SZLINE listesini düzenler"
 
-#: language.cpp:3314
+#: modules/core/cs_topic.cpp:71
 msgid "    TOPIC      Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: language.cpp:3421
+#: modules/core/cs_set_topiclock.cpp:63
 msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
 msgstr "    TOPICLOCK     Topic sadece SET TOPIC komutuyla deðiþtirilir"
 
-#: language.cpp:4400
+#: modules/core/os_umode.cpp:72
 msgid "    UMODE       Change a user's modes"
 msgstr "    UMODE       Change a user's modes"
 
-#: language.cpp:4833
+#: modules/core/bs_unassign.cpp:68
 msgid "    UNASSIGN       Unassigns a bot from a channel"
 msgstr "UNASSIGN           Unassigns a bot from a channel"
 
-#: language.cpp:3316
+#: modules/core/cs_unban.cpp:79
 msgid ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: language.cpp:2597
+#: modules/core/ns_group.cpp:247
 msgid "    UNGROUP    Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
 
-#: language.cpp:3273
+#: modules/core/cs_suspend.cpp:157
 msgid "    UNSUSPEND  Releases a suspended channel"
 msgstr "    UNSUSPEND  Releases a suspended channel"
 
-#: language.cpp:2641
+#: modules/core/ns_suspend.cpp:171
 msgid "    UNSUSPEND  Unsuspend a given nick"
 msgstr "    UNSUSPEND  Unsuspend a given nick"
 
-#: language.cpp:4385
+#: modules/core/os_update.cpp:41
 msgid ""
 "    UPDATE      Force the Services databases to be\n"
 "                updated on disk immediately"
@@ -1511,84 +1447,84 @@ msgstr ""
 "    UPDATE      Diskteki Servis veritabanýnýn hemen\n"
 "                güncellenmesini saðlar"
 
-#: language.cpp:2631
+#: modules/core/ns_update.cpp:53
 msgid ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 msgstr ""
 "    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: language.cpp:4361
+#: modules/core/os_userlist.cpp:93
 msgid "    USERLIST    Lists all user records"
 msgstr "    USERLIST    Tüm kullanýcý kayýtlarýný listeler"
 
-#: language.cpp:1683
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Kullanýlan kanallar : %d kanalda"
 
-#: language.cpp:3318
+#: modules/core/cs_modes.cpp:199
 msgid "    VOICE      Voices a selected nick on a channel"
 msgstr "    VOICE      Voices a selected nick on a channel"
 
-#: language.cpp:3320
+#: modules/core/cs_xop.cpp:723
 msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
 
-#: language.cpp:3423
+#: modules/core/cs_set_xop.cpp:117
 msgid "    XOP           Toggle the user privilege system"
 msgstr "    XOP           Ayricalik sistemleri arasinda geçisi saglar"
 
-#: language.cpp:582
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: language.cpp:580
+#: modules/core/ns_group.cpp:276
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: language.cpp:1691
+#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "          Küfürde atma : %s"
 
-#: language.cpp:1693
+#: modules/core/bs_info.cpp:87
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "          Küfürde atma : %s (%d tanede ban)"
 
-#: language.cpp:524
+#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "         E-mail adresi: %s"
 
-#: language.cpp:514
+#: modules/core/ns_info.cpp:85
 #, c-format
 msgid "   Is online from: %s"
 msgstr "      Baðlandýðý adres: %s"
 
-#: language.cpp:520
+#: modules/core/ns_info.cpp:99
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "   Son görüldüðü tarih: %s"
 
-#: language.cpp:1256
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "   Topici yazan: %s"
 
-#: language.cpp:1905
+#: modules/core/bs_badwords.cpp:48
 #, c-format
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: language.cpp:2104
+#: include/language.h:110
 #, c-format
 msgid "  %3d   %-32s  %s"
 msgstr "  %3d   %-32s  %s"
 
-#: language.cpp:1158
+#: include/language.h:83
 #, c-format
 msgid ""
 "  %3d   %s   %s\n"
@@ -1597,17 +1533,17 @@ msgstr ""
 "  %3d   %s   %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:1152
+#: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
 msgstr "  %3d   %s  %s"
 
-#: language.cpp:1154
+#: modules/core/cs_access.cpp:56
 #, c-format
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: language.cpp:1161
+#: include/language.h:85
 #, c-format
 msgid ""
 "  %3d  %4d  %s\n"
@@ -1616,98 +1552,102 @@ msgstr ""
 "  %3d  %4d  %s\n"
 "    by %s, last seen %s"
 
-#: language.cpp:957
+#: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: language.cpp:570
+#: modules/core/ns_alist.cpp:118
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: language.cpp:568
+#: modules/core/ns_alist.cpp:115
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
 
-#: language.cpp:1192
+#: modules/core/cs_akick.cpp:86
 #, c-format
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: language.cpp:1248
-#, c-format
-msgid "  Entry message: %s"
-msgstr "   Giriþ mesajý: %s"
-
-#: language.cpp:1679
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "  Real name : %s"
 msgstr "        Gerçek ismi : %s"
 
-#: language.cpp:518
+#: modules/core/ns_info.cpp:95
 #, c-format
 msgid "  Time registered: %s"
 msgstr "          Kayýt zamaný: %s"
 
-#: language.cpp:1725
+#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Altýçizili yazýda atma : %s"
 
-#: language.cpp:1727
+#: modules/core/bs_info.cpp:150
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Altýçizili yazýda atma : %s (%d tanede ban)"
 
-#: language.cpp:2294
+#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: language.cpp:2296
+#: modules/core/os_staff.cpp:42
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: language.cpp:1446
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
 msgid " Num  Sender            Date/Time"
 msgstr " Num  Gönderen          Tarih/Zaman"
 
-#: language.cpp:167
+#: src/protocol.cpp:414
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: language.cpp:5108
+#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: language.cpp:5110
+#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: language.cpp:2268
+#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: language.cpp:2278
+#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: language.cpp:2366
+#: include/language.h:91
+#, fuzzy, c-format
+msgid ""
+"%3d    %s\n"
+"  Added by %s on %s"
+msgstr ""
+"  %3d  %4d  %s\n"
+"    by %s, last seen %s"
+
+#: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: language.cpp:2108
+#: include/language.h:111
 #, c-format
 msgid ""
 "%3d  %s (by %s on %s; %s)\n"
@@ -1716,7 +1656,7 @@ msgstr ""
 "%3d  %s (%s tarafýndan %s tarihinde; %s)\n"
 "      %s"
 
-#: language.cpp:1194
+#: include/language.h:87
 #, c-format
 msgid ""
 "%3d %s (by %s on %s)\n"
@@ -1725,25 +1665,16 @@ msgstr ""
 "%3d %s (by %s on %s)\n"
 "    %s"
 
-#: language.cpp:1197
-#, c-format
-msgid ""
-"%3d %s (stuck) (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (kalici) (by %s on %s)\n"
-"    %s"
-
-#: language.cpp:2370
-#, c-format
+#: modules/core/os_session.cpp:117
+#, fuzzy, c-format
 msgid ""
 "%3d.  %s  (by %s on %s; %s)\n"
-"    Limit: %-4d  - %s"
+"     Limit: %-4d  - %s"
 msgstr ""
 "%3d.  %s  (by %s on %s; %s)\n"
 "    Limit: %-4d  - %s"
 
-#: language.cpp:2492
+#: modules/core/os_news.cpp:178
 #, c-format
 msgid ""
 "%5d (%s by %s)\n"
@@ -1752,253 +1683,259 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: language.cpp:2391
+#: modules/core/os_session.cpp:142
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: language.cpp:4414
+#: modules/core/os_help.cpp:32
 #, c-format
 msgid "%S commands:"
 msgstr "%S commands:"
 
-#: language.cpp:1448
+#: modules/core/cs_mode.cpp:107
+#, fuzzy, c-format
+msgid "%c is not locked on %s."
+msgstr "%s yeni mesajlar için uyarýlmayacak."
+
+#: modules/core/ms_list.cpp:49
 #, c-format
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: language.cpp:2334
-#, c-format
-msgid "%d Modules loaded."
-msgstr "%d Modules loaded."
+#: modules/core/cs_mode.cpp:104
+#, fuzzy, c-format
+msgid "%c%c%s has been unlocked from %s."
+msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:1652
+#: modules/core/cs_mode.cpp:60
 #, c-format
-msgid "%d bots available."
-msgstr "%d bot mevcut."
+msgid "%c%c%s locked on %s"
+msgstr ""
 
-#: language.cpp:228
-#, c-format
-msgid "%d days"
-msgstr "%d gün"
+#: modules/core/cs_mode.cpp:135
+#, fuzzy, c-format
+msgid "%c%c%s, by %s on %s"
+msgstr ""
+"%3d %s (by %s on %s)\n"
+"    %s"
 
-#: language.cpp:232
+#: modules/core/os_modlist.cpp:203
 #, c-format
-msgid "%d hours"
-msgstr "%d saat"
+msgid "%d Modules loaded."
+msgstr "%d Modules loaded."
 
-#: language.cpp:236
+#: modules/core/bs_botlist.cpp:61
 #, c-format
-msgid "%d minutes"
-msgstr "%d dakika"
+msgid "%d bots available."
+msgstr "%d bot mevcut."
 
-#: language.cpp:578
+#: modules/core/ns_group.cpp:278
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "Grupta %d nick var."
 
-#: language.cpp:240
-#, c-format
-msgid "%d seconds"
-msgstr "%d saniye"
-
-#: language.cpp:1456
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: language.cpp:1015
-#, c-format
-msgid "%s AOP list is empty."
+#: modules/core/cs_xop.cpp:216 modules/core/cs_xop.cpp:284
+#: modules/core/cs_xop.cpp:335
+#, fuzzy, c-format
+msgid "%s %s list is empty."
 msgstr "%s kanalinin AOP listesi bos."
 
-#: language.cpp:1044
-#, c-format
-msgid "%s HOP list is empty."
-msgstr "%s kanali HOP listesi bos."
-
-#: language.cpp:986
-#, c-format
-msgid "%s QOP list is empty."
-msgstr "%s QOP list is empty."
-
-#: language.cpp:1073
-#, c-format
-msgid "%s SOP list is empty."
-msgstr "%s kanali SOP listesi bos."
-
-#: language.cpp:1102
-#, c-format
-msgid "%s VOP list is empty."
-msgstr "%s kanali VOP listesi bos."
-
-#: language.cpp:1145
+#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
+#: modules/core/cs_access.cpp:330
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s kanalýnýn access listesi boþ."
 
-#: language.cpp:1188
+#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
+#: modules/core/cs_akick.cpp:398
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "%s kanalýnýn akick listesi boþ."
 
-#: language.cpp:1900
+#: modules/core/bs_badwords.cpp:96
 #, c-format
 msgid "%s bad words list is empty."
 msgstr "%s kanalýnýn küfür listesi boþ."
 
-#: language.cpp:852
+#: modules/core/cs_set_successor.cpp:54
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s %s kanalýnda successor olamaz çünkü zaten o kanalýn founderý."
 
-#: language.cpp:1416
+#: src/memoserv.cpp:209
 #, c-format
 msgid "%s cannot receive memos."
 msgstr "%s nicki mesaj alamaz."
 
-#: language.cpp:159
+#: modules/core/hs_help.cpp:33
+#, fuzzy, c-format
+msgid "%s commands"
+msgstr "%S commands:"
+
+#: include/language.h:14
 #, c-format
 msgid "%s coverage is too wide; Please use a more specific mask."
 msgstr "%s kapsamý aþýrý geniþ; Lütfen daha belirli bir mask kullanýn."
 
-#: language.cpp:1552
+#: modules/core/ms_info.cpp:99
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s nickinin þu an %d mesajý var, %d tanesi okunmamýþ."
 
-#: language.cpp:1550
+#: modules/core/ms_info.cpp:97
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s nickinin þu an %d mesajý var, 1 tanesi okunmamýþ."
 
-#: language.cpp:1548
+#: modules/core/ms_info.cpp:95
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s nickinin þu an %d mesajý var."
 
-#: language.cpp:1554
+#: modules/core/ms_info.cpp:93
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s nickinin þu an %d mesajý var; hiçbiri okunmamýþ."
 
-#: language.cpp:1546
+#: modules/core/ms_info.cpp:82
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s nickinin þu an 1 mesajý var, ve daha okunmamýþ."
 
-#: language.cpp:1544
+#: modules/core/ms_info.cpp:84
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s nickinin þu an 1 mesajý var."
 
-#: language.cpp:1542
+#: modules/core/ms_info.cpp:78
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s nickinin þu an hiç mesajý yok."
 
-#: language.cpp:1418
+#: src/memoserv.cpp:214
 #, c-format
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s nickinin limiti dolduðundan daha fazla mesaj alamaz."
 
-#: language.cpp:840
+#: include/language.h:77
 #, c-format
 msgid "%s for %s set to %s."
 msgstr "%s for %s set to %s."
 
-#: language.cpp:842
+#: include/language.h:78
 #, c-format
 msgid "%s for %s unset."
 msgstr "%s for %s unset."
 
-#: language.cpp:1560
+#: modules/core/ms_info.cpp:116
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s nickinin mesaj limiti yok."
 
-#: language.cpp:1406
+#: include/language.h:98
 #, c-format
 msgid "%s has no memos."
 msgstr "%s nickinin hiç mesajý yok."
 
-#: language.cpp:1436
+#: include/language.h:102
 #, c-format
 msgid "%s has no new memos."
 msgstr "%s nickinin hiç yeni mesajý yok."
 
-#: language.cpp:508
+#: modules/core/ns_info.cpp:77
 #, c-format
 msgid "%s is %s"
 msgstr "   %s                isim: %s"
 
-#: language.cpp:510
+#: modules/core/ns_info.cpp:80
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: language.cpp:161
+#: src/protocol.cpp:451
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s þu an devre dýþý."
 
-#: language.cpp:516
+#: modules/core/ns_info.cpp:87
 #, c-format
 msgid "%s is currently online."
 msgstr "      %s þu an baðlý."
 
-#: language.cpp:2226
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is disabled"
 msgstr "%s is disabled"
 
-#: language.cpp:2224
+#: modules/core/os_set.cpp:25 modules/core/os_set.cpp:27
+#: modules/core/os_set.cpp:29
 #, c-format
 msgid "%s is enabled"
 msgstr "%s is enable"
 
-#: language.cpp:2290
+#: modules/core/os_set.cpp:94
 #, c-format
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is no longer a Super-Admin"
 
-#: language.cpp:1562
+#: modules/core/ms_info.cpp:129
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s yeni mesajlar için uyarýlmayacak."
 
-#: language.cpp:1564
+#: modules/core/ms_info.cpp:123
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s yeni mesajlar için baðlandýðýnda ve mesajlar ulaþtýðý anda uyarýlacak."
 
-#: language.cpp:1568
+#: modules/core/ms_info.cpp:127
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s yeni mesajlar için baðlandýðýnda uyarýlacak."
 
-#: language.cpp:1566
+#: modules/core/ms_info.cpp:125
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s yeni mesajlar ulaþtýðý anda uyarýlacak."
 
-#: language.cpp:2288
+#: modules/core/os_set.cpp:87
 #, c-format
 msgid "%s is now a Super-Admin"
 msgstr "%s is now a Super-Admin"
 
-#: language.cpp:1476
+#: modules/core/cs_xop.cpp:50 modules/core/cs_xop.cpp:309
+#, fuzzy, c-format
+msgid ""
+"%s list for %s:\n"
+"  Num  Nick"
+msgstr ""
+"%s kanali AOP listesi:\n"
+"  Num  Nick"
+
+#: modules/core/ns_ajoin.cpp:63
+#, fuzzy, c-format
+msgid "%s was not found on your auto join list."
+msgstr "%s %s kanalýnýn akick listesinde bulunamadý."
+
+#: modules/core/ns_ajoin.cpp:69
+#, fuzzy, c-format
+msgid "%s was removed from your auto join list."
+msgstr "%s %s kanalýnýn akick listesinden silindi."
+
+#: modules/core/ms_set.cpp:62
 #, c-format
 msgid "%s will not send you any notification of memos."
 msgstr "%s sizi yeni mesajlar için uyarmayacak."
 
-#: language.cpp:1474
+#: modules/core/ms_set.cpp:40
 #, c-format
 msgid "%s will now notify you of memos when they are sent to you."
 msgstr "%s sizi yeni mesajlar için size gönderildiði anda uyaracak."
 
-#: language.cpp:1470
+#: modules/core/ms_set.cpp:28
 #, c-format
 msgid ""
 "%s will now notify you of memos when you log on and when they are sent to "
@@ -2007,95 +1944,79 @@ msgstr ""
 "%s sizi yeni mesajlar için baðlandýðýnýzda veya mesajlar size gönderildiði "
 "anda uyaracak."
 
-#: language.cpp:1472
+#: modules/core/ms_set.cpp:34
 #, c-format
 msgid "%s will now notify you of memos when you log on or unset /AWAY."
 msgstr ""
 "%s sizi yeni mesajlar için baðlandýðýnýzda veya AWAY modundan dönüþte "
 "uyaracak."
 
-#: language.cpp:1640
+#: modules/core/bs_bot.cpp:105
 #, c-format
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) bot listesine eklendi."
 
-#: language.cpp:1558
+#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s nickinin mesaj limiti %d, ve deðiþtirilemez."
 
-#: language.cpp:1556
+#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s nickinin mesaj limiti %d."
 
-#: language.cpp:2473
+#: modules/core/os_defcon.cpp:341
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL any new clients connecting"
 
-#: language.cpp:2463
+#: modules/core/os_defcon.cpp:331
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Force Chan Modes (%s) to be set on all channels"
 
-#: language.cpp:2469
+#: modules/core/os_defcon.cpp:337
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore any non-opers with message"
 
-#: language.cpp:2467
+#: modules/core/os_defcon.cpp:335
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill any NEW clients connecting"
 
-#: language.cpp:2461
+#: modules/core/os_defcon.cpp:329
 msgid "* No MLOCK changes"
 msgstr "* No MLOCK changes"
 
-#: language.cpp:2457
+#: modules/core/os_defcon.cpp:325
 msgid "* No new channel registrations"
 msgstr "* No new channel registrations"
 
-#: language.cpp:2475
+#: modules/core/os_defcon.cpp:343
 msgid "* No new memos sent"
 msgstr "* No new memos sent"
 
-#: language.cpp:2459
+#: modules/core/os_defcon.cpp:327
 msgid "* No new nick registrations"
 msgstr "* No new nick registrations"
 
-#: language.cpp:2471
+#: modules/core/os_defcon.cpp:339
 msgid "* Silently ignore non-opers"
 msgstr "* Silently ignore non-opers"
 
-#: language.cpp:2465
+#: modules/core/os_defcon.cpp:333
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Use the reduced session limit of %d"
 
-#: language.cpp:226
-msgid "1 day"
-msgstr "1 gün"
-
-#: language.cpp:230
-msgid "1 hour"
-msgstr "1 saat"
-
-#: language.cpp:234
-msgid "1 minute"
-msgstr "1 dakika"
-
-#: language.cpp:238
-msgid "1 second"
-msgstr "1 saniye"
-
-#: language.cpp:224
+#: include/language.h:37
 msgid "<unknown>"
 msgstr "<varolmayan>"
 
-#: language.cpp:1422
+#: modules/core/ms_sendall.cpp:44
 msgid "A massmemo has been sent to all registered users."
 msgstr "A massmemo has been sent to all registered users."
 
-#: language.cpp:1590
+#: src/memoserv.cpp:377
 #, c-format
 msgid ""
 "A notification memo has been sent to %s informing him/her you have\n"
@@ -2104,134 +2025,136 @@ msgstr ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 
-#: language.cpp:671
+#: modules/core/ns_register.cpp:287
+#, fuzzy
 msgid ""
 "A passcode has been sent to %s, please type %R%s confirm <passcode> to "
-"complete registration"
+"complete registration.\n"
+"If you need to cancel your registration, use \"%R%s drop <password>\"."
 msgstr ""
 "A passcode has been sent to %s, please type /msg %s confirm <passcode> to "
 "complete registration"
 
-#: language.cpp:5126
+#: include/language.h:114
 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"
 
-#: language.cpp:5124
+#: include/language.h:113
 msgid "A vhost must be in the format of a valid hostmask."
 msgstr "Error! A vhost can only contain A-Z, a-z, 0-9, '.' and '-'."
 
-#: language.cpp:1109
-msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
+#: modules/core/cs_access.cpp:524
+#, fuzzy
+msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 "ACCESS kanaladý {ADD|DEL|LIST|VIEW|CLEAR} [nick [seviye] | kayýt-listesi]"
 
-#: language.cpp:484
+#: modules/core/ns_access.cpp:180
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: language.cpp:1911
+#: modules/core/bs_act.cpp:62
 msgid "ACT channel text"
 msgstr "ACT kanaladý yazý"
 
-#: language.cpp:1164
+#: modules/core/ns_ajoin.cpp:105
+#, fuzzy
+msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
+msgstr "ACCESS {ADD | DEL | LIST} [mask]"
+
+#: modules/core/cs_akick.cpp:559
+#, fuzzy
 msgid ""
-"AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
-"[nick-or-usermask] [reason]"
+"AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] "
+"[reason]"
 msgstr ""
 "AKICK kanaladý {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-veya-usermask] [sebep]"
 
-#: language.cpp:1202
+#: modules/core/cs_akick.cpp:461
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr " %s için AKICK uygulamasý tamam; %d kullanýcý için geçerli."
 
-#: language.cpp:2099
+#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
+#: modules/core/os_akill.cpp:333
 msgid "AKILL list is empty."
 msgstr "AKILL listesi boþ."
 
-#: language.cpp:2077
+#: modules/core/os_akill.cpp:454
+#, fuzzy
 msgid ""
-"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+zamanaþýmý] {mask | kayýt-no} "
 "[sebep]]"
 
-#: language.cpp:993
+#: modules/core/cs_xop.cpp:525
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: language.cpp:1017
-#, c-format
-msgid ""
-"AOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"%s kanali AOP listesi:\n"
-"  Num  Nick"
-
-#: language.cpp:1657
+#: modules/core/bs_assign.cpp:81
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN kanaladý nick"
 
-#: language.cpp:169
+#: include/language.h:17
 msgid "Access denied."
 msgstr "Bu komuta eriþiminiz yok."
 
-#: language.cpp:1131
+#: modules/core/cs_access.cpp:223
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "%s nickinin access seviyesi %s kanalýnda %d olarak deðiþtirildi."
 
-#: language.cpp:1129
+#: modules/core/cs_access.cpp:215
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "%s nickinin access seviyesi %s kanalýnda zaten %d."
 
-#: language.cpp:1123
+#: include/language.h:80
 #, c-format
 msgid "Access level must be between %d and %d inclusive."
 msgstr "Access seviyesi %d ve %d arasýnda olmalýdýr."
 
-#: language.cpp:1121
+#: modules/core/cs_access.cpp:184
 msgid "Access level must be non-zero."
 msgstr "Access seviyesi sýfýrdan farklý bir sayý olmalýdýr."
 
-#: language.cpp:1220
+#: modules/core/cs_access.cpp:612
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "%s kanalý için access level ayarlarý:"
 
-#: language.cpp:1228
+#: modules/core/cs_access.cpp:652
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "%s için access levelleri varsayýlanlarla deðiþtirildi."
 
-#: language.cpp:502
+#: modules/core/ns_access.cpp:26
 #, c-format
 msgid "Access list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: language.cpp:498
+#: modules/core/ns_access.cpp:36
 #, c-format
 msgid "Access list for %s:"
 msgstr "%s nickinin access listesi:"
 
-#: language.cpp:1147
-#, c-format
+#: include/language.h:81
+#, fuzzy, c-format
 msgid ""
 "Access list for %s:\n"
-"  Num   Lev  Nick"
+"  Num   Lev  Mask"
 msgstr ""
 "%s kanalý için access listesi:\n"
 "  Sýra   Seviye  Nick"
 
-#: language.cpp:496
+#: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Access listesi:"
 
-#: language.cpp:135
+#: src/commands.cpp:207
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2240,22 +2163,27 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
-#: language.cpp:2501
+#: modules/core/ns_ajoin.cpp:46
+#, fuzzy, c-format
+msgid "Added %s to your auto join list."
+msgstr "%s nicki %s kanalýnýn akick listesine eklendi."
+
+#: modules/core/os_news.cpp:40
 #, c-format
 msgid "Added new logon news item (#%d)."
 msgstr "Yeni baðlantý haberleri maddesi eklendi (#%d)."
 
-#: language.cpp:2521
+#: modules/core/os_news.cpp:52
 #, c-format
 msgid "Added new oper news item (#%d)."
 msgstr "Yeni operatör haberleri maddesi eklendi (#%d)."
 
-#: language.cpp:2541
+#: modules/core/os_news.cpp:64
 #, c-format
 msgid "Added new random news item (#%d)."
 msgstr "Yeni karisik haber eklendi (#%d)."
 
-#: language.cpp:3163
+#: modules/core/ns_register.cpp:160
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2263,236 +2191,229 @@ msgstr ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
 
-#: language.cpp:2230
+#: modules/core/os_noop.cpp:39
 #, c-format
 msgid "All O:lines of %s have been removed."
 msgstr "%s serverýndaki tüm O:line lar silindi."
 
-#: language.cpp:2232
+#: modules/core/os_noop.cpp:55
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "%s serverýndaki tüm O:line lar resetlendi."
 
-#: language.cpp:1308
-#, c-format
-msgid "All bans on channel %s have been removed."
-msgstr "%s kanalýndaki tüm banlar kaldýrýldý."
+#: modules/core/cs_clone.cpp:114
+#, fuzzy, c-format
+msgid "All access entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:1310
-#, c-format
-msgid "All excepts on channel %s have been removed."
-msgstr "All excepts on channel %s have been removed."
+#: modules/core/cs_clone.cpp:128
+#, fuzzy, c-format
+msgid "All akick entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:1318
-#, c-format
-msgid "All invites on channel %s have been removed."
-msgstr "All invites on channel %s have been removed."
+#: modules/core/cs_clone.cpp:139
+#, fuzzy, c-format
+msgid "All badword entries from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:2511
+#: modules/core/os_news.cpp:45
 msgid "All logon news items deleted."
 msgstr "Tüm baðlantý haberleri silindi."
 
-#: language.cpp:1464
+#: modules/core/ms_del.cpp:117
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "All memos for channel %s have been deleted."
 
-#: language.cpp:2069
-#, c-format
-msgid "All modes cleared from channel %s."
-msgstr "%s kanalýndaki tüm modlar temizlendi."
-
-#: language.cpp:1312
-#, c-format
-msgid "All modes on channel %s have been reset."
-msgstr "%s kanalýndaki tüm modlar resetlendi."
-
-#: language.cpp:1462
+#: modules/core/ms_del.cpp:119
 msgid "All of your memos have been deleted."
 msgstr "Tüm mesajlarýnýz silindi."
 
-#: language.cpp:2531
+#: modules/core/os_news.cpp:57
 msgid "All oper news items deleted."
 msgstr "Tüm operatör haberleri maddeleri silindi."
 
-#: language.cpp:2551
+#: modules/core/os_news.cpp:69
 msgid "All random news items deleted."
 msgstr "Tüm karisik haberler silindi."
 
-#: language.cpp:1316
-#, c-format
-msgid "All users have been kicked from channel %s."
+#: modules/core/cs_clone.cpp:103
+#, fuzzy, c-format
+msgid "All settings from %s have been transferred to %s"
+msgstr "All vhost's in the group %s have been set to %s"
+
+#: modules/core/cs_clearusers.cpp:47
+#, fuzzy, c-format
+msgid "All users have been kicked from %s."
 msgstr "%s kanalýndaki tüm kullanýcýlar atýldý."
 
-#: language.cpp:5152
+#: modules/core/hs_group.cpp:33
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: language.cpp:5154
+#: modules/core/hs_group.cpp:31
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "All vhost's in the group %s have been set to %s@%s"
 
-#: language.cpp:746
+#: src/chanserv.cpp:76 src/chanserv.cpp:77
 msgid "Allowed to (de)halfop him/herself"
 msgstr "Kendini (de)halfop etmeye izinlidir."
 
-#: language.cpp:744
+#: src/chanserv.cpp:83
 msgid "Allowed to (de)op him/herself"
 msgstr "Kendini (de)op etmeye izinlidir."
 
-#: language.cpp:772
+#: src/chanserv.cpp:100
 msgid "Allowed to (de)owner him/herself"
 msgstr "Allowed to (de)owner him/herself"
 
-#: language.cpp:750
+#: src/chanserv.cpp:85
 msgid "Allowed to (de)protect him/herself"
 msgstr "Kendini (de)protect etmeye izinlidir."
 
-#: language.cpp:738
+#: src/chanserv.cpp:90
 msgid "Allowed to (de)voice him/herself"
 msgstr "Kendini (de)voice etmeye izinlidir."
 
-#: language.cpp:726
+#: src/chanserv.cpp:92
 msgid "Allowed to assign/unassign a bot"
 msgstr "Botun assign/unassign komutlarýný kullanmaya izinlidir."
 
-#: language.cpp:760
+#: src/chanserv.cpp:74
 msgid "Allowed to ban him/herself"
 msgstr "Kendini banlamaya yetkili"
 
-#: language.cpp:774
+#: src/chanserv.cpp:101
 msgid "Allowed to issue commands restricted to channel founders"
 msgstr "Allowed to issue commands restricted to channel founders"
 
-#: language.cpp:754
+#: src/chanserv.cpp:80
 msgid "Allowed to kick him/herself"
 msgstr "Kendini atmaya izinlidir."
 
-#: language.cpp:724
+#: src/chanserv.cpp:91
 msgid "Allowed to list/read channel memos"
 msgstr "Kanala gelen mesajlari listelemeye/okumaya izinlidir."
 
-#: language.cpp:722
+#: src/chanserv.cpp:70
 msgid "Allowed to modify the access list"
 msgstr "Kanalýn Access listesinde deðiþiklik yapmaya izinlidir."
 
-#: language.cpp:710
+#: src/chanserv.cpp:71
 msgid "Allowed to use AKICK command"
 msgstr "AKICK komutunu kullanmaya izinlidir."
 
-#: language.cpp:728
+#: src/chanserv.cpp:93
 msgid "Allowed to use BADWORDS command"
 msgstr "BADWORDS komutunu kullanmaya izinlidir."
 
-#: language.cpp:762
+#: src/chanserv.cpp:73
 msgid "Allowed to use BAN command"
 msgstr "BAN komutunu kullanmaya yetkili"
 
-#: language.cpp:714
-msgid "Allowed to use CLEAR command"
-msgstr "CLEAR komutunu kullanmaya izinlidir."
-
-#: language.cpp:742
+#: src/chanserv.cpp:75
 msgid "Allowed to use GETKEY command"
 msgstr "GETKEY komutunu kullanmaya izinlidir."
 
-#: language.cpp:748
-msgid "Allowed to use HALFOP/DEHALFOP commands"
-msgstr "HALFOP/DEHALFOP komutlarýný kullanmaya izinlidir."
-
-#: language.cpp:766
+#: src/chanserv.cpp:78
 msgid "Allowed to use INFO command with ALL option"
 msgstr "INFO komutunu ALL seçenegiyle kullanmaya yetkili"
 
-#: language.cpp:708
+#: src/chanserv.cpp:81
 msgid "Allowed to use INVITE command"
 msgstr "INVITE komutunu kullanmaya izinlidir."
 
-#: language.cpp:756
+#: src/chanserv.cpp:79
 msgid "Allowed to use KICK command"
 msgstr "KICK komutunu kullanmaya izinlidir."
 
-#: language.cpp:718
+#: src/chanserv.cpp:87
+#, fuzzy
+msgid "Allowed to use MODE command"
+msgstr "Allowed to use OWNER command"
+
+#: src/chanserv.cpp:82
 msgid "Allowed to use OP/DEOP commands"
 msgstr "OP/DEOP komutlarýný kullanmaya izinlidir."
 
-#: language.cpp:770
+#: src/chanserv.cpp:99
 msgid "Allowed to use OWNER command"
 msgstr "Allowed to use OWNER command"
 
-#: language.cpp:752
+#: src/chanserv.cpp:84
 msgid "Allowed to use PROTECT/DEPROTECT commands"
 msgstr "PROTECT/DEPROTECT komutlarýný kullanmaya izinlidir."
 
-#: language.cpp:734
+#: src/chanserv.cpp:97
 msgid "Allowed to use SAY and ACT commands"
 msgstr "SAY ve ACT komutlarýný kullanmaya izinlidir."
 
-#: language.cpp:712
+#: src/chanserv.cpp:72
 msgid "Allowed to use SET command (not FOUNDER/PASSWORD)"
 msgstr "SET komutunu (FOUNDER/PASSWORD hariç) kullanmaya izinlidir."
 
-#: language.cpp:764
+#: src/chanserv.cpp:86
 msgid "Allowed to use TOPIC command"
 msgstr "TOPIC komutunu kullanmaya yetkili"
 
-#: language.cpp:716
+#: src/chanserv.cpp:88
 msgid "Allowed to use UNBAN command"
 msgstr "UNBAN komutunu kullanmaya izinlidir."
 
-#: language.cpp:740
+#: src/chanserv.cpp:89
 msgid "Allowed to use VOICE/DEVOICE commands"
 msgstr "VOICE/DEVOICE komutlarýný kullanmaya izinlidir."
 
-#: language.cpp:732
+#: src/chanserv.cpp:94
 msgid "Allowed to use fantaisist commands"
 msgstr "Kanalda fantazi komutlarýný kullanmaya izinlidir. "
 
-#: language.cpp:720
+#: src/chanserv.cpp:69
 msgid "Allowed to view the access list"
 msgstr "Kanalýn Access listesini görüntülemeye izinlidir."
 
-#: language.cpp:544
+#: modules/core/ns_info.cpp:126
 msgid "Auto-op"
 msgstr "Auto-op"
 
-#: language.cpp:1190
+#: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
+#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "%s kanalýnýn akick listesi:"
 
-#: language.cpp:696
+#: src/chanserv.cpp:64
 msgid "Automatic channel operator status"
 msgstr "Kanala giriþte ChanServ tarafýndan otomatik op (+o)"
 
-#: language.cpp:702
+#: src/chanserv.cpp:65
 msgid "Automatic mode +a"
 msgstr "Kanala giriþte ChanServ tarafýndan otomatik koruma (+a)"
 
-#: language.cpp:700
+#: src/chanserv.cpp:63
 msgid "Automatic mode +h"
 msgstr "Kanala giriþte ChanServ tarafýndan otomatik yarým op (+h)"
 
-#: language.cpp:768
+#: src/chanserv.cpp:98
 msgid "Automatic mode +q"
 msgstr "Automatic mode +q"
 
-#: language.cpp:698
+#: src/chanserv.cpp:66
 msgid "Automatic mode +v"
 msgstr "Kanala giriþte ChanServ tarafýndan otomatik voice (+v)"
 
-#: language.cpp:1880
+#: modules/core/bs_badwords.cpp:312
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr "BADWORDS kanaladý {ADD|DEL|LIST|CLEAR} [nick | kayýt-listesi]"
 
-#: language.cpp:1378
+#: modules/core/cs_ban.cpp:90
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: language.cpp:1630
+#: modules/core/bs_bot.cpp:409
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2502,7 +2423,7 @@ msgstr ""
 "BOT CHANGE eskinick yeninick [user [host [gerçekismi]]]\n"
 "BOT DEL nick"
 
-#: language.cpp:1902
+#: modules/core/bs_badwords.cpp:39 modules/core/bs_badwords.cpp:116
 #, c-format
 msgid ""
 "Bad words list for %s:\n"
@@ -2511,109 +2432,109 @@ msgstr ""
 "%s kanalýnýn küfür listesi:\n"
 "  Sayý   Kelime                           Tipi"
 
-#: language.cpp:1907
+#: modules/core/bs_badwords.cpp:224
 msgid "Bad words list is now empty."
 msgstr "Küfür listesi þimdi boþ."
 
-#: language.cpp:862
+#: modules/core/cs_set_bantype.cpp:38
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "%s kanalýnýn ban tipi #%d olarak deðiþtirildi."
 
-#: language.cpp:2067
-#, c-format
-msgid "Binary modes and bans cleared from channel %s."
-msgstr "%s kanalýnda modlar ve banlar temizlendi."
-
-#: language.cpp:1634
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "%s nickli bot zaten var."
 
-#: language.cpp:1603
+#: include/language.h:103
 #, c-format
 msgid "Bot %s does not exist."
 msgstr "Bot %s mevcut deðil."
 
-#: language.cpp:1663
+#: modules/core/bs_assign.cpp:65
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "%s botu %s kanalýna sokuldu."
 
-#: language.cpp:1644
+#: modules/core/bs_bot.cpp:265
 #, c-format
 msgid "Bot %s has been changed to %s!%s@%s (%s)"
 msgstr "%s botu %s!%s@%s (%s) olarak deðiþtirildi."
 
-#: language.cpp:1646
+#: modules/core/bs_bot.cpp:299
 #, c-format
 msgid "Bot %s has been deleted."
 msgstr "%s botu silindi."
 
-#: language.cpp:1661
+#: modules/core/bs_assign.cpp:57
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s is already assigned to channel %s."
 
-#: language.cpp:1764
+#: modules/core/bs_set.cpp:78
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot %s kanalýnda oplarýda atacak."
 
-#: language.cpp:1770
+#: modules/core/bs_set.cpp:93
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot %s kanalýnda voicelarýda atacak."
 
-#: language.cpp:1762
+#: modules/core/bs_set.cpp:73
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot %s kanalýnda oplarý atmayacak ."
 
-#: language.cpp:1768
+#: modules/core/bs_set.cpp:88
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot %s kanalýnda voicelarý atmayacak."
 
-#: language.cpp:1923
+#: modules/core/bs_bot.cpp:47 modules/core/bs_bot.cpp:152
 #, c-format
 msgid "Bot Hosts may only contain %d characters."
 msgstr "Bot Hosts may only contain %d characters."
 
-#: language.cpp:1917
+#: modules/core/bs_bot.cpp:75 modules/core/bs_bot.cpp:196
 msgid "Bot Hosts may only contain valid host characters."
 msgstr "Bot Hosts may only contain valid host characters."
 
-#: language.cpp:1921
+#: modules/core/bs_bot.cpp:41 modules/core/bs_bot.cpp:146
 #, c-format
 msgid "Bot Idents may only contain %d characters."
 msgstr "Bot Idents may only contain %d characters."
 
-#: language.cpp:1919
+#: modules/core/bs_bot.cpp:82 modules/core/bs_bot.cpp:204
 msgid "Bot Idents may only contain valid characters."
 msgstr "Bot Idents may only contain valid characters."
 
-#: language.cpp:1915
+#: modules/core/bs_bot.cpp:35 modules/core/bs_bot.cpp:54
+#: modules/core/bs_bot.cpp:61 modules/core/bs_bot.cpp:68
+#: modules/core/bs_bot.cpp:140 modules/core/bs_bot.cpp:176
+#: modules/core/bs_bot.cpp:183 modules/core/bs_bot.cpp:190
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks may only contain valid nick characters."
 
-#: language.cpp:1608
+#: include/language.h:106
 #, c-format
 msgid "Bot is not on channel %s."
 msgstr "Bot %s kanalýnda deðil."
 
-#: language.cpp:1648
+#: modules/core/bs_botlist.cpp:35
 msgid "Bot list:"
 msgstr "Bot listesi:"
 
-#: language.cpp:4845
+#: modules/core/bs_help.cpp:45
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
-"%d user(s) on it."
-msgstr "Kanalda en az %d kullanýcý olduðu zaman bot kanala girer."
+"%d user(s) on it. Additionally, all %s commands\n"
+"can be used if fantasy is enabled by prefixing the command\n"
+"name with a %c."
+msgstr ""
 
-#: language.cpp:1814
+#: modules/core/bs_kick.cpp:72
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2624,7 +2545,7 @@ msgstr ""
 "ayný kullanýcýyý banlayacak. BADWORDS komutunu\n"
 "kullanarak küfür ekleyip çýkarabilirsiniz."
 
-#: language.cpp:1811
+#: modules/core/bs_kick.cpp:76
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2632,20 +2553,20 @@ msgstr ""
 "Bot þimdi küfürlerde atacak. BADWORDS komutunu kullanarak\n"
 "listeye küfür ekleyip silebilirsiniz."
 
-#: language.cpp:1822
-#, c-format
+#: modules/core/bs_kick.cpp:105
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick bolds, and will place a ban after \n"
-"%d kicks for the same user."
+"Bot will now kick bolds, and will place a ban after\n"
+"%d kicks to the same user."
 msgstr ""
 "Bot þimdi kalýn yazýda atacak, ve \n"
 "%d atma sonrasýnda ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1820
+#: modules/core/bs_kick.cpp:107
 msgid "Bot will now kick bolds."
 msgstr "Bot þimdi kalýn yazýda atacak."
 
-#: language.cpp:1830
+#: modules/core/bs_kick.cpp:153
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2656,7 +2577,7 @@ msgstr ""
 "%d karakterini ve %d%% kadarýný içermelidir), ve \n"
 "%d atma sonrasýnda ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1827
+#: modules/core/bs_kick.cpp:157
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2665,47 +2586,47 @@ msgstr ""
 "Bot þimdi büyük yazýda atacak(Tüm mesajýn en az\n"
 "%d karakterini ve %d%% kadarýný içermelidir)."
 
-#: language.cpp:1838
-#, c-format
+#: modules/core/bs_kick.cpp:186
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick colors, and will place a ban after %d \n"
+"Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot þimdi renkli yazýda atacak, ve \n"
 "%d atma sonrasýnda ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1836
+#: modules/core/bs_kick.cpp:188
 msgid "Bot will now kick colors."
 msgstr "Bot þimdi renkli yazýda atacak."
 
-#: language.cpp:1845
-#, c-format
+#: modules/core/bs_kick.cpp:234
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick flood (%d lines in %d seconds), and \n"
+"Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 "Bot þimdi text floodda atacak(%d sira %d saniyede), ve \n"
 "%d atma sonrasýnda ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1843
+#: modules/core/bs_kick.cpp:236
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot þimdi text floodda atacak(%d sýra %d saniyede)."
 
-#: language.cpp:1875
-#, c-format
+#: modules/core/bs_kick.cpp:367
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick italics, and will place a ban after \n"
+"Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: language.cpp:1873
+#: modules/core/bs_kick.cpp:369
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: language.cpp:1853
+#: modules/core/bs_kick.cpp:274
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2716,7 +2637,7 @@ msgstr ""
 "ayný þeyi söylerse), ve %d atma sonrasýnda\n"
 "ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1850
+#: modules/core/bs_kick.cpp:278
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2725,137 +2646,153 @@ msgstr ""
 "Bot þimdi tekrarda atacak(kullanýcý %d kez\n"
 "ayný þeyi söylerse)."
 
-#: language.cpp:1861
-#, c-format
+#: modules/core/bs_kick.cpp:307
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick reverses, and will place a ban after %d \n"
+"Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot þimdi Ctrl+R de atacak, ve %d atma sonrasýnda \n"
 "ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1859
+#: modules/core/bs_kick.cpp:309
 msgid "Bot will now kick reverses."
 msgstr "Bot þimdi Ctrl+R de atacak."
 
-#: language.cpp:1868
-#, c-format
+#: modules/core/bs_kick.cpp:337
+#, fuzzy, c-format
 msgid ""
-"Bot will now kick underlines, and will place a ban after %d \n"
+"Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 "Bot þimdi altýçizili yazýda atacak, ve %d atma \n"
 "sonrasýnda ayný kullanýcýyý banlayacak."
 
-#: language.cpp:1866
+#: modules/core/bs_kick.cpp:339
 msgid "Bot will now kick underlines."
 msgstr "Bot þimdi altýçizili yazýda atacak."
 
-#: language.cpp:1818
+#: modules/core/bs_kick.cpp:398
+#, fuzzy
+msgid "Bot will now kick for amsgs"
+msgstr "Bot þimdi renkli yazýda atacak."
+
+#: modules/core/bs_kick.cpp:396
+#, fuzzy, c-format
+msgid ""
+"Bot will now kick for amsgs, and will place a ban after %d\n"
+"kicks for the same user."
+msgstr ""
+"Bot will now kick italics, and will place a ban after %d\n"
+"kicks for the same user."
+
+#: modules/core/bs_kick.cpp:82
 msgid "Bot won't kick bad words anymore."
 msgstr "Bot artýk küfürlerde atmayacak."
 
-#: language.cpp:1825
+#: modules/core/bs_kick.cpp:112
 msgid "Bot won't kick bolds anymore."
 msgstr "Bot artýk kalýn yazýda atmayacak."
 
-#: language.cpp:1834
+#: modules/core/bs_kick.cpp:163
 msgid "Bot won't kick caps anymore."
 msgstr "Bot artýk büyük yazýda atmayacak."
 
-#: language.cpp:1841
+#: modules/core/bs_kick.cpp:193
 msgid "Bot won't kick colors anymore."
 msgstr "Bot artýk renkli yazýda atmayacak."
 
-#: language.cpp:1848
+#: modules/core/bs_kick.cpp:241
 msgid "Bot won't kick flood anymore."
 msgstr "Bot artýk text floodda atmayacak."
 
-#: language.cpp:1878
+#: modules/core/bs_kick.cpp:374
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: language.cpp:1857
+#: modules/core/bs_kick.cpp:284
 msgid "Bot won't kick repeats anymore."
 msgstr "Bot artýk tekrarda atmayacak."
 
-#: language.cpp:1864
+#: modules/core/bs_kick.cpp:314
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot artýk Ctrl+R de atmayacak."
 
-#: language.cpp:1871
+#: modules/core/bs_kick.cpp:344
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot artýk altýçizili yazýda atmayacak."
 
-#: language.cpp:1971
+#: modules/core/bs_kick.cpp:403
+#, fuzzy
+msgid "Bot won't kick for amsgs anymore."
+msgstr "Bot artýk büyük yazýda atmayacak."
+
+#: modules/core/os_stats.cpp:215
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ    : %6d kayýt, %5d kB"
 
-#: language.cpp:1650
+#: modules/core/bs_botlist.cpp:43
 msgid "Bots reserved to IRC operators:"
 msgstr "IRCoplara ayrilmis botlar:"
 
-#: language.cpp:1957
+#: modules/core/os_stats.cpp:199
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Okunan veri  : %5d kB"
 
-#: language.cpp:1959
+#: modules/core/os_stats.cpp:200
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Yazýlan veri : %5d kB"
 
-#: language.cpp:1426
+#: modules/core/ms_cancel.cpp:68
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | kanaladý}"
 
-#: language.cpp:2113
+#: modules/core/os_chankill.cpp:99
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: language.cpp:1593
+#: modules/core/ms_check.cpp:80
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: language.cpp:1306
-msgid "CLEAR channel what"
-msgstr "CLEAR kanaladý neyi"
-
-#: language.cpp:2065
-msgid "CLEARMODES channel [ALL]"
+#: modules/core/cs_clearusers.cpp:65
+#, fuzzy
+msgid "CLEARUSERS channel"
 msgstr "CLEARMODES kanaladý [ALL]"
 
-#: language.cpp:356
-#, c-format
-msgid "Can't logout %s because he's a Services Operator."
-msgstr "Can't logout %s because he's a Services Operator."
+#: modules/core/cs_clone.cpp:165
+#, fuzzy
+msgid "CLONE channel target"
+msgstr "CLEAR kanaladý neyi"
 
-#: language.cpp:218
+#: modules/core/ns_register.cpp:379
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Þu an mail gönderilemiyor; lütfen az sonra tekrar deneyin."
 
-#: language.cpp:1969
+#: modules/core/os_stats.cpp:211
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ   : %6d kayýt, %5d kB"
 
-#: language.cpp:2055
+#: modules/core/os_umode.cpp:46
 #, c-format
 msgid "Changed usermodes of %s."
 msgstr "Changed usermodes of %s."
 
-#: language.cpp:200
+#: include/language.h:29
 #, c-format
 msgid "Channel %s doesn't exist."
 msgstr "%s kanalý þu an kullanýmda deðil."
 
-#: language.cpp:808
+#: modules/core/cs_drop.cpp:74
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "%s kanalýnýn kaydý silinmiþtir (dropped)."
 
-#: language.cpp:204
+#: include/language.h:31
 #, c-format
 msgid ""
 "Channel %s has been forbidden by %s:\n"
@@ -2864,142 +2801,103 @@ msgstr ""
 "%s kanalý yasaklanmýþtýr. %s:\n"
 "%s"
 
-#: language.cpp:792
+#: modules/core/cs_register.cpp:46
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "%s kanalý zaten kayýtlý!"
 
-#: language.cpp:947
+#: modules/core/cs_set_persist.cpp:95
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: language.cpp:1330
+#: modules/core/cs_forbid.cpp:91
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "%s kanalýnýn Kullanýmý yasaklandý."
 
-#: language.cpp:945
+#: modules/core/cs_set_persist.cpp:68
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: language.cpp:1350
+#: modules/core/cs_suspend.cpp:134
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Channel %s is now released."
 
-#: language.cpp:1340
+#: modules/core/cs_suspend.cpp:70
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Channel %s is now suspended."
 
-#: language.cpp:198
+#: include/language.h:28
 #, c-format
 msgid "Channel %s isn't registered."
 msgstr "%s kanalý kayýtlý deðil."
 
-#: language.cpp:202
+#: include/language.h:30
 #, c-format
 msgid "Channel %s may not be registered or used."
 msgstr "%s kanalý kayýt edilemez ve kullanýlamaz."
 
-#: language.cpp:790
+#: modules/core/cs_suspend.cpp:41
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "%s kanalý kayýt edilemez."
 
-#: language.cpp:800
+#: modules/core/cs_register.cpp:69
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "%s kanalý bu nicke kayýt edildi: %s"
 
-#: language.cpp:1963
+#: modules/core/os_stats.cpp:205
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Kanal      : %6d kayýt, %5d kB"
 
-#: language.cpp:953
+#: modules/core/cs_saset_noexpire.cpp:37
 #, c-format
 msgid "Channel %s will expire."
 msgstr "%s kanalý zaman aþýmýna eklendi."
 
-#: language.cpp:951
+#: modules/core/cs_saset_noexpire.cpp:32
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "%s kanalý zaman aþýmýndan çýkarýldý."
 
-#: language.cpp:1020
-#, c-format
-msgid "Channel %s AOP list has been cleared."
+#: modules/core/cs_xop.cpp:357
+#, fuzzy, c-format
+msgid "Channel %s %s list has been cleared."
 msgstr "Kanalin %s AOP listesi temizlendi."
 
-#: language.cpp:1049
-#, c-format
-msgid "Channel %s HOP list has been cleared."
-msgstr "Kanal %s HOP listesi temizlendi."
-
-#: language.cpp:991
-#, c-format
-msgid "Channel %s QOP list has been cleared."
-msgstr "Channel %s QOP list has been cleared."
-
-#: language.cpp:1078
-#, c-format
-msgid "Channel %s SOP list has been cleared."
-msgstr "Kanal %s SOP listesi temizlendi."
-
-#: language.cpp:1107
-#, c-format
-msgid "Channel %s VOP list has been cleared."
-msgstr "Kanal %s VOP listesi temizlendi."
-
-#: language.cpp:1156
+#: modules/core/cs_access.cpp:378
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Kanal %s access listesi temizlendi."
 
-#: language.cpp:1204
+#: modules/core/cs_akick.cpp:472
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Kanal %s akick listesi temizlendi."
 
-#: language.cpp:782
+#: modules/core/cs_mode.cpp:117
+#, fuzzy, c-format
+msgid "Channel %s has no mode locks."
+msgstr "Channel %s is now released."
+
+#: include/language.h:70
 #, c-format
 msgid "Channel %s is not a valid channel."
 msgstr "Channel %s is not a valid channel."
 
-#: language.cpp:997
-msgid "Channel AOP lists may only contain registered nicknames."
-msgstr "Kanal AOP listeleri sadece kayitli nicklerden olusabilir."
-
-#: language.cpp:1026
-msgid "Channel HOP lists may only contain registered nicknames."
-msgstr "Kanal HOP listeleri sadece kayitli nicklerden olusabilir."
-
-#: language.cpp:968
-msgid "Channel QOP lists may only contain registered nicknames."
-msgstr "Channel QOP lists may only contain registered nicknames."
-
-#: language.cpp:1055
-msgid "Channel SOP lists may only contain registered nicknames."
-msgstr "Kanal SOP listesi sadece kayitli nicklerden olusabilir."
-
-#: language.cpp:2142
+#: src/operserv.cpp:676
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINE kullandiginiz IRCd tarafindan desteklenmiyor, bu yüzden "
 "kullanmazsiniz."
 
-#: language.cpp:1084
-msgid "Channel VOP lists may only contain registered nicknames."
-msgstr "Kanal VOP listeleri sadece kayitli nicklerden olusabilir."
-
-#: language.cpp:1125
-msgid "Channel access lists may only contain registered nicknames."
-msgstr "Kanal access listesi sadece kayýtlý kullanýcýlarý içermelidir."
-
-#: language.cpp:2262
+#: modules/core/os_chanlist.cpp:55
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -3007,11 +2905,7 @@ msgstr ""
 "Kanal listesi:\n"
 "Ýsim              Kullanici Modlari  Konu"
 
-#: language.cpp:704
-msgid "Channel operator status disallowed"
-msgstr "Kanal içinde op olmasýný yasaklar."
-
-#: language.cpp:565
+#: modules/core/ns_alist.cpp:91
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -3020,7 +2914,7 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: language.cpp:562
+#: modules/core/ns_alist.cpp:94
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -3028,31 +2922,16 @@ msgstr ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description "
 
-#: language.cpp:1332
-#, c-format
-msgid "Couldn't forbid channel %s!"
-msgstr "%s kanalýnýn Kullanýmý yasaklanamadý!"
-
-#: language.cpp:661
-#, c-format
-msgid "Couldn't forbid nick %s!"
-msgstr "%s nickinin Kullanýmý yasaklanamadý!"
-
-#: language.cpp:1352
+#: modules/core/cs_suspend.cpp:121
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Couldn't release channel %s!"
 
-#: language.cpp:1342
-#, c-format
-msgid "Couldn't suspended channel %s!"
-msgstr "Couldn't suspended channel %s!"
-
-#: language.cpp:2106
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
 msgid "Current AKILL list:"
 msgstr "Þu anki AKILL listesi:"
 
-#: language.cpp:2101
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3060,15 +2939,15 @@ msgstr ""
 "Þu anki AKILL listesi:\n"
 "  No    Mask                              Sebep"
 
-#: language.cpp:2330
+#: modules/core/os_modlist.cpp:132
 msgid "Current Module list:"
 msgstr "Current Module list:"
 
-#: language.cpp:2136
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
 msgid "Current SNLINE list:"
 msgstr "Þu anki SNLINE listesi:"
 
-#: language.cpp:2133
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3076,11 +2955,11 @@ msgstr ""
 "Þu anki SNLINE listesi:\n"
 "  No   Mask                              Sebep"
 
-#: language.cpp:2163
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
 msgid "Current SQLINE list:"
 msgstr "Mevcut SQLINE listesi:"
 
-#: language.cpp:2160
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3088,11 +2967,11 @@ msgstr ""
 "Mevcut SQLINE listesi:\n"
 "  Num   Mask                              Sebep"
 
-#: language.cpp:2190
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
 msgid "Current SZLINE list:"
 msgstr "Þu anki SZLINE listesi:"
 
-#: language.cpp:2187
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3100,725 +2979,612 @@ msgstr ""
 "Þu anki SZLINE listesi:\n"
 "  No   Mask                              Sebep"
 
-#: language.cpp:2364
+#: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
+#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
 msgid "Current Session Limit Exception list:"
 msgstr "Þu anki Session Limit Exception listesi:"
 
-#: language.cpp:1979
+#: modules/core/os_stats.cpp:44
 #, c-format
 msgid "Current number of AKILLs: %d"
 msgstr "Þu anki AKILL sayýsý: %d"
 
-#: language.cpp:1995
+#: modules/core/os_stats.cpp:63
 #, c-format
 msgid "Current number of SNLINEs: %d"
 msgstr "Þu anki SNLINE sayýsý: %d"
 
-#: language.cpp:2011
+#: modules/core/os_stats.cpp:83
 #, c-format
 msgid "Current number of SQLINEs: %d"
 msgstr "Su anki SQLINE sayisi: %d"
 
-#: language.cpp:2027
+#: modules/core/os_stats.cpp:103
 #, c-format
 msgid "Current number of SZLINEs: %d"
 msgstr "Þu anki SZLINE sayýsý: %d"
 
-#: language.cpp:1933
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Þu anki kullanýcý sayýsý: %d (%d op)"
 
-#: language.cpp:2298
+#: modules/core/os_defcon.cpp:127
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: language.cpp:1368
-msgid "DEHALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:316
+#, fuzzy
+msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: language.cpp:5146
+#: modules/core/hs_del.cpp:56
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: language.cpp:1458
+#: modules/core/ms_del.cpp:148
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [kanaladý] {num | liste | ALL}"
 
-#: language.cpp:5120
+#: modules/core/hs_delall.cpp:61
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: language.cpp:1366
-msgid "DEOP #channel [nick]"
+#: modules/core/cs_modes.cpp:155
+#, fuzzy
+msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1374
-msgid "DEOWNER #channel"
-msgstr "DEOWNER #channel"
+#: modules/core/cs_modes.cpp:477
+#, fuzzy
+msgid "DEOWNER [#channel] [nick]"
+msgstr "DEOP #channel [nick]"
 
-#: language.cpp:1372
-msgid "DEROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:397
+#, fuzzy
+msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: language.cpp:1370
-msgid "DEVOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:233
+#, fuzzy
+msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: language.cpp:804
+#: modules/core/cs_drop.cpp:100
 msgid "DROP channel"
 msgstr "DROP kanaladý"
 
-#: language.cpp:1981
+#: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
 msgstr "Varsayýlan AKILL zaman aþýmý: %d gün"
 
-#: language.cpp:1985
+#: modules/core/os_stats.cpp:51
 #, c-format
 msgid "Default AKILL expiry time: %d hours"
 msgstr "Varsayýlan AKILL zaman aþýmý: %d saat"
 
-#: language.cpp:1989
+#: modules/core/os_stats.cpp:55
 #, c-format
 msgid "Default AKILL expiry time: %d minutes"
 msgstr "Varsayýlan AKILL zaman aþýmý: %d dakika"
 
-#: language.cpp:1983
+#: modules/core/os_stats.cpp:49
 msgid "Default AKILL expiry time: 1 day"
 msgstr "Varsayýlan AKILL zaman aþýmý: 1 gün"
 
-#: language.cpp:1987
+#: modules/core/os_stats.cpp:53
 msgid "Default AKILL expiry time: 1 hour"
 msgstr "Varsayýlan AKILL zaman aþýmý: 1 saat"
 
-#: language.cpp:1991
+#: modules/core/os_stats.cpp:57
 msgid "Default AKILL expiry time: 1 minute"
 msgstr "Varsayýlan AKILL zaman aþýmý: 1 dakika"
 
-#: language.cpp:1993
+#: modules/core/os_stats.cpp:59
 msgid "Default AKILL expiry time: No expiration"
 msgstr "Varsayýlan AKILL zaman aþýmý: zaman aþýmý yok"
 
-#: language.cpp:1997
+#: modules/core/os_stats.cpp:66
 #, c-format
 msgid "Default SNLINE expiry time: %d days"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: %d gün"
 
-#: language.cpp:2001
+#: modules/core/os_stats.cpp:70
 #, c-format
 msgid "Default SNLINE expiry time: %d hours"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: %d saat"
 
-#: language.cpp:2005
+#: modules/core/os_stats.cpp:74
 #, c-format
 msgid "Default SNLINE expiry time: %d minutes"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: %d dakika"
 
-#: language.cpp:1999
+#: modules/core/os_stats.cpp:68
 msgid "Default SNLINE expiry time: 1 day"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: 1 gün"
 
-#: language.cpp:2003
+#: modules/core/os_stats.cpp:72
 msgid "Default SNLINE expiry time: 1 hour"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: 1 saat"
 
-#: language.cpp:2007
+#: modules/core/os_stats.cpp:76
 msgid "Default SNLINE expiry time: 1 minute"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: 1 dakika"
 
-#: language.cpp:2009
+#: modules/core/os_stats.cpp:78
 msgid "Default SNLINE expiry time: No expiration"
 msgstr "Varsayýlan SNLINE zaman aþýmý süresi: Zaman aþýmý yok"
 
-#: language.cpp:2013
+#: modules/core/os_stats.cpp:86
 #, c-format
 msgid "Default SQLINE expiry time: %d days"
 msgstr "Varsayilan SQLINE zaman asimi süresi: %d gün"
 
-#: language.cpp:2017
+#: modules/core/os_stats.cpp:90
 #, c-format
 msgid "Default SQLINE expiry time: %d hours"
 msgstr "Varsayilan SQLINE zaman asimi süresi: %d saat"
 
-#: language.cpp:2021
+#: modules/core/os_stats.cpp:94
 #, c-format
 msgid "Default SQLINE expiry time: %d minutes"
 msgstr "Varsayilan SQLINE zaman asimi süresi: %d dakika"
 
-#: language.cpp:2015
+#: modules/core/os_stats.cpp:88
 msgid "Default SQLINE expiry time: 1 day"
 msgstr "Varsayilan SQLINE zaman asimi süresi: 1 gün"
 
-#: language.cpp:2019
+#: modules/core/os_stats.cpp:92
 msgid "Default SQLINE expiry time: 1 hour"
 msgstr "Varsayilan SQLINE zaman asimi süresi: 1 saat"
 
-#: language.cpp:2023
+#: modules/core/os_stats.cpp:96
 msgid "Default SQLINE expiry time: 1 minute"
 msgstr "Varsayilan SQLINE zaman asimi süresi: 1 dakika"
 
-#: language.cpp:2025
+#: modules/core/os_stats.cpp:98
 msgid "Default SQLINE expiry time: No expiration"
 msgstr "Varsayilan SQLINE zaman asimi süresi: Zaman asimi yok"
 
-#: language.cpp:2029
+#: modules/core/os_stats.cpp:106
 #, c-format
 msgid "Default SZLINE expiry time: %d days"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: %d gün"
 
-#: language.cpp:2033
+#: modules/core/os_stats.cpp:110
 #, c-format
 msgid "Default SZLINE expiry time: %d hours"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: %d saat"
 
-#: language.cpp:2037
+#: modules/core/os_stats.cpp:114
 #, c-format
 msgid "Default SZLINE expiry time: %d minutes"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: %d dakika"
 
-#: language.cpp:2031
+#: modules/core/os_stats.cpp:108
 msgid "Default SZLINE expiry time: 1 day"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: 1 gün"
 
-#: language.cpp:2035
+#: modules/core/os_stats.cpp:112
 msgid "Default SZLINE expiry time: 1 hour"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: 1 saat"
 
-#: language.cpp:2039
+#: modules/core/os_stats.cpp:116
 msgid "Default SZLINE expiry time: 1 minute"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: 1 dakika"
 
-#: language.cpp:2041
+#: modules/core/os_stats.cpp:118
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Varsayýlan SZLINE zaman aþýmý süresi: Zaman aþýmý yok"
 
-#: language.cpp:1013
-#, c-format
-msgid "Deleted %d entries from %s AOP list."
+#: modules/core/cs_xop.cpp:85
+#, fuzzy, c-format
+msgid "Deleted %d entries from %s %s list."
 msgstr "Deleted %d entries from %s AOP list."
 
-#: language.cpp:1042
-#, c-format
-msgid "Deleted %d entries from %s HOP list."
-msgstr "Deleted %d entries from %s HOP list."
-
-#: language.cpp:984
-#, c-format
-msgid "Deleted %d entries from %s QOP list."
-msgstr "Deleted %d entries from %s QOP list."
-
-#: language.cpp:1071
-#, c-format
-msgid "Deleted %d entries from %s SOP list."
-msgstr "Deleted %d entries from %s SOP list."
-
-#: language.cpp:1100
-#, c-format
-msgid "Deleted %d entries from %s VOP list."
-msgstr "Silindi %d VOP listesinden kayit %s kanali."
-
-#: language.cpp:1143
+#: modules/core/cs_access.cpp:130
 #, c-format
 msgid "Deleted %d entries from %s access list."
 msgstr "Deleted %d entries from %s access list."
 
-#: language.cpp:1186
+#: modules/core/cs_akick.cpp:150
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Deleted %d entries from %s autokick list."
 
-#: language.cpp:1898
+#: modules/core/bs_badwords.cpp:72
 #, c-format
 msgid "Deleted %d entries from %s bad words list."
 msgstr "Deleted %d entries from %s bad words list."
 
-#: language.cpp:2362
+#: modules/core/os_session.cpp:33
 #, c-format
 msgid "Deleted %d entries from session-limit exception list."
 msgstr "Session-limit exception listesinden %d kayýt silindi."
 
-#: language.cpp:2097
+#: modules/core/os_akill.cpp:32
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
 msgstr "AKILL listesinden %d kayýt silindi."
 
-#: language.cpp:2129
+#: modules/core/os_snline.cpp:33
 #, c-format
 msgid "Deleted %d entries from the SNLINE list."
 msgstr "SNLINE listesinden %d kayýt silindi."
 
-#: language.cpp:2156
+#: modules/core/os_sqline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SQLINE list."
 msgstr "SQLINE listesinden %d kayit silindi."
 
-#: language.cpp:2183
+#: modules/core/os_szline.cpp:32
 #, c-format
 msgid "Deleted %d entries from the SZLINE list."
 msgstr "SZLINE listesinden %d kayýt silindi."
 
-#: language.cpp:1011
-#, c-format
-msgid "Deleted 1 entry from %s AOP list."
-msgstr "%s kanalinin AOP listesinden 1 kayit silindi."
-
-#: language.cpp:1040
-#, c-format
-msgid "Deleted 1 entry from %s HOP list."
-msgstr "%s kanali HOP listesinden 1 kayit silindi."
-
-#: language.cpp:982
-#, c-format
-msgid "Deleted 1 entry from %s QOP list."
-msgstr "Deleted 1 entry from %s QOP list."
-
-#: language.cpp:1069
-#, c-format
-msgid "Deleted 1 entry from %s SOP list."
-msgstr "%s kanali SOP listesinden 1 kayit silindi."
-
-#: language.cpp:1098
-#, c-format
-msgid "Deleted 1 entry from %s VOP list."
-msgstr "%s kanali VOP listesinden 1 kayit silindi."
-
-#: language.cpp:1141
+#: modules/core/cs_access.cpp:128
 #, c-format
 msgid "Deleted 1 entry from %s access list."
 msgstr "%s kanalýnýn access listesinden 1 kayýt silindi."
 
-#: language.cpp:1184
+#: modules/core/cs_akick.cpp:148
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "%s kanalýnýn akick listesinden 1 kayýt silindi."
 
-#: language.cpp:1896
+#: modules/core/bs_badwords.cpp:70
 #, c-format
 msgid "Deleted 1 entry from %s bad words list."
 msgstr "%s kanalýnýn küfür listesinden 1 kayýt silindi."
 
-#: language.cpp:2360
+#: modules/core/os_session.cpp:31
 msgid "Deleted 1 entry from session-limit exception list."
 msgstr "Session-limit exception listesinden 1 kayýt silindi."
 
-#: language.cpp:2095
+#: modules/core/os_akill.cpp:30
 msgid "Deleted 1 entry from the AKILL list."
 msgstr "AKILL listesinden 1 kayýt silindi."
 
-#: language.cpp:2127
+#: modules/core/os_snline.cpp:31
 msgid "Deleted 1 entry from the SNLINE list."
 msgstr "SNLINE listesinden 1 kayýt silindi."
 
-#: language.cpp:2154
+#: modules/core/os_sqline.cpp:30
 msgid "Deleted 1 entry from the SQLINE list."
 msgstr "SQLINE listesinden 1 kayit silindi."
 
-#: language.cpp:2181
+#: modules/core/os_szline.cpp:30
 msgid "Deleted 1 entry from the SZLINE list."
 msgstr "SZLINE listesinden 1 kayýt silindi."
 
-#: language.cpp:854
+#: modules/core/cs_xop.cpp:83
+#, fuzzy, c-format
+msgid "Deleted one entry from %s %s list."
+msgstr "%s kanalinin AOP listesinden 1 kayit silindi."
+
+#: modules/core/cs_set_description.cpp:31
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "%s kanalýnýn açýklamasý %s olarak deðiþtirildi."
 
-#: language.cpp:5156
+#: include/language.h:109
+#, fuzzy
+msgid "Disabled"
+msgstr "Kapalý"
+
+#: modules/core/hs_list.cpp:95
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Displayed all records (Count: %d)"
 
-#: language.cpp:5158
+#: modules/core/hs_list.cpp:93
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Displayed records from %d to %d"
 
-#: language.cpp:5160
+#: modules/core/hs_list.cpp:89
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Displayed records matching key %s (Count: %d)"
 
-#: language.cpp:1614
+#: modules/core/bs_kick.cpp:570
+msgid "Don't use AMSGs!"
+msgstr ""
+
+#: src/botserv.cpp:128
 msgid "Don't use bolds on this channel!"
 msgstr "Bu kanalda kalýn yazý kullanýlmasý yasaktýr!"
 
-#: language.cpp:1618
+#: src/botserv.cpp:136
 msgid "Don't use colors on this channel!"
 msgstr "Lütfen bu kanalda renkli yazý kullanmayýn!"
 
-#: language.cpp:1628
+#: src/botserv.cpp:152
 msgid "Don't use italics on this channel!"
 msgstr "Don't use italics on this channel!"
 
-#: language.cpp:1624
+#: src/botserv.cpp:144
 msgid "Don't use reverses on this channel!"
 msgstr "Lütfen bu kanalda Ctrl+R ile yazýlmýþ yazý kullanmayýn!"
 
-#: language.cpp:1610
+#: src/botserv.cpp:260
 #, c-format
 msgid "Don't use the word \"%s\" on this channel!"
 msgstr "%s kelimesinin bu kanalda kullanýlmasý yasaktýr!"
 
-#: language.cpp:1626
+#: src/botserv.cpp:160
 msgid "Don't use underlines on this channel!"
 msgstr "Lütfen bu kanalda altý çizili yazý kullanmayýn!"
 
-#: language.cpp:414
+#: modules/core/ns_set_email.cpp:52
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: language.cpp:416
+#: modules/core/ns_set_email.cpp:57
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: language.cpp:378
-msgid "E-mail address unset."
-msgstr "E-mail adresi silindi."
-
-#: language.cpp:214
+#: src/mail.cpp:50 src/mail.cpp:71
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "%s için mail adresi geçerli deðil."
 
-#: language.cpp:2346
+#: modules/core/os_session.cpp:498
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametreler]"
 
-#: language.cpp:611
+#: modules/core/ns_getemail.cpp:42
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Match %s to %s."
 
-#: language.cpp:262
+#: include/language.h:108
+#, fuzzy
+msgid "Enabled"
+msgstr "Aktif"
+
+#: include/language.h:39
 #, c-format
 msgid "End of %s list."
 msgstr "End of %s list."
 
-#: language.cpp:1150
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
+#: modules/core/cs_access.cpp:357
 msgid "End of access list."
 msgstr "access listenin sonu."
 
-#: language.cpp:2270
+#: modules/core/os_chanlist.cpp:73
 msgid "End of channel list."
 msgstr "Kanal listesi sonu."
 
-#: language.cpp:572
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Liste sonu - %d/%d ."
 
-#: language.cpp:560 language.cpp:1288
+#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Liste sonu - %d/%d ."
 
-#: language.cpp:2280
+#: modules/core/os_userlist.cpp:73
 msgid "End of users list."
 msgstr "Kullanýcý listesi sonu."
 
-#: language.cpp:133
+#: modules/core/ns_set_language.cpp:64
 msgid "English"
 msgstr "Türkçe"
 
-#: language.cpp:856
-#, c-format
-msgid "Entry message for %s changed."
-msgstr "%s kanalýnýn giriþ mesajý deðiþtirildi."
-
-#: language.cpp:858
-#, c-format
-msgid "Entry message for %s unset."
-msgstr "%s kanalýnýn giriþ mesajý kaldýrýldý."
-
-#: language.cpp:5130
+#: include/language.h:116
 #, c-format
 msgid ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 msgstr ""
 "Error! The Ident is too long, please use an ident shorter than %d characters."
 
-#: language.cpp:5128
+#: include/language.h:115
 #, c-format
 msgid ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 msgstr ""
 "Error! The vhost is too long, please use a host shorter than %d characters."
 
-#: language.cpp:2352
+#: modules/core/os_session.cpp:346
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "%s (#%d) için exception %d pozisyonuyla deðiþtirildi."
 
-#: language.cpp:2379
+#: src/sessions.cpp:260
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: language.cpp:534
+#: modules/core/ns_info.cpp:141
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: language.cpp:2087
+#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
+#: src/operserv.cpp:813
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "%s nickinin zaman aþýmý süresi deðiþtirildi."
 
-#: language.cpp:1328
+#: modules/core/cs_forbid.cpp:34
 msgid "FORBID channel reason"
 msgstr "FORBID kanaladý sebep"
 
-#: language.cpp:1326
+#: modules/core/cs_forbid.cpp:111
 msgid "FORBID channel [reason]"
 msgstr "FORBID kanaladý [sebep]"
 
-#: language.cpp:657
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname reason"
 msgstr "FORBID nick sebep"
 
-#: language.cpp:655
+#: modules/core/ns_forbid.cpp:100
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [sebep]"
 
-#: language.cpp:1743
+#: modules/core/bs_info.cpp:196
 msgid "Fantasy"
 msgstr "Fantazi"
 
-#: language.cpp:1776
+#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#, fuzzy, c-format
+msgid "Fantasy mode is now  on channel %s."
+msgstr "Fantazi modu %s kanalýnda AKTÝF."
+
+#: modules/core/bs_set.cpp:181
 #, c-format
-msgid "Fantasy mode is now OFF on channel %s."
-msgstr "Fantazi modu %s kanalýnda KAPALI."
+msgid "Fantasy replies will be sent via NOTICE to %s."
+msgstr ""
 
-#: language.cpp:1774
+#: modules/core/bs_set.cpp:188
 #, c-format
-msgid "Fantasy mode is now ON on channel %s."
-msgstr "Fantazi modu %s kanalýnda AKTÝF."
+msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
+msgstr ""
 
-#: language.cpp:846
+#: modules/core/bs_set.cpp:174
+#, c-format
+msgid "Fantasy replies will be sent via PRIVMSG to %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:167
+#, fuzzy, c-format
+msgid "Fantasy replies will no longer be sent to %s."
+msgstr "%s will no longer be ignored."
+
+#: modules/core/cs_set_founder.cpp:67
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "%s kanalýnýn founderý %s olarak deðiþtirildi."
 
-#: language.cpp:609
+#: modules/core/ns_getemail.cpp:67
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host No WildCards!!"
 
-#: language.cpp:1320
+#: modules/core/cs_getkey.cpp:60
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: language.cpp:603
+#: modules/core/ns_getpass.cpp:75
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: language.cpp:605
+#: modules/core/ns_getpass.cpp:57
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS komutu devre dýþý çünkü þifreleme(encryption) devrede."
 
-#: language.cpp:597
+#: modules/core/ns_ghost.cpp:91
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [þifre]"
 
-#: language.cpp:1929
+#: modules/core/os_global.cpp:45
 msgid "GLOBAL message"
 msgstr "GLOBAL mesaj"
 
-#: language.cpp:308
-msgid "GROUP target password"
-msgstr "GROUP hedef þifre"
-
-#: language.cpp:601
+#: modules/core/ns_ghost.cpp:53
 msgid "Ghost with your nick has been killed."
 msgstr "Asýlý kalan nickiniz kill lendi."
 
-#: language.cpp:1745
+#: modules/core/bs_info.cpp:201
 msgid "Greet"
 msgstr "Karþýlama"
 
-#: language.cpp:736
+#: src/chanserv.cpp:95
 msgid "Greet message displayed"
 msgstr "Karþýlama mesajý alabilir."
 
-#: language.cpp:418
+#: modules/core/ns_set_greet.cpp:35
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: language.cpp:420
+#: modules/core/ns_set_greet.cpp:40
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: language.cpp:1782
-#, c-format
-msgid "Greet mode is now OFF on channel %s."
-msgstr "Karþýlama modu %s kanalýnda KAPALI."
-
-#: language.cpp:1780
-#, c-format
-msgid "Greet mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#, fuzzy, c-format
+msgid "Greet mode is now  on channel %s."
 msgstr "Karþýlama modu %s kanalýnda AKTÝF."
 
-#: language.cpp:1358
-msgid "HALFOP #channel [nick]"
+#: modules/core/cs_modes.cpp:274
+#, fuzzy
+msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: language.cpp:1022
+#: modules/core/cs_xop.cpp:589
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: language.cpp:1046
-#, c-format
-msgid ""
-"HOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"%s kanali HOP listesi:\n"
-"  Num  Nick"
-
-#: language.cpp:1572
-#, c-format
-msgid ""
-"Hi %s\n"
-" \n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-" \n"
-"Memo text:\n"
-" \n"
-"%s"
-msgstr ""
-"Hi %s\n"
-"\n"
-"You've just received a new memo from %s. This is memo number %d.\n"
-"\n"
-"Memo text:\n"
-"\n"
-"%s"
-
-#: language.cpp:636
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type %R%s CONFIRM %s\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to have the password for %s reset.\n"
-"To reset your password, type /msg %s CONFIRM %s\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:621
-#, c-format
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to receive the password of nickname %s by e-mail.\n"
-"The password is %s. For security purposes, you should change it as soon as "
-"you receive this mail.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:679
-msgid ""
-"Hi,\n"
-" \n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" %R%s confirm %s \" to complete registration.\n"
-" \n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-" \n"
-"%s administrators."
-msgstr ""
-"Hi,\n"
-"\n"
-"You have requested to register the nickname %s on %s.\n"
-"Please type \" /msg %s confirm %s \" to complete registration.\n"
-"\n"
-"If you don't know why this mail was sent to you, please ignore it silently.\n"
-"\n"
-"%s administrators."
-
-#: language.cpp:1973
+#: modules/core/os_stats.cpp:220
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: language.cpp:2387
+#: modules/core/os_session.cpp:134
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "En az %d sessionlý hostlar:"
 
-#: language.cpp:332
+#: modules/core/ns_identify.cpp:119
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY þifreniz"
 
-#: language.cpp:2244
-msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
+#: modules/core/ms_ignore.cpp:99
+#, fuzzy
+msgid "IGNORE [channel] {ADD|DEL|} [entry]"
+msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
+
+#: modules/core/os_ignore.cpp:279
+#, fuzzy
+msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
 
-#: language.cpp:1238
+#: modules/core/cs_info.cpp:130
 msgid "INFO channel"
 msgstr "INFO kanaladý"
 
-#: language.cpp:506
+#: modules/core/ns_info.cpp:162
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: language.cpp:1671
+#: modules/core/bs_info.cpp:235
 msgid "INFO {chan | nick}"
 msgstr "INFO {kanaladý | nick}"
 
-#: language.cpp:1290
+#: modules/core/cs_invite.cpp:84
 msgid "INVITE channel"
 msgstr "INVITE kanaladý"
 
-#: language.cpp:280
+#: src/nickserv.cpp:226
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Eðer 20 saniye içinde nickinizi deðiþtirmezseniz, Ben deðiþtireceðim."
 
-#: language.cpp:278
+#: src/nickserv.cpp:231
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Eðer bir dakika içinde nickinizi deðiþtirmezseniz, Ben deðiþtireceðim."
 
-#: language.cpp:2196
-msgid "Ignore code will be used."
-msgstr "Ignore kodu AKTIF."
-
-#: language.cpp:2198
-msgid "Ignore code will not be used."
-msgstr "Ignore kodu KAPALI."
-
-#: language.cpp:2260
+#: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ignore list has been cleared."
 
-#: language.cpp:2258
+#: modules/core/os_ignore.cpp:190
 msgid "Ignore list is empty."
 msgstr "Ignore listesi boþ."
 
-#: language.cpp:2816
+#: modules/core/ms_ignore.cpp:77
+#, fuzzy
+msgid "Ignore list:"
+msgstr "Bot listesi:"
+
+#: modules/core/ns_set.cpp:76
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
@@ -3834,42 +3600,38 @@ msgstr ""
 "Belirli bir özellik(option) hakkýnda bilgi almak için\n"
 "/msg %S HELP SET option yazýn."
 
-#: language.cpp:264
+#: include/language.h:40
 msgid "Incorrect range specified. The correct syntax is #from-to."
 msgstr "Incorrect range specified. The correct syntax is #from-to."
 
-#: language.cpp:1675
+#: modules/core/bs_info.cpp:60
 #, c-format
 msgid "Information for bot %s:"
 msgstr "%s botunun bilgileri:"
 
-#: language.cpp:1240
+#: include/language.h:89
 #, c-format
 msgid "Information for channel %s:"
 msgstr "%s kanalý için bilgi:"
 
-#: language.cpp:143
-msgid "Internal error - unable to process request."
-msgstr "Dahili hata - Kullanýcý kaydý bulunamadý."
-
-#: language.cpp:157
+#: include/language.h:13
 msgid "Invalid expiry time."
 msgstr "Geçersiz zaman aþýmý süresi."
 
-#: language.cpp:2375
+#: modules/core/os_session.cpp:274
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
 msgstr ""
 "Geçersiz hostmask. Sadece gerçek hostmasklar exception olarak geçerlidir."
 
-#: language.cpp:690
+#: include/language.h:68
 msgid ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 msgstr ""
 "Invalid passcode has been entered, please check the e-mail again, and retry"
 
-#: language.cpp:2373
+#: modules/core/os_session.cpp:267
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3878,296 +3640,310 @@ msgstr ""
 "Geçersiz session limiti. Sýfýrdan büyük yada eþit ve %d den az bir geçerli "
 "tamsayý olmalýdýr."
 
-#: language.cpp:2383
+#: modules/core/os_session.cpp:131
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Geçersiz threshold deðeri. 1 den büyük geçerli tamsayý olmalýdýr."
 
-#: language.cpp:2234
+#: modules/core/os_jupe.cpp:65
 msgid "JUPE servername [reason]"
 msgstr "JUPE serverismi [sebep]"
 
-#: language.cpp:1376
+#: modules/core/cs_kick.cpp:76
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: language.cpp:1802
-msgid "KICK channel option {ON|OFF} [settings]"
+#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
+#: modules/core/bs_kick.cpp:529
+#, fuzzy
+msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK kanaladý özellik {ON|OFF} [ayarlar]"
 
-#: language.cpp:2071
+#: modules/core/os_kick.cpp:69
 msgid "KICK channel user reason"
 msgstr "KICK kanaladý kullanýcý sebep"
 
-#: language.cpp:1324
+#: modules/core/cs_getkey.cpp:46
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: language.cpp:1206
+#: modules/core/cs_access.cpp:741
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS kanaladý {SET | DIS[ABLE] | LIST | RESET} [madde [seviye]]"
 
-#: language.cpp:554
+#: include/language.h:62
 msgid "LIST pattern"
 msgstr "LIST model"
 
-#: language.cpp:556
+#: modules/core/ns_list.cpp:229
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST model [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: language.cpp:1432
+#: modules/core/ms_list.cpp:160
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [kanaladý] [liste | NEW]"
 
-#: language.cpp:2488
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
+#: modules/core/os_news.cpp:319
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [yazý|num]"
 
-#: language.cpp:350
+#: modules/core/ns_logout.cpp:90
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: language.cpp:376
+#: modules/core/ns_set_language.cpp:46
 msgid "Language changed to English."
 msgstr "Dil Türkçe olarak deðiþtirildi."
 
-#: language.cpp:1430
+#: modules/core/ms_cancel.cpp:48
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "%s nickine gönderilen son mesaj iptal edildi."
 
-#: language.cpp:522
+#: modules/core/ns_info.cpp:103
 #, c-format
 msgid "Last quit message: %s"
 msgstr "      Son çýkýþ mesajý: %s"
 
-#: language.cpp:512
+#: modules/core/ns_info.cpp:92
 #, c-format
 msgid "Last seen address: %s"
 msgstr "      Son görüldüðü adres: %s"
 
-#: language.cpp:1212
+#: modules/core/cs_access.cpp:568
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "%s için level %s kanalýnda %d olarak deðiþtirildi."
 
-#: language.cpp:1214
+#: modules/core/cs_access.cpp:566
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: language.cpp:1210
+#: modules/core/cs_access.cpp:552
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Level %d ile %d arasýnda olmalýdýr."
 
-#: language.cpp:1208
+#: modules/core/cs_access.cpp:676
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Bu modda bu komut kullanilmaz."
 
-#: language.cpp:558
+#: include/language.h:63
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "%s içeren kayýtlarýn listesi:"
 
-#: language.cpp:576
+#: modules/core/ns_group.cpp:271
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "%s grubundaki nicklerin listesi:"
 
-#: language.cpp:574
+#: modules/core/ns_group.cpp:271
 msgid "List of nicknames in your group:"
 msgstr "Grubunuzdaki nicklerin listesi:"
 
-#: language.cpp:788
+#: modules/core/cs_register.cpp:40
 msgid "Local channels cannot be registered."
 msgstr "Local kanallar kayýt edilemezler."
 
-#: language.cpp:2507
-#, c-format
-msgid "Logon news item #%d deleted."
-msgstr "Baðlantý haberleri maddesi #%d silindi."
-
-#: language.cpp:2505
+#: modules/core/os_news.cpp:42
 #, c-format
 msgid "Logon news item #%d not found!"
 msgstr "Baðlantý haberleri maddesi #%d bulunamadý!"
 
-#: language.cpp:2490
+#: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Baðlantý haberleri:"
 
-#: language.cpp:2051
+#: include/language.h:79
+msgid "MLOCK is deprecated. Use %R%s HELP MODE instead."
+msgstr ""
+
+#: modules/core/os_mode.cpp:56
 msgid "MODE channel modes"
 msgstr "MODE kanaladý modlar"
 
-#: language.cpp:2344
+#: modules/core/cs_mode.cpp:307
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:77
 msgid "MODINFO FileName"
 msgstr "MODINFO FileName"
 
-#: language.cpp:2324
+#: modules/core/os_modload.cpp:65
 msgid "MODLOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: language.cpp:2328
+#: modules/core/os_modreload.cpp:91
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: language.cpp:2326
+#: modules/core/os_modunload.cpp:73
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD FileName"
 
-#: language.cpp:486
+#: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "%s access listenizde zaten var."
 
-#: language.cpp:155
+#: include/language.h:12
 msgid "Mask must be in the form user@host."
 msgstr "Mask user@host þeklinde tanýmlanmalýdýr."
 
-#: language.cpp:1935
+#: modules/core/os_stats.cpp:135
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Maximum kullanýcý sayýsý: %d (%s)"
 
-#: language.cpp:1452
+#: modules/core/ms_read.cpp:39
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %d"
 msgstr "%d nolu mesaj %s nickinden (%s).  Silmek için: /msg %s DEL %d yazýn."
 
-#: language.cpp:1454
+#: modules/core/ms_read.cpp:37
 msgid "Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"
 msgstr ""
 "%d nolu mesaj %s nickinden (%s).  Silmek için: /msg %s DEL %s %d yazýn."
 
-#: language.cpp:1460
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "%d nolu mesaj silindi."
 
-#: language.cpp:1508
+#: modules/core/ms_set.cpp:199
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "%s nickinin mesaj limiti kapatýldý."
 
-#: language.cpp:1504
+#: modules/core/ms_set.cpp:185
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "%s nickinin mesaj limiti %d olarak ayarlandý."
 
-#: language.cpp:1506
+#: modules/core/ms_set.cpp:192
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "%s nickinin mesaj limiti 0 olarak ayarlandý."
 
-#: language.cpp:1496
+#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
 #, c-format
 msgid "Memo limit too large; limiting to %d instead."
 msgstr "Mesaj limiti çok fazla; limit %d olarak deðiþtiriliyor."
 
-#: language.cpp:1420
+#: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "%s nickine mesajýnýz gönderildi."
 
-#: language.cpp:1438
+#: modules/core/ms_list.cpp:38
 msgid "Memos for %s.  To read, type: %R%s READ num"
 msgstr "%s nicki için mesajlar.  Okumak için: /msg %s READ num yazýn."
 
-#: language.cpp:1442
+#: modules/core/ms_list.cpp:36
 msgid "Memos for %s.  To read, type: %R%s READ %s num"
 msgstr "%s kanali için mesajlar.  Okumak için: /msg %s READ %s num yazýn."
 
-#: language.cpp:542
+#: modules/core/ms_list.cpp:134
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ num"
+msgstr "%s nicki için mesajlar.  Okumak için: /msg %s READ num yazýn."
+
+#: modules/core/ms_list.cpp:132
+#, fuzzy
+msgid "Memos for %s. To read, type: %R%s READ %s num"
+msgstr "%s kanali için mesajlar.  Okumak için: /msg %s READ %s num yazýn."
+
+#: modules/core/ns_info.cpp:125
 msgid "Message mode"
 msgstr "Message mode"
 
-#: language.cpp:866
-#, c-format
-msgid "Mode %c ignored because you can't lock it."
-msgstr "%c modunu kitleyemezsiniz, yoksayildi."
-
-#: language.cpp:1314
+#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
 #, c-format
-msgid "Mode +o has been cleared from channel %s."
-msgstr "Mod +o %s kanalýnda temizlendi."
+msgid "Missing parameter for mode %c."
+msgstr ""
 
-#: language.cpp:872
-#, c-format
-msgid "Mode lock on channel %s changed to %s."
-msgstr "%s kanalýnýn mod kilidi %s olarak deðiþtirildi."
+#: modules/core/cs_mode.cpp:121
+#, fuzzy, c-format
+msgid "Mode locks for %s:"
+msgstr "     Mod kilidi: %s"
 
-#: language.cpp:2320
+#: modules/core/os_modload.cpp:31
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: language.cpp:2322
+#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: language.cpp:2308
+#: modules/core/os_modload.cpp:39
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s loaded"
 
-#: language.cpp:2312
+#: modules/core/os_modreload.cpp:61
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s loaded"
 
-#: language.cpp:2310
+#: modules/core/os_modunload.cpp:53
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s unloaded"
 
-#: language.cpp:2336
+#: modules/core/os_modinfo.cpp:52
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Author: %s loaded: %s"
 
-#: language.cpp:2332
+#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
+#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
+#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
+#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: language.cpp:2228
+#: modules/core/os_noop.cpp:80
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: language.cpp:1967
+#: modules/core/os_stats.cpp:209
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliases    : %6d records, %5d kB"
 
-#: language.cpp:1965
+#: modules/core/os_stats.cpp:207
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS Groups     : %6d records, %5d kB"
 
-#: language.cpp:730
+#: src/chanserv.cpp:96
 msgid "Never kicked by the bot's kickers"
 msgstr "Bot tarafýndan kicklenmemeyi saðlar."
 
-#: language.cpp:1570
+#: src/memoserv.cpp:340
 msgid "New memo"
 msgstr "New memo"
 
-#: language.cpp:1440
+#: modules/core/ms_list.cpp:134
 msgid "New memos for %s.  To read, type: %R%s READ num"
 msgstr "%s nicki için yeni mesajlar.  Okumak için: /msg %s READ num yazýn."
 
-#: language.cpp:1444
+#: modules/core/ms_list.cpp:132
 msgid "New memos for %s.  To read, type: %R%s READ %s num"
 msgstr "%s kanali için yeni mesajlar.  Okumak için: /msg %s READ %s num yazýn."
 
-#: language.cpp:2499
+#: modules/core/os_news.cpp:205
 msgid "News list is full!"
 msgstr "Haber listesi dolu!"
 
-#: language.cpp:189
+#: include/language.h:25
 #, c-format
 msgid ""
 "Nick %s has been forbidden by %s:\n"
@@ -4176,146 +3952,132 @@ msgstr ""
 "%s nicki yasaklanmýþtýr. %s:\n"
 "%s"
 
-#: language.cpp:192
+#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is an illegal nickname and cannot be used."
 
-#: language.cpp:181
+#: modules/core/os_svsnick.cpp:56
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is currently in use."
 
-#: language.cpp:659
+#: modules/core/ns_forbid.cpp:80
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "%s nickinin Kullanýmý yasaklandý."
 
-#: language.cpp:177
+#: modules/core/ns_info.cpp:54
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: language.cpp:593
+#: modules/core/ns_release.cpp:38
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "%s nicki zaten serbest."
 
-#: language.cpp:183
+#: include/language.h:22
 #, c-format
 msgid "Nick %s isn't currently in use."
 msgstr "%s nicki þu an kullanýmda deðil."
 
-#: language.cpp:179
+#: include/language.h:21
 #, c-format
 msgid "Nick %s isn't registered."
 msgstr "%s kayýtlý bir nick deðil."
 
-#: language.cpp:187
+#: include/language.h:24
 #, c-format
 msgid "Nick %s may not be registered or used."
 msgstr "%s nicki kayýt edilemez ve kullanýlamaz."
 
-#: language.cpp:2256
+#: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s not found on ignore list."
 
-#: language.cpp:194
+#: modules/core/os_svsnick.cpp:35
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: language.cpp:474
+#: modules/core/ns_saset_noexpire.cpp:39
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: language.cpp:472
+#: modules/core/ns_saset_noexpire.cpp:34
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: language.cpp:1599
+#: modules/core/ms_check.cpp:64
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s doesn't have a memo from you."
 
-#: language.cpp:354
+#: modules/core/ns_logout.cpp:47
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "%s nickinin çýkýþý yapýldý."
 
-#: language.cpp:330
+#: modules/core/ns_group.cpp:222
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: language.cpp:196
+#: include/language.h:27
 #, c-format
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is currently suspended."
 
-#: language.cpp:653
+#: modules/core/ns_suspend.cpp:150
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: language.cpp:649
+#: modules/core/ns_suspend.cpp:82
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: language.cpp:667
+#: modules/core/ns_register.cpp:296
 msgid "Nick NOT registered, please try again later."
 msgstr "Nick NOT registered, please try again later."
 
-#: language.cpp:675
+#: modules/core/ns_register.cpp:71
 #, c-format
 msgid "Nickname %s confirmed"
 msgstr "Nickname %s confirmed"
 
-#: language.cpp:362
+#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
+#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "%s nickinin kaydý silindi (dropped)."
 
-#: language.cpp:298
+#: include/language.h:51
 #, c-format
 msgid "Nickname %s is already registered!"
 msgstr "%s nicki zaten kayýtlý!"
 
-#: language.cpp:296
+#: include/language.h:50
 #, c-format
 msgid "Nickname %s may not be registered."
 msgstr "%s nicki kayýt edilemez."
 
-#: language.cpp:404
-#, c-format
-msgid "Nickname %s not registered."
-msgstr "Nickname %s not registered."
-
-#: language.cpp:300
+#: modules/core/ns_register.cpp:55
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "%s nicki sizin adýnýza kayýt edildi: %s"
 
-#: language.cpp:302
-#, c-format
-msgid "Nickname %s registered."
+#: modules/core/ns_register.cpp:57
+#, fuzzy, c-format
+msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: language.cpp:677
-#, c-format
-msgid "Nickname Registration (%s)"
-msgstr "Nickname Registration (%s)"
-
-#: language.cpp:619
-#, c-format
-msgid "Nickname password (%s)"
-msgstr "Nick þifresi (%s)"
-
-#: language.cpp:2658
+#: modules/core/ns_help.cpp:48
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4326,161 +4088,116 @@ msgstr ""
 "kaydýnýn silinmesi söz konusudur, mesela kullanýlmayan\n"
 "nickler %d gün sonra silinirler."
 
-#: language.cpp:1348
-msgid "No # found in front of channel name."
-msgstr "No # found in front of channel name."
-
-#: language.cpp:1788
-#, c-format
-msgid "No Bot mode is now OFF on channel %s."
-msgstr "Bot yok modu %s kanalý için KAPALI."
-
-#: language.cpp:1786
-#, c-format
-msgid "No Bot mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#, fuzzy, c-format
+msgid "No Bot mode is now  on channel %s."
 msgstr "Bot yok modu %s kanalý için AKTÝF."
 
-#: language.cpp:613
+#: modules/core/ns_getemail.cpp:48
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No Emails listed for %s."
 
-#: language.cpp:1747
+#: modules/core/bs_info.cpp:206
 msgid "No bot"
 msgstr "Bot yok"
 
-#: language.cpp:153
+#: src/commands.cpp:200
 #, c-format
 msgid "No help available for %s."
 msgstr "%s hakkýnda yardým bulunamadý."
 
-#: language.cpp:2342
+#: modules/core/os_modinfo.cpp:62
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No information about module %s is available"
 
-#: language.cpp:2509
+#: modules/core/os_news.cpp:44
 msgid "No logon news items to delete!"
 msgstr "Silebileceðiniz baðlantý haberleri maddesi yok!"
 
-#: language.cpp:1007
-#, c-format
-msgid "No matching entries on %s AOP list."
+#: modules/core/cs_xop.cpp:77 modules/core/cs_xop.cpp:316
+#, fuzzy, c-format
+msgid "No matching entries on %s %s list."
 msgstr "%s kanali AOP listesinde uyusan kayit bulunamadi."
 
-#: language.cpp:1036
-#, c-format
-msgid "No matching entries on %s HOP list."
-msgstr "%s kanali HOP listesinde uyusan kayit bulunamadi."
-
-#: language.cpp:978
-#, c-format
-msgid "No matching entries on %s QOP list."
-msgstr "No matching entries on %s QOP list."
-
-#: language.cpp:1065
-#, c-format
-msgid "No matching entries on %s SOP list."
-msgstr "%s kanali SOP listesinde uyusan kayit bulunamadi."
-
-#: language.cpp:1094
-#, c-format
-msgid "No matching entries on %s VOP list."
-msgstr "%s kanali VOP listesinde uyusan kayit bulunamadi."
-
-#: language.cpp:1137
+#: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
+#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Uyuþan kayýt %s kanalýnýn access listesinde yok."
 
-#: language.cpp:1176
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
+#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Uyuþan kayýt %s kanalýnýn akick listesinde bulunamadý."
 
-#: language.cpp:1892
+#: modules/core/bs_badwords.cpp:28 modules/core/bs_badwords.cpp:68
+#: modules/core/bs_badwords.cpp:125
 #, c-format
 msgid "No matching entries on %s bad words list."
 msgstr "Uyuþan kayýt %s kanalýnýn küfür listesinde bulunamadý."
 
-#: language.cpp:2356
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
+#: modules/core/os_session.cpp:418
 msgid "No matching entries on session-limit exception list."
 msgstr "session-limit exception listesinde uyuþan kayýt bulunamadý."
 
-#: language.cpp:2091
+#: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
+#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
 msgid "No matching entries on the AKILL list."
 msgstr "Uyuþan kayýt AKILL listesinde bulunamadý."
 
-#: language.cpp:2123
+#: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
+#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
 msgid "No matching entries on the SNLINE list."
 msgstr "SNLINE listesinde uyuþan kayýt bulunamadý."
 
-#: language.cpp:2150
+#: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
+#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
 msgid "No matching entries on the SQLINE list."
 msgstr "SQLINE listesinde uyusan kayit bulunamadi."
 
-#: language.cpp:2177
+#: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
+#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
 msgid "No matching entries on the SZLINE list."
 msgstr "SZLINE listesinde uyuþan kayýt bulunamadý."
 
-#: language.cpp:1428
+#: modules/core/ms_cancel.cpp:52
 msgid "No memo was cancelable."
 msgstr "Ýptal edilecek mesaj yoktu."
 
-#: language.cpp:2340
+#: modules/core/os_modlist.cpp:201
 msgid "No modules currently loaded"
 msgstr "No modules currently loaded"
 
-#: language.cpp:2529
+#: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Silebileceðiniz operatör haberleri maddesi yok!"
 
-#: language.cpp:2549
+#: modules/core/os_news.cpp:68
 msgid "No random news items to delete!"
 msgstr "Silinecek karisik haber yok!"
 
-#: language.cpp:222
+#: include/language.h:36
 msgid "No reason"
 msgstr "Sebep yok"
 
-#: language.cpp:758
+#: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "SIGNKICK LEVEL kullanýldýðýnda iþaretli atma yapýlmaz."
 
-#: language.cpp:1003
-#, c-format
-msgid "No such entry (#%d) on %s AOP list."
-msgstr "(#%d) %s kanalinin AOP listesinde böyle bir kayit bulunamadi."
-
-#: language.cpp:1032
-#, c-format
-msgid "No such entry (#%d) on %s HOP list."
-msgstr "(#%d) %s kanali HOP listesinde uyusan kayit bulunamadi."
-
-#: language.cpp:974
-#, c-format
-msgid "No such entry (#%d) on %s QOP list."
-msgstr "No such entry (#%d) on %s QOP list."
-
-#: language.cpp:1061
-#, c-format
-msgid "No such entry (#%d) on %s SOP list."
-msgstr "(#%d) %s kanali SOP listesinde uyusan kayit bulunamadi."
-
-#: language.cpp:1090
-#, c-format
-msgid "No such entry (#%d) on %s VOP list."
-msgstr "(#%d) %s kanali VOP listesinde uyusan kayit bulunamadi."
-
-#: language.cpp:546 language.cpp:1751
+#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
+#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
 msgid "None"
 msgstr "YOK"
 
-#: language.cpp:706
+#: src/chanserv.cpp:67
 msgid "Not allowed to join channel"
 msgstr "RESTRICTED özelliðinin aktif olmasý halinde kanala giremez."
 
-#: language.cpp:3346
+#: modules/core/cs_help.cpp:46
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4491,95 +4208,93 @@ msgstr ""
 "(kanalýn access listesinde olan bir kimse o süre içinde \n"
 "kanala girmezse ) kaydý silinir."
 
-#: language.cpp:2368
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
 msgid "Num  Limit  Host"
 msgstr "Sayý  Limit  Host"
 
-#: language.cpp:2059
+#: modules/core/os_oline.cpp:65
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: language.cpp:1356
-msgid "OP #channel [nick]"
-msgstr "OP #channel [nick]"
-
-#: language.cpp:1262
+#: modules/core/cs_info.cpp:84
 msgid "OP Notice"
 msgstr "OP Notu"
 
-#: language.cpp:2513
+#: modules/core/cs_modes.cpp:117
+#, fuzzy
+msgid "OP [#channel] [nick]"
+msgstr "OP #channel [nick]"
+
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [yazý|num]"
 
-#: language.cpp:1364
-msgid "OWNER #channel"
-msgstr "OWNER #channel"
+#: modules/core/cs_modes.cpp:437
+#, fuzzy
+msgid "OWNER [#channel] [nick]"
+msgstr "OP #channel [nick]"
 
-#: language.cpp:1642
+#: modules/core/bs_bot.cpp:169
 msgid "Old info is equal to the new one."
 msgstr "Eski bilgiler þimdikilerle ayný."
 
-#: language.cpp:2292
+#: modules/core/os_staff.cpp:25
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: language.cpp:935
-#, c-format
-msgid "Op-notice option for %s is now OFF."
-msgstr "Op-notice option for %s is now OFF."
-
-#: language.cpp:933
-#, c-format
-msgid "Op-notice option for %s is now ON."
+#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now ."
 msgstr "Op-notice option for %s is now ON."
 
-#: language.cpp:2527
+#: modules/core/os_news.cpp:55
 #, c-format
 msgid "Oper news item #%d deleted."
 msgstr "Operatör haberleri maddesi #%d silindi."
 
-#: language.cpp:2525
+#: modules/core/os_news.cpp:54
 #, c-format
 msgid "Oper news item #%d not found!"
 msgstr "Operatör haberleri maddesi #%d bulunamadý!"
 
-#: language.cpp:2515
+#: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Operatör haberleri:"
 
-#: language.cpp:1975
+#: modules/core/os_stats.cpp:223
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ   : %6d kayýt, %5d kB"
 
-#: language.cpp:2061
+#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "An O:Line with the flags %s has been added for %s."
 
-#: language.cpp:1739
+#: modules/core/bs_info.cpp:186
 msgid "Ops protection"
 msgstr "Oplarý koruma"
 
-#: language.cpp:370
+#: modules/core/ns_set_message.cpp:32
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Option %s cannot be set on this network."
 
-#: language.cpp:1362
-msgid "PROTECT #channel [nick]"
+#: modules/core/cs_modes.cpp:357
+#, fuzzy
+msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: language.cpp:673
+#: modules/core/ns_getpass.cpp:38
 #, c-format
 msgid "Passcode for %s is %s."
 msgstr "Passcode for %s is %s."
 
-#: language.cpp:336
+#: modules/core/ns_identify.cpp:82
 msgid "Password accepted - you are now recognized."
 msgstr "Þifre kabul edildi."
 
-#: language.cpp:209
+#: include/language.h:33
 msgid ""
 "Password authentication required for that command.\n"
 "Retry after typing %R%s IDENTIFY password."
@@ -4587,60 +4302,56 @@ msgstr ""
 "Bu komutu kullanabilmek için þifrenizi girmelisiniz.\n"
 "/msg %s IDENTIFY þifreniz yazarak yeniden deneyiniz."
 
-#: language.cpp:412
+#: include/language.h:60
 #, c-format
 msgid "Password for %s changed to %s."
 msgstr "Password for %s changed to %s."
 
-#: language.cpp:410
+#: include/language.h:59
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#: language.cpp:607
+#: modules/core/ns_getpass.cpp:54
 #, c-format
 msgid "Password for %s is %s."
 msgstr "%s nickinin þifresi %s."
 
-#: language.cpp:165
+#: include/language.h:16
 msgid "Password incorrect."
 msgstr "Þifre geçersiz."
 
-#: language.cpp:630
+#: modules/core/ns_sendpass.cpp:46
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "%s nickinin þifresi gönderildi."
 
-#: language.cpp:645
+#: modules/core/ns_resetpass.cpp:42
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: language.cpp:1264
+#: modules/core/cs_info.cpp:85
 msgid "Peace"
 msgstr "Baris"
 
-#: language.cpp:890
-#, c-format
-msgid "Peace option for %s is now OFF."
-msgstr "Peace option for %s is now OFF."
-
-#: language.cpp:888
-#, c-format
-msgid "Peace option for %s is now ON."
+#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#, fuzzy, c-format
+msgid "Peace option for %s is now ."
 msgstr "Peace option for %s is now ON."
 
-#: language.cpp:1280
+#: modules/core/cs_info.cpp:97
 msgid "Persistant"
 msgstr "Persistant"
 
-#: language.cpp:5138
+#: include/language.h:117
 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."
 
-#: language.cpp:171
+#: include/language.h:18
+#, fuzzy
 msgid ""
-"Please try again with a more obscure password.  Passwords should be at least "
+"Please try again with a more obscure password. Passwords should be at least "
 "five characters long, should not be something easily guessed (e.g. your real "
 "name or your nick), and cannot contain the space or tab characters."
 msgstr ""
@@ -4648,169 +4359,130 @@ msgstr ""
 "kolayca tahmin edilemeyecek birþey olmalýdýr(ör: gerçek isminiz, nickiniz v."
 "b. olmamalýdýr), ve boþlukla tab kullanýlmamalýdýr."
 
-#: language.cpp:2236
+#: modules/core/os_jupe.cpp:31
 msgid "Please use a valid server name when juping"
 msgstr "Please use a valid server name when juping"
 
-#: language.cpp:802
+#: include/language.h:73
 msgid "Please use the symbol of # when attempting to register"
 msgstr "Please use the symbol of # when attempting to register"
 
-#: language.cpp:220
+#: src/mail.cpp:48 src/mail.cpp:69
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Lütfen %d saniye bekleyin ve tekrar deneyin."
 
-#: language.cpp:314
+#: modules/core/ns_group.cpp:61
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "GROUP komutunu tekrar kullanmadan önce lütfen %d saniye bekleyin."
 
-#: language.cpp:294
+#: modules/core/ns_register.cpp:254
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Lütfen %d saniye REGISTER komutunu tekrar kullanmak için bekleyin."
 
-#: language.cpp:1580
+#: src/memoserv.cpp:204
 #, c-format
 msgid "Please wait %d seconds before using the RSEND command again."
 msgstr "Please wait %d seconds before using the RSEND command again."
 
-#: language.cpp:1414
+#: src/memoserv.cpp:201
 #, c-format
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Lütfen %d saniye SEND komutunu tekrar kullanmak için bekleyin."
 
-#: language.cpp:540
+#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
+#: modules/core/bs_info.cpp:64
 msgid "Private"
 msgstr "Özel"
 
-#: language.cpp:1794
-#, c-format
-msgid "Private mode of bot %s is now OFF."
-msgstr "%s botunun özel seçenegi artik KAPALI."
-
-#: language.cpp:1792
-#, c-format
-msgid "Private mode of bot %s is now ON."
+#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now ."
 msgstr "%s botunun özel seçenegi artik AKTIF."
 
-#: language.cpp:896
-#, c-format
-msgid "Private option for %s is now OFF."
-msgstr "Private option for %s is now OFF."
-
-#: language.cpp:894
-#, c-format
-msgid "Private option for %s is now ON."
+#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#, fuzzy, c-format
+msgid "Private option for %s is now ."
 msgstr "Private option for %s is now ON."
 
-#: language.cpp:444
-#, c-format
-msgid "Private option is now OFF for %s."
-msgstr "Private option is now OFF for %s."
-
-#: language.cpp:442
-#, c-format
-msgid "Private option is now ON for %s."
+#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#, fuzzy, c-format
+msgid "Private option is now  for %s."
 msgstr "Private option is now ON for %s."
 
-#: language.cpp:536
+#: modules/core/ns_info.cpp:122
 msgid "Protection"
 msgstr "Kill korumasý"
 
-#: language.cpp:432
-#, c-format
-msgid "Protection is now OFF for %s."
-msgstr "Protection is now OFF for %s."
-
-#: language.cpp:428
-#, c-format
-msgid "Protection is now ON for %s, with a reduced delay."
+#: modules/core/ns_set_kill.cpp:45
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: language.cpp:430
-#, c-format
-msgid "Protection is now ON for %s, with no delay."
+#: modules/core/ns_set_kill.cpp:54
+#, fuzzy, c-format
+msgid "Protection is now  for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: language.cpp:426
-#, c-format
-msgid "Protection is now ON for %s."
+#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#, fuzzy, c-format
+msgid "Protection is now  for %s."
 msgstr "Protection is now ON for %s."
 
-#: language.cpp:386
-msgid "Protection is now ON, with no delay."
-msgstr "Anýnda kill korumasý: AKTÝF."
-
-#: language.cpp:2338
-msgid "Providing command: %R%s %s"
+#: modules/core/os_modinfo.cpp:32
+#, fuzzy
+msgid "Providing command: %%s %s"
 msgstr "Providing command: /msg %s %s"
 
-#: language.cpp:964
+#: modules/core/cs_xop.cpp:458
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: language.cpp:988
-#, c-format
-msgid ""
-"QOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"QOP list for %s:\n"
-"  Num  Nick"
-
-#: language.cpp:2533
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [yazi|no]"
 
-#: language.cpp:1450
+#: modules/core/ms_read.cpp:145
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [kanaladý] {liste | LAST | NEW}"
 
-#: language.cpp:584
+#: modules/core/ns_recover.cpp:119
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [þifre]"
 
-#: language.cpp:784
+#: modules/core/cs_register.cpp:126
 msgid "REGISTER channel description"
 msgstr "REGISTER kanaladý açýklama"
 
-#: language.cpp:288
-msgid "REGISTER password email"
-msgstr "REGISTER þifreniz emailiniz"
-
-#: language.cpp:286
-msgid "REGISTER password [email]"
-msgstr "REGISTER þifreniz [emailiniz]"
-
-#: language.cpp:591
+#: modules/core/ns_release.cpp:96
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [þifre]"
 
-#: language.cpp:632
+#: modules/core/ns_resetpass.cpp:59
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: language.cpp:1584
+#: modules/core/ms_rsend.cpp:75
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | channel} memo-text"
 
-#: language.cpp:2547
+#: modules/core/os_news.cpp:67
 #, c-format
 msgid "Random news item #%d deleted."
 msgstr "#%d numarali karisik haber silindi."
 
-#: language.cpp:2545
+#: modules/core/os_news.cpp:66
 #, c-format
 msgid "Random news item #%d not found!"
 msgstr "#%d numarali karisik haber bulunamadi!"
 
-#: language.cpp:2535
+#: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Karisik haberler:"
 
-#: language.cpp:688
+#: modules/core/ns_register.cpp:112
 msgid ""
 "Registration step 1 may have expired, please use \"%R%s register <password> "
 "<email>\" first."
@@ -4818,296 +4490,307 @@ msgstr ""
 "Registration step 1 may have expired, please use \"/msg %s register "
 "<password> <email>\" first."
 
-#: language.cpp:634
+#: modules/core/ns_resetpass.cpp:149
 #, c-format
 msgid "Reset password request for %s"
 msgstr "Reset password request for %s"
 
-#: language.cpp:1266
+#: modules/core/cs_info.cpp:87
 msgid "Restricted Access"
 msgstr "Kisitli Erisim."
 
-#: language.cpp:914
-#, c-format
-msgid "Restricted access option for %s is now OFF."
-msgstr "Restricted access option for %s is now OFF."
-
-#: language.cpp:912
-#, c-format
-msgid "Restricted access option for %s is now ON."
+#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now ."
 msgstr "Restricted access option for %s is now ON."
 
-#: language.cpp:464
+#: modules/core/ns_set_message.cpp:94
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:810
+#: include/language.h:74
 msgid "SASET channel option parameters"
 msgstr "SASET channel option parameters"
 
-#: language.cpp:812
+#: modules/core/cs_set_keeptopic.cpp:77
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:814
+#: modules/core/cs_set_opnotice.cpp:76
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: language.cpp:816
+#: modules/core/cs_set_peace.cpp:76
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: language.cpp:818
+#: modules/core/cs_set_persist.cpp:148
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: language.cpp:820
+#: modules/core/cs_set_private.cpp:75
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: language.cpp:822
+#: modules/core/cs_set_restricted.cpp:78
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: language.cpp:824
+#: modules/core/cs_set_secure.cpp:77
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: language.cpp:826
+#: modules/core/cs_set_securefounder.cpp:84
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:828
+#: modules/core/cs_set_secureops.cpp:75
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: language.cpp:830
+#: modules/core/cs_set_signkick.cpp:89
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: language.cpp:832
+#: modules/core/cs_set_topiclock.cpp:76
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: language.cpp:834
+#: modules/core/cs_set_xop.cpp:130
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: language.cpp:400
+#: include/language.h:56
 msgid "SASET nickname option parameters"
 msgstr "SASET nickname option parameters"
 
-#: language.cpp:476
+#: modules/core/ns_set_autoop.cpp:87
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: language.cpp:446
-msgid "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
-
-#: language.cpp:424
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:422
+#: modules/core/ns_set_kill.cpp:130
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: language.cpp:482
+#: modules/core/ns_set_language.cpp:107
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: language.cpp:470
+#: modules/core/ns_saset_noexpire.cpp:58
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: language.cpp:440
+#: modules/core/ns_set_private.cpp:92
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: language.cpp:434
+#: modules/core/ns_set_secure.cpp:96
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: language.cpp:1909
+#: modules/core/ns_set_hide.cpp:130
+#, fuzzy
+msgid ""
+"SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
+"STATUS | USERMASK | QUIT} {ON | OFF}"
+msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
+
+#: modules/core/bs_say.cpp:73
 msgid "SAY channel text"
 msgstr "SAY kanaladý yazý"
 
-#: language.cpp:1408
+#: include/language.h:99
 msgid "SEND {nick | channel} memo-text"
 msgstr "SEND {nick | kanaladý} mesaj"
 
-#: language.cpp:1410
+#: modules/core/ms_sendall.cpp:57
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:615
+#: modules/core/ns_sendpass.cpp:70
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: language.cpp:617
+#: modules/core/ns_sendpass.cpp:50
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS komutu devre dýþý çünkü þifreleme(encryption) devrede."
 
-#: language.cpp:2381
+#: modules/core/os_session.cpp:210
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limit"
 
-#: language.cpp:5134
+#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: language.cpp:1753
+#: modules/core/bs_set.cpp:296
 msgid "SET (channel | bot) option settings"
 msgstr "SET kanaladý özellik ayarlar"
 
-#: language.cpp:1784
-msgid "SET botname NOBOT {ON|OFF}"
+#: modules/core/bs_set.cpp:143
+#, fuzzy
+msgid "SET botname NOBOT {ON|}"
 msgstr "SET kanaladý NOBOT {ON|OFF}"
 
-#: language.cpp:1790
-msgid "SET botname PRIVATE {ON|OFF}"
+#: modules/core/bs_set.cpp:56
+#, fuzzy
+msgid "SET botname PRIVATE {ON|}"
 msgstr "SET kanaladi PRIVATE {ON|OFF}"
 
-#: language.cpp:836
+#: include/language.h:75
 msgid "SET channel option parameters"
 msgstr "SET kanaladý özellik parametre"
 
-#: language.cpp:1760
-msgid "SET channel DONTKICKOPS {ON|OFF}"
+#: modules/core/bs_set.cpp:81
+#, fuzzy
+msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET kanaladý DONTKICKOPS {ON|OFF}"
 
-#: language.cpp:1766
-msgid "SET channel DONTKICKVOICES {ON|OFF}"
+#: modules/core/bs_set.cpp:96
+#, fuzzy
+msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET kanaladý DONTKICKVOICES {ON|OFF}"
 
-#: language.cpp:1772
-msgid "SET channel FANTASY {ON|OFF}"
+#: modules/core/bs_set.cpp:111
+#, fuzzy
+msgid "SET channel FANTASY {ON|}"
 msgstr "SET kanaladý FANTASY {ON|OFF}"
 
-#: language.cpp:1778
-msgid "SET channel GREET {ON|OFF}"
+#: modules/core/bs_set.cpp:126
+#, fuzzy
+msgid "SET channel GREET {ON|}"
 msgstr "SET kanaladý GREET {ON|OFF}"
 
-#: language.cpp:874
+#: modules/core/cs_set_keeptopic.cpp:59
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET kanaladý KEEPTOPIC {ON | OFF}"
 
-#: language.cpp:949
+#: modules/core/bs_set.cpp:191
+#, fuzzy
+msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
+msgstr "SET kanaladý OPNOTICE {ON | OFF}"
+
+#: modules/core/cs_saset_noexpire.cpp:56
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET kanaladý NOEXPIRE {ON | OFF}"
 
-#: language.cpp:931
+#: modules/core/cs_set_opnotice.cpp:58
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET kanaladý OPNOTICE {ON | OFF}"
 
-#: language.cpp:886
+#: modules/core/cs_set_peace.cpp:58
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET kanaladi PEACE {ON | OFF}"
 
-#: language.cpp:943
+#: modules/core/cs_set_persist.cpp:130
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: language.cpp:892
+#: modules/core/cs_set_private.cpp:57
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET kanaladý PRIVATE {ON | OFF}"
 
-#: language.cpp:910
+#: modules/core/cs_set_restricted.cpp:60
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET kanaladý RESTRICTED {ON | OFF}"
 
-#: language.cpp:916
+#: modules/core/cs_set_secure.cpp:59
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET kanal SECURE {ON | OFF}"
 
-#: language.cpp:904
+#: modules/core/cs_set_securefounder.cpp:66
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET kanaladý SECUREFOUNDER {ON | OFF}"
 
-#: language.cpp:898
+#: modules/core/cs_set_secureops.cpp:57
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET kanaladý SECUREOPS {ON | OFF}"
 
-#: language.cpp:922
+#: modules/core/cs_set_signkick.cpp:71
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET kanaladý SIGNKICK {ON | LEVEL | OFF}"
 
-#: language.cpp:1796
-msgid "SET channel SYMBIOSIS {ON|OFF}"
+#: modules/core/bs_set.cpp:158
+#, fuzzy
+msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET kanaladý SYMBIOSIS {ON|OFF}"
 
-#: language.cpp:880
+#: modules/core/cs_set_topiclock.cpp:58
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET kanaladý TOPICLOCK {ON | OFF}"
 
-#: language.cpp:937
+#: modules/core/cs_set_xop.cpp:112
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET kanaladi XOP {ON | OFF}"
 
-#: language.cpp:364
+#: include/language.h:52
 msgid "SET option parameters"
 msgstr "SET özellik parametre"
 
-#: language.cpp:2194
+#: modules/core/os_set.cpp:238
 msgid "SET option setting"
 msgstr "SET özellik ayar"
 
-#: language.cpp:398
+#: modules/core/ns_set_autoop.cpp:59
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: language.cpp:394
+#: modules/core/ns_set_hide.cpp:98
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: language.cpp:384
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: language.cpp:382
+#: modules/core/ns_set_kill.cpp:93
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: language.cpp:374
+#: modules/core/ns_set_language.cpp:76
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numara"
 
-#: language.cpp:1484
+#: modules/core/ms_set.cpp:149
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [kanaladý] limit"
 
-#: language.cpp:1486
+#: modules/core/ms_set.cpp:119
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [kullanýcý | kanaladý] {limit | NONE} [HARD]"
 
-#: language.cpp:396
+#: modules/core/ns_set_message.cpp:66
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:1468
+#: modules/core/ms_set.cpp:65
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: language.cpp:392
+#: modules/core/ns_set_private.cpp:62
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: language.cpp:390
+#: modules/core/ns_set_secure.cpp:64
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: language.cpp:5136
+#: modules/core/hs_setall.cpp:117
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: language.cpp:2131
+#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
+#: modules/core/os_snline.cpp:348
 msgid "SNLINE list is empty."
 msgstr "SNLINE listesi boþ."
 
-#: language.cpp:2115
+#: modules/core/os_snline.cpp:470
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -5115,338 +4798,325 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+zamanaþýmý] {mask | kayýt-"
 "sýrasý} [sebep]]"
 
-#: language.cpp:1051
+#: modules/core/cs_xop.cpp:654
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: language.cpp:1075
-#, c-format
-msgid ""
-"SOP list for %s:\n"
-"  Num  Nick"
-msgstr ""
-"%s kanali SOP listesi:\n"
-"  Num  Nick"
-
-#: language.cpp:2158
+#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
+#: modules/core/os_sqline.cpp:328
 msgid "SQLINE list is empty."
 msgstr "SQLINE listesi bos."
 
-#: language.cpp:2140
+#: modules/core/os_sqline.cpp:450
+#, fuzzy
 msgid ""
-"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+zaman asimi] {mask | kayit-"
 "sirasi} [sebep]]"
 
-#: language.cpp:1424
+#: modules/core/ms_staff.cpp:55
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: language.cpp:1230
+#: modules/core/cs_status.cpp:54
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: language.cpp:504
+#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
+#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
+#: modules/core/ns_status.cpp:47
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: language.cpp:1236
+#: modules/core/cs_status.cpp:31
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: language.cpp:1232
-#, c-format
-msgid "STATUS ERROR Channel %s not registered"
-msgstr "STATUS ERROR Channel %s not registered"
-
-#: language.cpp:1234
+#: modules/core/cs_status.cpp:33
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: language.cpp:1338
-msgid "SUSPEND channel reason"
+#: modules/core/cs_suspend.cpp:91
+#, fuzzy
+msgid "SUSPEND channel freason"
 msgstr "SUSPEND channel reason"
 
-#: language.cpp:1336
-msgid "SUSPEND channel [reason]"
-msgstr "SUSPEND channel [reason]"
+#: modules/core/cs_suspend.cpp:91
+msgid "SUSPEND channel reason"
+msgstr "SUSPEND channel reason"
 
-#: language.cpp:647
+#: modules/core/ns_suspend.cpp:98
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: language.cpp:2073
+#: modules/core/os_svsnick.cpp:78
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick newnick "
 
-#: language.cpp:2185
+#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
+#: modules/core/os_szline.cpp:330
 msgid "SZLINE list is empty."
 msgstr "SZLINE listesi boþ."
 
-#: language.cpp:2167
+#: modules/core/os_szline.cpp:450
+#, fuzzy
 msgid ""
-"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
-"[reason]]"
+"SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
+"list} [reason]]"
 msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+zamanaþýmý] {mask | kayýt-"
 "sýrasý} [sebep]]"
 
-#: language.cpp:1268
+#: modules/core/cs_info.cpp:88
 msgid "Secure"
 msgstr "Güvenlik"
 
-#: language.cpp:1272
+#: modules/core/cs_info.cpp:89
 msgid "Secure Founder"
 msgstr "Secure Founder"
 
-#: language.cpp:1270
+#: modules/core/cs_info.cpp:90
 msgid "Secure Ops"
 msgstr "Secure Ops"
 
-#: language.cpp:908
-#, c-format
-msgid "Secure founder option for %s is now OFF."
-msgstr "Secure founder option for %s is now OFF."
-
-#: language.cpp:906
-#, c-format
-msgid "Secure founder option for %s is now ON."
+#: modules/core/cs_set_securefounder.cpp:39
+#: modules/core/cs_set_securefounder.cpp:44
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now ."
 msgstr "Secure founder option for %s is now ON."
 
-#: language.cpp:902
-#, c-format
-msgid "Secure ops option for %s is now OFF."
-msgstr "Secure ops option for %s is now OFF."
-
-#: language.cpp:900
-#, c-format
-msgid "Secure ops option for %s is now ON."
+#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now ."
 msgstr "Secure ops option for %s is now ON."
 
-#: language.cpp:920
-#, c-format
-msgid "Secure option for %s is now OFF."
-msgstr "Secure option for %s is now OFF."
-
-#: language.cpp:918
-#, c-format
-msgid "Secure option for %s is now ON."
+#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#, fuzzy, c-format
+msgid "Secure option for %s is now ."
 msgstr "Secure option for %s is now ON."
 
-#: language.cpp:438
-#, c-format
-msgid "Secure option is now OFF for %s."
-msgstr "Secure option is now OFF for %s."
-
-#: language.cpp:436
-#, c-format
-msgid "Secure option is now ON for %s."
+#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#, fuzzy, c-format
+msgid "Secure option is now  for %s."
 msgstr "Secure option is now ON for %s."
 
-#: language.cpp:538
+#: modules/core/ns_info.cpp:123
 msgid "Security"
 msgstr "Güvenlik"
 
-#: language.cpp:2049
+#: modules/core/os_stats.cpp:191
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: language.cpp:2300
+#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
+#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
+#: modules/core/os_defcon.cpp:264
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "This service is temporarly disabled, please try again later"
 
-#: language.cpp:2302
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services are now at DEFCON %d"
 
-#: language.cpp:2218
+#: modules/core/os_set.cpp:158
 msgid "Services are now in expire mode."
 msgstr "Servisler þimdi expire modunda."
 
-#: language.cpp:2216
+#: modules/core/os_set.cpp:152
 msgid "Services are now in no expire mode."
 msgstr "Servisler þimdi no expire modunda."
 
-#: language.cpp:2202
+#: modules/core/os_set.cpp:50
 msgid "Services are now in read-only mode."
 msgstr "Servisler þimdi read-only modunda."
 
-#: language.cpp:2204
+#: modules/core/os_set.cpp:56
 msgid "Services are now in read-write mode."
 msgstr "Servisler þimdi read-write modunda."
 
-#: language.cpp:2212
+#: modules/core/os_set.cpp:129
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Servisler þimdi debug modunda (seviye %d)."
 
-#: language.cpp:2208
+#: modules/core/os_set.cpp:117
 msgid "Services are now in debug mode."
 msgstr "Servisler þimdi debug modunda."
 
-#: language.cpp:2210
+#: modules/core/os_set.cpp:123
 msgid "Services are now in non-debug mode."
 msgstr "Servisler þimdi non-debug modunda."
 
-#: language.cpp:212
+#: src/mail.cpp:46 src/mail.cpp:67
 msgid "Services have been configured to not send mail."
 msgstr "Servislerin mail gönderme özelliði devre dýþýdýr."
 
-#: language.cpp:2254
-msgid "Services ignore list:"
-msgstr "Servisler ignore listesi:"
-
-#: language.cpp:1925
+#: modules/core/os_ignore.cpp:193
 msgid ""
-"Services is unable to change modes.  Are your servers configured correctly?"
-msgstr "Servisler mod deðiþtiremiyor.  Serverin doðru ayarlandýðýna emin olun."
+"Services ignore list:\n"
+"  Mask        Creator      Reason      Expires"
+msgstr ""
 
-#: language.cpp:1927
+#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#, fuzzy
 msgid ""
-"Services is unable to change modes.  Are your servers' U:lines configured "
+"Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 "Servisler mod deðiþtiremiyor.  Serverin U:line larýnýn doðru ayarlandýðýna "
 "emin olun."
 
-#: language.cpp:1939
-#, c-format
-msgid "Services up %d day, %02d:%02d"
-msgstr "Servisler %d gündür çalýþýyor, %02d:%02d"
-
-#: language.cpp:1937
+#: modules/core/os_stats.cpp:137
 #, c-format
 msgid "Services up %d days, %02d:%02d"
 msgstr "Servisler %d gündür çalýþýyor, %02d:%02d"
 
-#: language.cpp:1947
+#: modules/core/os_stats.cpp:145
 #, c-format
-msgid "Services up %d hour, %d minute"
+msgid "Services up %d hours, %d minutes"
 msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
 
-#: language.cpp:1945
+#: modules/core/os_stats.cpp:161
 #, c-format
-msgid "Services up %d hour, %d minutes"
-msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
+msgid "Services up %d minutes, %d seconds"
+msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
 
-#: language.cpp:1943
+#: modules/core/os_stats.cpp:139
 #, c-format
-msgid "Services up %d hours, %d minute"
-msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
+"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgstr ""
 
-#: language.cpp:1941
+#: modules/core/os_stats.cpp:152
 #, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgstr ""
 
-#: language.cpp:1955
+#: modules/core/os_stats.cpp:168
 #, c-format
-msgid "Services up %d minute, %d second"
-msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+msgid ""
+"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
+"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+msgstr ""
 
-#: language.cpp:1953
+#: modules/core/os_stats.cpp:154
 #, c-format
-msgid "Services up %d minute, %d seconds"
-msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+msgid ""
+"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
+"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+msgstr ""
 
-#: language.cpp:1951
+#: modules/core/os_stats.cpp:170
 #, c-format
-msgid "Services up %d minutes, %d second"
-msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+msgid ""
+"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
+"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgstr ""
 
-#: language.cpp:1949
+#: modules/core/os_stats.cpp:147
 #, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+msgid ""
+"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
+"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+msgstr ""
 
-#: language.cpp:480
+#: modules/core/os_stats.cpp:163
+#, c-format
+msgid ""
+"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
+"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgstr ""
+
+#: modules/core/ns_set_autoop.cpp:40
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: language.cpp:478
+#: modules/core/ns_set_autoop.cpp:35
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: language.cpp:466
+#: modules/core/ns_set_message.cpp:41
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: language.cpp:468
+#: modules/core/ns_set_message.cpp:46
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: language.cpp:2242
+#: modules/core/os_reload.cpp:37
 msgid "Services' configuration file has been reloaded."
 msgstr "Servislerin conf dosyasý yeniden yüklendi."
 
-#: language.cpp:595
+#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
 msgid "Services' hold on your nick has been released."
 msgstr "Nickiniz serbest býrakýldý."
 
-#: language.cpp:2350
+#: modules/core/os_session.cpp:281
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "%s için session limit %d olarak deðiþtirildi."
 
-#: language.cpp:2348
+#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
 msgid "Session limiting is disabled."
 msgstr "Session limit koyma devre dýþý."
 
-#: language.cpp:1977
+#: modules/core/os_stats.cpp:225
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Oturumlar  : %6d kayýt, %5d kB"
 
-#: language.cpp:2389
+#: modules/core/os_session.cpp:135
 msgid "Sessions  Host"
 msgstr "Sessionlar  Host"
 
-#: language.cpp:1216
+#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#, fuzzy
 msgid ""
-"Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid "
-"settings."
+"Setting %s not known.  Type %R%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Varolmayan ayar: %s. Geçerli ayar listesi için /msg %s HELP LEVELS DESC "
 "yazýnýz."
 
-#: language.cpp:2214
-msgid "Setting for DEBUG must be ON, OFF, or a positive number."
+#: modules/core/os_set.cpp:132
+#, fuzzy
+msgid "Setting for DEBUG must be , , or a positive number."
 msgstr "DEBUG ayarý ON, OFF, veya pozitif bir sayý olmalýdýr."
 
-#: language.cpp:2200
-msgid "Setting for IGNORE must be ON or OFF."
-msgstr "IGNORE ayarý ON veya OFF þeklinde olmalýdýr."
-
-#: language.cpp:2220
-msgid "Setting for NOEXPIRE must be ON or OFF."
+#: modules/core/os_set.cpp:161
+#, fuzzy
+msgid "Setting for NOEXPIRE must be  or ."
 msgstr "NOEXPIRE ayarý ON yada OFF olmalýdýr."
 
-#: language.cpp:2206
-msgid "Setting for READONLY must be ON or OFF."
+#: modules/core/os_set.cpp:59
+#, fuzzy
+msgid "Setting for READONLY must be  or ."
 msgstr "READONLY ayarý ON veya OFF þeklinde olmalýdýr."
 
-#: language.cpp:2286
-msgid ""
-"Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"
+#: modules/core/os_set.cpp:97
+#, fuzzy
+msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
 msgstr "Setting for SuperAdmin must be ON or OFF."
 
-#: language.cpp:929
-#, c-format
-msgid "Signed kick option for %s is now OFF."
-msgstr "Signed kick option for %s is now OFF."
+#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now ."
+msgstr "Signed kick option for %s is now ON."
 
-#: language.cpp:926
+#: modules/core/cs_set_signkick.cpp:39
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5455,209 +5125,181 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: language.cpp:924
-#, c-format
-msgid "Signed kick option for %s is now ON."
-msgstr "Signed kick option for %s is now ON."
-
-#: language.cpp:1274
+#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
 msgid "Signed kicks"
 msgstr "Ýþaretli atma"
 
-#: language.cpp:1582
+#: modules/core/ms_rsend.cpp:53
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND has been disabled on this network."
 
-#: language.cpp:1659
+#: include/language.h:107
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Kanala bot sokma geçici olarak devre dýþý."
 
-#: language.cpp:1636
+#: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Bot yaratma baþarýsýz."
 
-#: language.cpp:1638
+#: modules/core/bs_bot.cpp:316
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Botta deðiþiklik yapma geçici olarak devre dýþý."
 
-#: language.cpp:1755
+#: modules/core/bs_set.cpp:34
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Bot özellik ayarý geçici olarak devre dýþý."
 
-#: language.cpp:995
-msgid "Sorry, channel AOP list modification is temporarily disabled."
+#: modules/core/cs_xop.cpp:127 modules/core/cs_xop.cpp:210
+#: modules/core/cs_xop.cpp:329
+#, fuzzy, c-format
+msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Kanal AOP listesi degisiklikleri geçici olarak devre disidir."
 
-#: language.cpp:1024
-msgid "Sorry, channel HOP list modification is temporarily disabled."
-msgstr "Kanal HOP listesi degisiklikleri geçici olarak devre disidir."
-
-#: language.cpp:966
-msgid "Sorry, channel QOP list modification is temporarily disabled."
-msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#: language.cpp:1053
-msgid "Sorry, channel SOP list modification is temporarily disabled."
-msgstr "Kanal SOP listesi degisikligi geçici olarak devre disidir."
-
-#: language.cpp:1082
-msgid "Sorry, channel VOP list modification is temporarily disabled."
-msgstr "Kanal VOP listesi degisikligi geçici olarak devre disidir."
-
-#: language.cpp:1119
+#: modules/core/cs_access.cpp:437
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Kanal access listesinin deðiþtirilmesi geçici olarak devre dýþýdýr."
 
-#: language.cpp:1166
+#: modules/core/cs_akick.cpp:494
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Kanal Akick listesinin deðiþtirilmesi geçici olarak devre dýþýdýr."
 
-#: language.cpp:1882
+#: modules/core/bs_badwords.cpp:254
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Kanalýn küfür listesinde deðiþiklik yapma geçici olarak devre dýþýdýr."
 
-#: language.cpp:806
+#: modules/core/cs_drop.cpp:34
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Kanal kaydýnýn silinmesi(DROP) geçici olarak devre dýþýdýr."
 
-#: language.cpp:838
+#: include/language.h:76
 msgid "Sorry, channel option setting is temporarily disabled."
 msgstr "Chanserv'ün SET komutu geçici olarak devre dýþýdýr."
 
-#: language.cpp:786
+#: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Kanal kaydý geçici olarak devre dýþýdýr."
 
-#: language.cpp:408
+#: include/language.h:58
 #, c-format
 msgid "Sorry, couldn't change password for %s."
 msgstr "Sorry, couldn't change password for %s."
 
-#: language.cpp:312
-msgid "Sorry, grouping failed."
-msgstr "Nick gruplama baþarýsýz."
-
-#: language.cpp:334
+#: modules/core/ns_identify.cpp:61
 msgid "Sorry, identification failed."
 msgstr "Tanýmlama baþarýsýz."
 
-#: language.cpp:1804
+#: modules/core/bs_kick.cpp:35
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Atma ayarlarý geçici olarak devre dýþý."
 
-#: language.cpp:1466
+#: modules/core/ms_set.cpp:215
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "MemoServ'ün SET komutu geçici olarak devre dýþýdýr."
 
-#: language.cpp:1412
+#: include/language.h:100
 msgid "Sorry, memo sending is temporarily disabled."
 msgstr "Mesaj yollama geçici olarak devre dýþýdýr."
 
-#: language.cpp:358
+#: modules/core/ns_drop.cpp:31
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Nick kaydý silinmesi geçici olarak devre dýþýdýr."
 
-#: language.cpp:310
+#: modules/core/ns_group.cpp:39
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Nick gruplama geçici olarak devre dýþý."
 
-#: language.cpp:366
+#: include/language.h:53
 msgid "Sorry, nickname option setting is temporarily disabled."
 msgstr "NickServ'ün SET komutu geçici olarak devre dýþýdýr."
 
-#: language.cpp:290
+#: modules/core/ns_register.cpp:206
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Nick kaydý geçici olarak devre dýþýdýr."
 
-#: language.cpp:292
+#: modules/core/ns_register.cpp:126
 msgid "Sorry, registration failed."
 msgstr "Nick kaydý baþarýsýz."
 
-#: language.cpp:955
-#, c-format
-msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-msgstr "Bir kanala toplam %d AOP/SOP/VOP kayit edilebilir."
+#: modules/core/cs_xop.cpp:165
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d %s entries on a channel."
+msgstr "Kanalda sadece %d tane access kaydý olabilir."
 
-#: language.cpp:488
+#: modules/core/ns_access.cpp:59
 #, c-format
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Bir nick için sadece %d tane access girilebilir."
 
-#: language.cpp:1127
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Kanalda sadece %d tane access kaydý olabilir."
 
-#: language.cpp:1170
+#: modules/core/cs_akick.cpp:267
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Bir kanalýn akick listesinde en fazla %d kiþi olabilir."
 
-#: language.cpp:1884
+#: modules/core/bs_badwords.cpp:155
 #, c-format
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Bir kanalda sadece %d tane küfür kaydý olabilir."
 
-#: language.cpp:798
+#: include/language.h:72
 #, c-format
 msgid "Sorry, you have already exceeded your limit of %d channels."
 msgstr "%d kanallýk limitinizi aþtýnýz."
 
-#: language.cpp:796
+#: include/language.h:71
 #, c-format
 msgid "Sorry, you have already reached your limit of %d channels."
 msgstr "%d kanallýk limitinizi doldurdunuz."
 
-#: language.cpp:2043
+#: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Ýstatistikler resetlendi."
 
-#: language.cpp:348
+#: modules/core/ns_update.cpp:38
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status updated (memos, vhost, chmodes, flags)."
 
-#: language.cpp:1620
+#: src/botserv.cpp:284
 msgid "Stop flooding!"
 msgstr "Flood yapma!"
 
-#: language.cpp:1622
+#: src/botserv.cpp:311
 msgid "Stop repeating yourself!"
 msgstr "Kendini tekrar etme!"
 
-#: language.cpp:850
+#: modules/core/cs_set_successor.cpp:69
 #, c-format
 msgid "Successor for %s unset."
 msgstr "%s için successor kaldýrýldý."
 
-#: language.cpp:848
+#: modules/core/cs_set_successor.cpp:67
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "%s için successor %s olarak deðiþtirildi."
 
-#: language.cpp:5227
+#: modules/core/os_set.cpp:81
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: language.cpp:1749
+#: modules/core/bs_info.cpp:211
 msgid "Symbiosis"
 msgstr "Gerçek bot"
 
-#: language.cpp:1800
-#, c-format
-msgid "Symbiosis mode is now OFF on channel %s."
-msgstr "Gerçek bot modu %s kanalýnda KAPALI."
-
-#: language.cpp:1798
-#, c-format
-msgid "Symbiosis mode is now ON on channel %s."
+#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#, fuzzy, c-format
+msgid "Symbiosis mode is now  on channel %s."
 msgstr "Gerçek bot modu %s kanalýnda AKTÝF."
 
-#: language.cpp:149
+#: src/language.cpp:129
 #, c-format
 msgid "Syntax: %s"
 msgstr "Kullanýmý: %s"
 
-#: language.cpp:3461
+#: modules/core/cs_set_bantype.cpp:46
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5684,7 +5326,7 @@ msgstr ""
 "2: *!*@host formatýnda ban için\n"
 "3: *!*user@*.domain formatýnda ban için"
 
-#: language.cpp:3450
+#: modules/core/cs_set_description.cpp:38
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5697,27 +5339,12 @@ msgstr ""
 "LIST ve INFO komutlarý kullanýldýðýnda gözükecek kanal \n"
 "açýklamasýný belirler."
 
-#: language.cpp:3455
-#, c-format
-msgid ""
-"Syntax: %s channel ENTRYMSG [message]\n"
-" \n"
-"Sets the message which will be sent via /notice to users\n"
-"when they enter the channel.  If no parameter is given,\n"
-"causes no message to be sent upon entering the channel."
-msgstr ""
-"Kullanýmý: %s kanaladý ENTRYMSG [mesaj]\n"
-"\n"
-"Kanala giren kullanýcýlara notice þeklinde gönderilecek\n"
-"mesajý belirler.  Eðer mesaj parametresi belirtilmezse\n"
-"giren kullanýcýya bir mesaj gönderilmez."
-
-#: language.cpp:3435
-#, c-format
+#: modules/core/cs_set_founder.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
 " \n"
-"Changes the founder of a channel.  The new nickname must\n"
+"Changes the founder of a channel. The new nickname must\n"
 "be a registered one."
 msgstr ""
 "Kullanýmý: %s kanaladý FOUNDER nick\n"
@@ -5725,7 +5352,7 @@ msgstr ""
 "Kanal founderýný deðiþtirir.  Yeni nickin kayýtlý \n"
 "olmasý gereklidir."
 
-#: language.cpp:3473
+#: modules/core/cs_set_keeptopic.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5743,71 +5370,7 @@ msgstr ""
 "%S tarafýndan hatýrlanýr ve birisi kanala girdiðinde bu\n"
 "topic geçerli olur."
 
-#: language.cpp:3488
-#, c-format
-msgid ""
-"Syntax: %s channel MLOCK modes\n"
-" \n"
-"Sets the mode-lock parameter for the channel. %S\n"
-"allows you to define certain channel modes to be always\n"
-"on, off or free to be either on or off.\n"
-" \n"
-"The modes parameter is constructed exactly the same way \n"
-"as a /MODE command; that is, modes followed by a + are \n"
-"locked on, and modes followed by a - are locked off. Note,\n"
-"however, that unlike the /MODE command, each use of\n"
-"SET MLOCK will remove all modes previously locked before\n"
-"setting the new!\n"
-" \n"
-"Warning:  If you set a mode-locked key, as in the second\n"
-"example below, you should also set the RESTRICTED option for\n"
-"the channel (see HELP SET RESTRICTED), or anyone entering\n"
-"the channel when it is empty will be able to see the key!\n"
-" \n"
-"Examples:\n"
-" \n"
-"    SET #channel MLOCK +nt-iklps\n"
-"        Forces modes n and t on, and modes i, k, l, p, and\n"
-"        s off.  Mode m is left free to be either on or off.\n"
-" \n"
-"    SET #channel MLOCK +knst-ilmp my-key\n"
-"        Forces modes k, n, s, and t on, and modes i, l, m,\n"
-"        and p off.  Also forces the channel key to be\n"
-"        \"my-key\".\n"
-" \n"
-"    SET #channel MLOCK +\n"
-"        Removes the mode lock; all channel modes are free\n"
-"        to be either on or off."
-msgstr ""
-"Kullanýmý: %s kanaladý MLOCK modlar\n"
-"\n"
-"Bir kanal için mod-kilidini aktifleþtirir. %S belirlediðiniz\n"
-"modlarýn her zaman açýk yada kapalý olacaðýný ayarlar.\n"
-"+ ile belirtilen modlar açik olarak, - ile belirtilen modlar\n"
-"kapali olarak kitlenir.\n"
-"\n"
-"Dikkat:  Eðer ikinci örnekteki gibi bir mod kilidi koyarsanýz,\n"
-"kanalýn RESTRICTED özelliðinide aktifleþtirmeniz gerekir\n"
-"(HELP SET RESTRICTED e bakýn), yoksa kanal boþken ilk\n"
-"giren kiþi kanal key ini(anahtar) görebilir!\n"
-"\n"
-"Örnekler:\n"
-"\n"
-"    SET #kanaladý MLOCK +nt-iklps\n"
-"        n ve t modlarýný hep açýk, i, k, l, p, ve s modlarýný hep\n"
-"        açýk olarak ayarlar. m modu ise istenildiði gibi ayarlanabilir\n"
-"        açýk yada kapalý.\n"
-"\n"
-"    SET #kanaladý MLOCK +knst-ilmp anahtar\n"
-"        k, n, s, ve t modlarý hep açýk, ve i, l, m, ve p modlarý\n"
-"        hep kapalý. Ayrýca kanal anahtarýný belirler ve hep o \n"
-"        anahtar olmasýný saðlar.\n"
-"\n"
-"    SET #kanaladý MLOCK +\n"
-"        Mod kilidini kaldýrýr; ve tüm kanal modlarýný açýlýp \n"
-"        kapanacak þekilde serbest býrakýr."
-
-#: language.cpp:3615
+#: modules/core/cs_set_opnotice.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5824,7 +5387,7 @@ msgstr ""
 "üzerinde OP veya DEOP komutlarýnýn kullanýldýðýný\n"
 "belirten bir mesaj gönderir."
 
-#: language.cpp:3521
+#: modules/core/cs_set_peace.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5841,7 +5404,7 @@ msgstr ""
 "yüksek veya esit olanlari atamaz, banlayamaz veya %S\n"
 "seviyesini degistiremez."
 
-#: language.cpp:3594
+#: modules/core/cs_set_persist.cpp:105
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5886,7 +5449,7 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: language.cpp:3528
+#: modules/core/cs_set_private.cpp:47
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5899,13 +5462,13 @@ msgstr ""
 "Bir kanal için private özelliðini açar kapatýr. private özelliði\n"
 "aktifse, /msg %S LIST komutuyla kanal listelenemez."
 
-#: language.cpp:3534
-#, c-format
+#: modules/core/cs_set_restricted.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
 " \n"
 "Enables or disables the restricted access option for a\n"
-"channel.  When restricted access is set, users not on the access list will\n"
+"channel. When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 msgstr ""
 "Kullanýmý: %s kanaladý RESTRICTED {ON | OFF}\n"
@@ -5914,7 +5477,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: language.cpp:3540
+#: modules/core/cs_set_secure.cpp:47
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5933,7 +5496,7 @@ msgstr ""
 "alabilirler ve access listesindeki statülerini\n"
 "alabilirler.(mesela op olabilirler)"
 
-#: language.cpp:3554
+#: modules/core/cs_set_securefounder.cpp:54
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5953,52 +5516,12 @@ msgstr ""
 "þifresiyle kendilerini %S'e kanal founderý olarak tanýtan \n"
 "ama nicki founderýn nicki olmayanlar bu komutlarý kullanamazlar."
 
-#: language.cpp:3548
-#, c-format
-msgid ""
-"Syntax: %s channel SECUREOPS {ON | OFF}\n"
-" \n"
-"Enables or disables the secure ops option for a channel.\n"
-"When secure ops is set, users who are not on the userlist\n"
-"will not be allowed chanop status."
-msgstr ""
-"Kullanýmý: %s kanaladý SECUREOPS {ON | OFF}\n"
-"\n"
-"Bir kanal için güvenli op özelliðini açar veya kapatýr.\n"
-"güvenli op özelliði aktifse, access listesinde olmayan\n"
-"kullanýcýlar kanalda op olamazlar."
-
-#: language.cpp:3562
-msgid ""
-"Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-" \n"
-"Enables or disables signed kicks for a\n"
-"channel.  When SIGNKICK is set, kicks issued with\n"
-"%S KICK command will have the nick that used the\n"
-"command in their reason.\n"
-" \n"
-"If you use LEVEL, those who have a level that is superior \n"
-"or equal to the SIGNKICK level on the channel won't have their \n"
-"kicks signed. See %R%S HELP LEVELS for more information."
-msgstr ""
-"Kullanýmý: %s kanaladý SIGNKICK {ON | LEVEL | OFF}\n"
-"\n"
-"Bir kanal için iþaretli atmayý açar yada kapatýr.\n"
-"SIGNKICK ayarlandýðý zaman, %S KICK\n"
-"komutuyla yapýlan atmalarda komutu kullanan kiþinin\n"
-"nicki atma sebebinde yer alýr.\n"
-"\n"
-"Eðer LEVEL parametresini kullanýrsanýz, seviyesi\n"
-"SIGNKICK seviyesine eþit yada fazla olanlarýn yaptýðý\n"
-"atmalarda atanýn nicki sebepte gözükmez. Daha fazla\n"
-"bilgi için /msg %S HELP LEVELS yazýn."
-
-#: language.cpp:3440
-#, c-format
+#: modules/core/cs_set_successor.cpp:76
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
 " \n"
-"Changes the successor of a channel.  If the founder's\n"
+"Changes the successor of a channel. If the founder's\n"
 "nickname expires or is dropped while the channel is still\n"
 "registered, the successor will become the new founder of the\n"
 "channel.  However, if the successor already has too many\n"
@@ -6016,23 +5539,7 @@ msgstr ""
 "için bir successor belirtilmemiþse kanalýn kaydý silinir(drop).\n"
 "Komutta belirtilen nickin kayýtlý olmasý gereklidir."
 
-#: language.cpp:3481
-#, c-format
-msgid ""
-"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %S will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Kullanýmý: %s kanaladý TOPICLOCK {ON | OFF}\n"
-"\n"
-"Bir kanal için topic kilidini aktifleþtirir yada kapatýr.\n"
-"topic kilidi aktifse, %S SET TOPIC komutunun\n"
-"dýþýnda kanal topic inin deðiþtirilmesine izin vermez."
-
-#: language.cpp:3573
+#: modules/core/cs_set_xop.cpp:87
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -6078,10 +5585,11 @@ msgstr ""
 "Bunlarin disinda xOP sisteminden access sistemine geçmek\n"
 "bir problem çikarmaz."
 
-#: language.cpp:3810
+#: modules/core/cs_access.cpp:456
+#, fuzzy
 msgid ""
-"Syntax: ACCESS channel ADD nick level\n"
-"        ACCESS channel DEL {nick | entry-num | list}\n"
+"Syntax: ACCESS channel ADD mask level\n"
+"        ACCESS channel DEL {mask | entry-num | list}\n"
 "        ACCESS channel LIST [mask | list]\n"
 "        ACCESS channel VIEW [mask | list]\n"
 "        ACCESS channel CLEAR\n"
@@ -6094,18 +5602,22 @@ msgid ""
 "specific information.  Any nick not on the access list has\n"
 "a user level of 0.\n"
 " \n"
-"The ACCESS ADD command adds the given nickname to the\n"
-"access list with the given user level; if the nick is\n"
+"The ACCESS ADD command adds the given mask to the\n"
+"access list with the given user level; if the mask is\n"
 "already present on the list, its access level is changed to\n"
 "the level specified in the command.  The level specified\n"
 "must be less than that of the user giving the command, and\n"
-"if the nick is already on the access list, the current\n"
+"if the mask is already on the access list, the current\n"
 "access level of that nick must be less than the access level\n"
-"of the user giving the command.\n"
+"of the user giving the command. When a user joins the channel\n"
+"the access they receive is from the highest level entry in the\n"
+"access list.\n"
 " \n"
 "The ACCESS DEL command removes the given nick from the\n"
 "access list.  If a list of entry numbers is given, those\n"
 "entries are deleted.  (See the example for LIST below.)\n"
+"You may remove yourself from an access list, even if you\n"
+"do not have access to modify that list otherwise.\n"
 " \n"
 "The ACCESS LIST command displays the access list.  If\n"
 "a wildcard mask is given, only those entries matching the\n"
@@ -6159,7 +5671,7 @@ msgstr ""
 "\n"
 "ACCESS CLEAR komutu tüm access listesini temizler."
 
-#: language.cpp:2765
+#: modules/core/ns_access.cpp:153
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -6210,7 +5722,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mevcut access listesini görüntüler."
 
-#: language.cpp:5066
+#: modules/core/bs_act.cpp:67
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -6222,12 +5734,18 @@ msgstr ""
 "Botun belirtilen yazýyla belirtilen kanalda \"/me\" komutunun \n"
 "yaptýðýný kendi üzerinde yapmasýný saðlar."
 
-#: language.cpp:3871
-#, c-format
+#: modules/core/ns_ajoin.cpp:96
+msgid ""
+"Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
+" \n"
+"This command manages your auto join list. When you identify\n"
+"you will automatically join the channels on your auto join list"
+msgstr ""
+
+#: modules/core/cs_akick.cpp:515
+#, fuzzy, c-format
 msgid ""
 "Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-"        AKICK channel STICK mask\n"
-"        AKICK channel UNSTICK mask\n"
 "        AKICK channel DEL {nick | mask | entry-num | list}\n"
 "        AKICK channel LIST [mask | entry-num | list]\n"
 "        AKICK channel VIEW [mask | entry-num | list]\n"
@@ -6248,15 +5766,6 @@ msgid ""
 "will be added to the akick list instead of the mask.\n"
 "All users within that nickgroup will then be akicked.\n"
 " \n"
-"The AKICK STICK command permanently bans the given mask \n"
-"on the channel. If someone tries to remove the ban, %S\n"
-"will automatically set it again. You can't use it for\n"
-"registered nicks.\n"
-" \n"
-"The AKICK UNSTICK command cancels the effect of the\n"
-"AKICK STICK command, so you'll be able to unset the\n"
-"ban again on the channel.\n"
-" \n"
 "The AKICK DEL command removes the given nick or mask\n"
 "from the AutoKick list.  It does not, however, remove any\n"
 "bans placed by an AutoKick; those must be removed\n"
@@ -6320,7 +5829,8 @@ msgstr ""
 "AKICK CLEAR komutu akick listesinde bulunan tüm kayýtlarý\n"
 "siler."
 
-#: language.cpp:4498
+#: modules/core/os_akill.cpp:407
+#, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -6328,21 +5838,21 @@ msgid ""
 "        AKILL VIEW [mask | list]\n"
 "        AKILL CLEAR\n"
 " \n"
-"Allows Services operators to manipulate the AKILL list.  If\n"
+"Allows Services operators to manipulate the AKILL list. If\n"
 "a user matching an AKILL mask attempts to connect, Services\n"
 "will issue a KILL for that user and, on supported server\n"
 "types, will instruct all servers to add a ban (K-line) for\n"
 "the mask which the user matched.\n"
 " \n"
-"AKILL ADD adds the given user@host/ip mask to the AKILL\n"
+"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an AKILL which does not expire, use +0.  If the\n"
+"days). To add an AKILL which does not expire, use +0. If the\n"
 "usermask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current AKILL default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
@@ -6405,7 +5915,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3096
+#: modules/core/ns_alist.cpp:139
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6444,7 +5954,7 @@ msgstr ""
 "Channels that have the NOEXPIRE option set will be prefixed by \n"
 "an exclamation mark."
 
-#: language.cpp:3223
+#: modules/core/ns_alist.cpp:131
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6461,10 +5971,11 @@ msgstr ""
 "on. With two parameters lists channels that nickname has \n"
 "level access or greater on."
 
-#: language.cpp:3659
+#: modules/core/cs_xop.cpp:481
+#, fuzzy
 msgid ""
-"Syntax: AOP channel ADD nick\n"
-"        AOP channel DEL {nick | entry-num | list}\n"
+"Syntax: AOP channel ADD mask\n"
+"        AOP channel DEL {mask | entry-num | list}\n"
 "        AOP channel LIST [mask | list]\n"
 "        AOP channel CLEAR\n"
 " \n"
@@ -6538,7 +6049,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %S HELP SET XOP yazarak ulasabilirsiniz."
 
-#: language.cpp:4852
+#: modules/core/bs_assign.cpp:71
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6552,7 +6063,8 @@ msgstr ""
 "sonra botun ayarlarýný ihtiyaçlarýnýza uygun þekilde \n"
 "yapabilirsiniz."
 
-#: language.cpp:5028
+#: modules/core/bs_badwords.cpp:274
+#, fuzzy
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6584,7 +6096,7 @@ msgid ""
 "   BADWORDS #channel LIST 2-5,7-9\n"
 "      Lists bad words entries numbered 2 through 5 and\n"
 "      7 through 9.\n"
-"      \n"
+" \n"
 "The BADWORDS CLEAR command clears all entries of the\n"
 "bad words list."
 msgstr ""
@@ -6622,7 +6134,7 @@ msgstr ""
 "      \n"
 "BADWORDS CLEAR komutu tüm küfür listesini temizler."
 
-#: language.cpp:4070
+#: modules/core/cs_ban.cpp:79
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6638,7 +6150,7 @@ msgstr ""
 "Varsayilan olarak, AOP larin veya 5. seviyeden access i olanlarin\n"
 "ve üstünün kullanma yetkisi vardir."
 
-#: language.cpp:5071
+#: modules/core/bs_bot.cpp:385
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6678,7 +6190,7 @@ msgstr ""
 "kullanýrsanýz o nickin kaydý silinir(drop). Ayrýca\n"
 "o an bir kuulanýcý bu nicki kullanýyorsa kill lenir."
 
-#: language.cpp:4848
+#: modules/core/bs_botlist.cpp:68
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6688,7 +6200,7 @@ msgstr ""
 "\n"
 "Networkte mevcut olan tüm botlarý listeler."
 
-#: language.cpp:4203
+#: modules/core/ms_cancel.cpp:59
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6700,7 +6212,7 @@ msgstr ""
 "Belirtilen kanala yada nicke gönderilen son mesajý iptal eder,\n"
 "tabi eðer o mesaj siz komutu kullandýðýnýz sýrada okunmamýþsa."
 
-#: language.cpp:2477
+#: modules/core/os_chankill.cpp:90
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6712,7 +6224,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: language.cpp:4776
+#: modules/core/os_chanlist.cpp:79
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6735,7 +6247,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4334
+#: modules/core/ms_check.cpp:71
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6747,71 +6259,32 @@ msgstr ""
 "Checks whether the _last_ memo you sent to nick has been read\n"
 "or not. Note that this does only work with nicks, not with chans."
 
-#: language.cpp:4088
-#, c-format
+#: modules/core/cs_clearusers.cpp:54
+#, fuzzy, c-format
 msgid ""
-"Syntax: CLEAR channel what\n"
-" \n"
-"Tells %S to clear certain settings on a channel.  what\n"
-"can be any of the following:\n"
-" \n"
-"     MODES    Resets all modes on the channel (i.e. clears\n"
-"                  modes i,k,l,m,n,p,s,t).\n"
-"     BANS     Clears all bans on the channel.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Removes channel-operator status (mode +o) from\n"
-"                  all channel operators. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Removes \"voice\" status (mode +v) from anyone\n"
-"                  with that mode set.\n"
-"     USERS    Removes (kicks) all users from the channel.\n"
+"Syntax: CLEARUSERS channel\n"
 " \n"
+"Tells %S to clear (kick) all users certain settings on a channel. \n"
 "By default, limited to those with founder access on the\n"
 "channel."
 msgstr ""
-"Kullanýmý: CLEAR kanaladý neyi\n"
-"\n"
-"%S'e belirtilen ayarý kaldýrmasýný söyler. neyi\n"
-"þunlardan biri olmalýdýr:\n"
+"Kullanýmý: DEOWNER #kanaladi\n"
 "\n"
-"     MODES    Kanal modlarýný temizler. (ör. i,k,l,m,n,p,s,t\n"
-"                   modlarýný temizler).\n"
-"     BANS     Kanaldaki tüm banlarý kaldýrýr.\n"
-"     EXCEPTS  Clears all excepts on the channel.\n"
-"     INVITES  Clears all invites on the channel.\n"
-"     OPS      Kanal opu statüsünde olanlarýn (mode +o)\n"
-"                  oplarýný alýr. If supported, removes\n"
-"                  channel-admin (mode +a) and channel-owner (mode +q)\n"
-"                  as well.\n"
-"     HOPS     Removes channel-halfoperator status (mode +h) from\n"
-"                  all channel halfoperators, if supported.\n"
-"     VOICES   Voice statüsünde olanlarýn (mode +v) voice larýný\n"
-"                  alýr.\n"
-"     USERS    Tüm kullanýcýlarý kanaldan atar.\n"
+"Belirtilen kanaldaki owner statünüzü kaldirir.\n"
 "\n"
-"Varsayýlan olarak, founder tarafindan kullanilabilir."
+"Belirtilen kanal founderlarinin kullanma yetkisi vardir."
 
-#: language.cpp:4479
+#: modules/core/cs_clone.cpp:154
 msgid ""
-"Syntax: CLEARMODES channel [ALL]\n"
+"Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
-"Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a\n"
-"channel.  If ALL is given, also clears all ops and\n"
-"voices (+o and +v modes) from the channel."
+"Copies all settings, access, akicks, etc from channel to the\n"
+"target channel. If access, akick, or badwords is specified then only\n"
+"the respective settings are transferred. You must have founder level\n"
+"access to channel and target."
 msgstr ""
-"Kullanýmý: CLEARMODES kanaladý [ALL]\n"
-"\n"
-"Bir kanaldaki tüm modlarý (i,k,l,m,n,p,s,t) ve banlarý\n"
-"temizler. Eðer ALL parametresi belirtilmiþse, tüm\n"
-"oplarý (+o) ve voicelarý (+v) temizler.\n"
-"\n"
-"Servis operatörlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3151
+#: modules/core/ns_register.cpp:148
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
@@ -6837,7 +6310,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: language.cpp:2452
+#: modules/core/os_defcon.cpp:118
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6849,12 +6322,14 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: language.cpp:4011
+#: modules/core/cs_modes.cpp:302
+#, fuzzy
 msgid ""
-"Syntax: DEHALFOP #channel [nick]\n"
+"Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
 "Dehalfops a selected nick on a channel. If nick is not given,\n"
-"it will dehalfop you.\n"
+"it will dehalfop you. If channel is not given, it will dehalfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
@@ -6869,7 +6344,7 @@ msgstr ""
 "olanlar kullanabilir, ayrica HOP lar veya access seviyesi\n"
 "4 ve üzeri olanlar kendi halfoplarýný alabilirler."
 
-#: language.cpp:5206
+#: modules/core/hs_del.cpp:48
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6879,11 +6354,12 @@ msgstr ""
 "Deletes the vhost assigned to the given nick from the\n"
 "database."
 
-#: language.cpp:4228
+#: modules/core/ms_del.cpp:127
+#, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
-"Deletes the specified memo or memos.  You can supply\n"
+"Deletes the specified memo or memos. You can supply\n"
 "multiple memo numbers or ranges of numbers instead of a\n"
 "single number, as in the second example below.\n"
 " \n"
@@ -6914,22 +6390,25 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      2'den 5'e ve 7'den 9'a kadar olan mesajlarý siler."
 
-#: language.cpp:5189
+#: modules/core/hs_delall.cpp:53
+#, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
-"Deletes the vhost for all nick's in the same group as\n"
+"Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 "Syntax: DELALL <nick>.\n"
 "Deletes the vhost for all nick's in the same group as\n"
 "that of the given nick."
 
-#: language.cpp:3976
+#: modules/core/cs_modes.cpp:142
+#, fuzzy
 msgid ""
-"Syntax: DEOP #channel [nick]\n"
+"Syntax: DEOP [#channel] [nick]\n"
 " \n"
 "Deops a selected nick on a channel. If nick is not given,\n"
-"it will deop you.\n"
+"it will deop you. If channel is not given, it will deop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -6942,29 +6421,35 @@ msgstr ""
 "Varsayýlan olarak, AOP lar veya access seviyesi 5 ve üzeri\n"
 "olanlar kullanabilir."
 
-#: language.cpp:4042
+#: modules/core/cs_modes.cpp:465
+#, fuzzy
 msgid ""
-"Syntax: DEOWNER #channel\n"
+"Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
-"Removes your owner status on channel.\n"
+"Removes owner status from the selected nick on channel. If nick\n"
+"is not given, it will deowner you. If channel is not given, it will\n"
+"deowner you on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Kullanýmý: DEOWNER #kanaladi\n"
+"Kullanýmý: DEOP #kanaladý [nick]\n"
 "\n"
-"Belirtilen kanaldaki owner statünüzü kaldirir.\n"
+"Belirtilen nicki kanalda deoplar. Eðer nick belirtilmemiþse,\n"
+"kendinizi deoplarsýnýz.\n"
 "\n"
-"Belirtilen kanal founderlarinin kullanma yetkisi vardir."
+"Varsayýlan olarak, AOP lar veya access seviyesi 5 ve üzeri\n"
+"olanlar kullanabilir."
 
-#: language.cpp:4028
+#: modules/core/cs_modes.cpp:385
+#, fuzzy
 msgid ""
-"Syntax: DEPROTECT #channel [nick]\n"
+"Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
 "Deprotects a selected nick on a channel. If nick is not given,\n"
-"it will deprotect you.\n"
+"it will deprotect you. If channel is not given, it will deprotect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
-"level 10 and above on the channel for self deprotecting."
 msgstr ""
 "Kullanýmý: DEPROTECT #kanaladý [nick]\n"
 "\n"
@@ -6974,12 +6459,14 @@ msgstr ""
 "Varsayýlan olarak, founder kullanabilir, veya SOP lar ile\n"
 "access seviyesi 10 ve üzeri olanlar kendilerinde kullanabilir."
 
-#: language.cpp:3993
+#: modules/core/cs_modes.cpp:219
+#, fuzzy
 msgid ""
-"Syntax: DEVOICE #channel [nick]\n"
+"Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
 "Devoices a selected nick on a channel. If nick is not given,\n"
-"it will devoice you.\n"
+"it will devoice you. If channel is not given, it will devoice\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -6994,7 +6481,7 @@ msgstr ""
 "kullanabilir, veya VOP lar ile access seviyesi 3 ve üzeri olanlar\n"
 "kendilerini devoice etmek için kullanabilirler."
 
-#: language.cpp:3371
+#: modules/core/cs_drop.cpp:90
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7005,7 +6492,7 @@ msgstr ""
 "\n"
 "Kanalýn kaydýný siler."
 
-#: language.cpp:4120
+#: modules/core/cs_drop.cpp:85
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -7017,9 +6504,10 @@ msgstr ""
 "Belirtilen kanalýn kaydýný siler. Sadece Servis adminleri\n"
 "kanalý tanýtmadan kaydýný silebilirler."
 
-#: language.cpp:2753
+#: modules/core/ns_drop.cpp:131
+#, fuzzy
 msgid ""
-"Syntax: DROP [nickname]\n"
+"Syntax: DROP [nickname | password]\n"
 " \n"
 "Drops your nickname from the %S database.  A nick\n"
 "that has been dropped is free for anyone to re-register.\n"
@@ -7027,6 +6515,10 @@ msgid ""
 "You may drop a nick within your group by passing it\n"
 "as the nick parameter.\n"
 " \n"
+"If you have a nickname registration pending but can not confirm\n"
+"it for any reason, you can cancel your registration by passing\n"
+"your password as the password parameter.\n"
+" \n"
 "In order to use this command, you must first identify\n"
 "with your password (%R%S HELP IDENTIFY for more\n"
 "information)."
@@ -7042,7 +6534,7 @@ msgstr ""
 "gereklidir (Daha fazla bilgi için /msg %S HELP IDENTIFY \n"
 "yazýn)."
 
-#: language.cpp:3187
+#: modules/core/ns_drop.cpp:121
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -7064,8 +6556,8 @@ msgstr ""
 "gerek olmadan silebilirsiniz. Bu iþlemler Servis adminleri \n"
 "tarafýndan yapýlabilir."
 
-#: language.cpp:2395
-#, c-format
+#: modules/core/os_session.cpp:456
+#, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
 "        EXCEPTION DEL {mask | list}\n"
@@ -7076,7 +6568,7 @@ msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
 "have specific session limits - allowing certain machines, \n"
 "such as shell servers, to carry more than the default number\n"
-"of clients at a time. Once a host reaches it's session limit,\n"
+"of clients at a time. Once a host reaches its session limit,\n"
 "all clients attempting to connect from that host will be\n"
 "killed. Before the user is killed, they are notified, via a\n"
 "/NOTICE from %S, of a source of help regarding session\n"
@@ -7098,7 +6590,7 @@ msgid ""
 "exceptions; if the optional mask is given, the list is limited\n"
 "to those exceptions matching the mask. The difference is that\n"
 "EXCEPTION VIEW is more verbose, displaying the name of the\n"
-"person who added the exception, it's session limit, reason, \n"
+"person who added the exception, its session limit, reason, \n"
 "host mask and the expiry date and time.\n"
 " \n"
 "Note that a connecting client will \"use\" the first exception\n"
@@ -7147,7 +6639,7 @@ msgstr ""
 "\n"
 "Servis adminleri tarafýndan kullanýlabilir."
 
-#: language.cpp:4130
+#: modules/core/cs_forbid.cpp:100
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -7165,7 +6657,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3255
+#: modules/core/ns_forbid.cpp:89
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -7183,7 +6675,7 @@ msgstr ""
 "\n"
 "Sadece Servis adminleri tarafýndan kullanýlýr."
 
-#: language.cpp:3249
+#: modules/core/ns_getemail.cpp:57
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -7197,7 +6689,7 @@ msgstr ""
 "this command is used, a message including the person who issued\n"
 "the command and the email it was used on will be logged."
 
-#: language.cpp:4111
+#: modules/core/cs_getkey.cpp:52
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -7207,16 +6699,15 @@ msgstr ""
 "\n"
 "Belirtilen kanalýn anahtarýný söyler."
 
-#: language.cpp:3240
+#: modules/core/ns_getpass.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
 "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.\n"
-" \n"
-"This command is unavailable when encryption is enabled."
+"on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 "Kullanýmý: GETPASS nick\n"
 "\n"
@@ -7228,14 +6719,14 @@ msgstr ""
 "\n"
 "(Bu komut þifreleme(encryption) aktif olduðu zaman devre dýþýdýr.)"
 
-#: language.cpp:3056
+#: modules/core/ns_ghost.cpp:72
+#, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
-" \n"
-"Terminates a \"ghost\" IRC session using your nick.  A\n"
-"\"ghost\" session is one which is not actually connected,\n"
+"itermminates a \"ghost\" IRC session using your nick.  A\n"
+"ghost\" session is one which is not actually connected,\n"
 "but which the IRC server believes is still online for one\n"
-"reason or another.  Typically, this happens if your\n"
+"reason or another. Typically, this happens if your\n"
 "computer crashes or your Internet or modem connection\n"
 "goes down while you're on IRC.\n"
 " \n"
@@ -7258,7 +6749,7 @@ msgstr ""
 "o nick için doðru þifrenin belirtilmiþ olmasý yada o nickin\n"
 "grubundaki baþka bir nickin tanýtýlmýþ olmasý gerekir."
 
-#: language.cpp:3114
+#: modules/core/ns_group.cpp:296
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -7268,7 +6759,7 @@ msgstr ""
 "\n"
 "Lists all nicks in your group."
 
-#: language.cpp:3231
+#: modules/core/ns_group.cpp:287
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -7287,7 +6778,7 @@ msgstr ""
 "With a parameter, lists all nicknames that are in the\n"
 "group of the given nick."
 
-#: language.cpp:4418
+#: modules/core/os_global.cpp:36
 #, c-format
 msgid ""
 "Syntax: GLOBAL message\n"
@@ -7300,7 +6791,7 @@ msgstr ""
 "IRCoplarýn networkteki tüm kullanýcýlara mesaj yollamasýný\n"
 "saðlar. Mesajlar %s nickinden gönderilir."
 
-#: language.cpp:5221
+#: modules/core/hs_group.cpp:43
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -7314,7 +6805,7 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: language.cpp:2694
+#: modules/core/ns_group.cpp:138
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7376,16 +6867,17 @@ msgstr ""
 "\n"
 "Not: bir gruptaki tüm nickler bir þifreye sahip olurlar."
 
-#: language.cpp:4002
+#: modules/core/cs_modes.cpp:261
+#, fuzzy
 msgid ""
-"Syntax: HALFOP #channel [nick]\n"
+"Syntax: HALFOP [#channel] [nick]\n"
 " \n"
 "Halfops a selected nick on a channel. If nick is not given,\n"
-"it will halfop you.\n"
+"it will halfop you. If channel is not given, it will halfop\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to AOPs and those with level 5 access \n"
 "and above on the channel, or to HOPs or those with level 4 \n"
-"and above for self halfopping."
 msgstr ""
 "Kullanýmý: HALFOP #kanaladý [nick]\n"
 "\n"
@@ -7396,10 +6888,11 @@ msgstr ""
 "olanlar kullanabilir, veya HOP lar ile access seviyesi 4 ve\n"
 "üzeri olanlar kendilerini halfop yapmak için kullanabilir."
 
-#: language.cpp:3698
+#: modules/core/cs_xop.cpp:548
+#, fuzzy
 msgid ""
-"Syntax: HOP channel ADD nick\n"
-"        HOP channel DEL {nick | entry-num | list}\n"
+"Syntax: HOP channel ADD mask\n"
+"        HOP channel DEL {mask | entry-num | list}\n"
 "        HOP channel LIST [mask | list]\n"
 "        HOP channel CLEAR\n"
 " \n"
@@ -7468,7 +6961,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %S HELP SET XOP yazarak ulasabilirsiniz."
 
-#: language.cpp:2733
+#: modules/core/ns_identify.cpp:107
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7486,9 +6979,20 @@ msgstr ""
 "tanýtýlmanýzý gerektirir. Þifreniz nickinizi kayýt ederken \n"
 "REGISTER komutuyla beraber kullandýðýnýzla aynýdýr."
 
-#: language.cpp:4446
+#: modules/core/ms_ignore.cpp:90
 msgid ""
-"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]\n"
+"Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
+" \n"
+"Allows you to ignore users by nick or host from memoing you. If someone on "
+"your\n"
+"memo ignore list tries to memo you, they will not be told that you have them "
+"ignored."
+msgstr ""
+
+#: modules/core/os_ignore.cpp:260
+#, fuzzy
+msgid ""
+"Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \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"
@@ -7518,7 +7022,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: language.cpp:3953
+#: modules/core/cs_info.cpp:118
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7538,7 +7042,7 @@ msgstr ""
 "giriþ mesajý ve successor hakkýndada bilgi alabilirsiniz.\n"
 "Varsayilan olarak, ALL seçenegini founderlar kullanabilir."
 
-#: language.cpp:3071
+#: modules/core/ns_info.cpp:151
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7554,7 +7058,7 @@ msgstr ""
 "ALL parametresini kullandýðýnýzda bilgiler gizli olsa bile o \n"
 "nick hakkýndaki tüm bilgiler görünür."
 
-#: language.cpp:4280
+#: modules/core/ms_info.cpp:205
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7570,7 +7074,7 @@ msgstr ""
 "Eðer kanaladý parametresi belirtilirse ayný bilgiyi o kanal\n"
 "için gösterir."
 
-#: language.cpp:4306
+#: modules/core/ms_info.cpp:193
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7596,7 +7100,7 @@ msgstr ""
 "Nick parametresiyle, ayný bilgiyi belirtilen nick için\n"
 "verir. Kullanýmý Servis adminleriyle sýnýrlýdýr."
 
-#: language.cpp:4866
+#: modules/core/bs_info.cpp:223
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7614,12 +7118,12 @@ msgstr ""
 "alýrsýnýz. Eðer parametre nickse, bot hakkýnda yaratýlma \n"
 "zamaný veya bulunduðu kanal sayýsý gibi bilgiler alýrsýnýz."
 
-#: language.cpp:4048
-#, c-format
+#: modules/core/cs_invite.cpp:73
+#, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
 " \n"
-"Tells %S to invite you into the given channel.  \n"
+"Tells %S to invite you into the given channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
@@ -7630,14 +7134,15 @@ msgstr ""
 "Varsayýlan olarak AOP lar ile access seviyesi 5 veya\n"
 "üzeri olanlar kullanabilir."
 
-#: language.cpp:4737
+#: modules/core/os_jupe.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: JUPE server [reason]\n"
 " \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"
+"may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
 "otherwise, the server information field will contain the\n"
 "text \"Juped by <nick>\", showing the nickname of the\n"
@@ -7655,7 +7160,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4063
+#: modules/core/cs_kick.cpp:65
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7671,7 +7176,7 @@ msgstr ""
 "Varsayýlan olarak, AOP lar ile access seviyesi 5 ve üzeri\n"
 "olanlar bu komutu kullanabilir."
 
-#: language.cpp:5010
+#: modules/core/bs_kick.cpp:437
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7696,7 +7201,7 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:5001
+#: modules/core/bs_kick.cpp:484
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7717,12 +7222,14 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:4930
+#: modules/core/bs_kick.cpp:415
+#, fuzzy
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
 "Configures bot kickers.  option can be one of:\n"
 " \n"
+"    AMSGS         Sets if the bot kicks for amsgs\n"
 "    BOLDS         Sets if the bot kicks bolds\n"
 "    BADWORDS      Sets if the bot kicks bad words\n"
 "    CAPS          Sets if the bot kicks caps\n"
@@ -7759,14 +7266,14 @@ msgstr ""
 "\n"
 "Not: Bu komuta eriþim seviye(level) ayarýyla yapýlýr."
 
-#: language.cpp:4485
-#, c-format
+#: modules/core/os_kick.cpp:56
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel user reason\n"
 " \n"
 "Allows staff to kick a user from any channel.\n"
 "Parameters are the same as for the standard /KICK\n"
-"command.  The kick message will have the nickname of the\n"
+"command. The kick message will have the nickname of the\n"
 "IRCop sending the KICK command prepended; for example:\n"
 " \n"
 "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"
@@ -7782,7 +7289,25 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4951
+#: modules/core/bs_kick.cpp:514
+#, fuzzy
+msgid ""
+"Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
+"Sets the amsg kicker on or off. When enabled, the bot will\n"
+"kick users who send the same message to multiple channels\n"
+"where BotServ bots are.\n"
+"Ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+msgstr ""
+"Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
+"Sets the italics kicker on or off. When enabled, this\n"
+"option tells the bot to kick users who use italics.\n"
+"ttb is the number of times a user can be kicked\n"
+"before it get banned. Don't give ttb to disable\n"
+"the ban system once activated."
+
+#: modules/core/bs_kick.cpp:448
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7800,7 +7325,7 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:4979
+#: modules/core/bs_kick.cpp:455
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7828,7 +7353,7 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:4958
+#: modules/core/bs_kick.cpp:467
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7846,7 +7371,7 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:4991
+#: modules/core/bs_kick.cpp:474
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7868,7 +7393,7 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:5021
+#: modules/core/bs_kick.cpp:507
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7884,7 +7409,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: language.cpp:4965
+#: modules/core/bs_kick.cpp:493
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7902,7 +7427,7 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:4972
+#: modules/core/bs_kick.cpp:500
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7920,8 +7445,8 @@ msgstr ""
 "böas banlamadan önce kiþinin kaç kez atýlacaðýný \n"
 "belirler. Kaldýrmak için komutta böas ý belirtmeyin."
 
-#: language.cpp:3922
-#, c-format
+#: modules/core/cs_access.cpp:712
+#, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
 "        LEVELS channel {DIS | DISABLE} type\n"
@@ -7931,17 +7456,17 @@ msgid ""
 "The LEVELS command allows fine control over the meaning of\n"
 "the numeric access levels used for channels.  With this\n"
 "command, you can define the access level required for most\n"
-"of %S's functions.  (The SET FOUNDER and this command\n"
+"of %S's functions. (The SET FOUNDER and this command\n"
 "are always restricted to the channel founder.)\n"
 " \n"
 "LEVELS SET allows the access level for a function or group of\n"
-"functions to be changed.  LEVELS DISABLE (or DIS for short)\n"
+"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).\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
-"group of functions.  LEVELS RESET resets the levels to the\n"
+"group of functions. LEVELS RESET resets the levels to the\n"
 "default levels of a newly-created channel (see\n"
 "HELP ACCESS LEVELS).\n"
 " \n"
@@ -7973,7 +7498,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: language.cpp:5210
+#: modules/core/hs_list.cpp:102
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7997,7 +7522,7 @@ msgstr ""
 "The list uses the value of NSListMax as a hard limit for the\n"
 "number of items to display to a operator at any 1 time."
 
-#: language.cpp:3961
+#: modules/core/cs_list.cpp:126
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8011,7 +7536,7 @@ msgstr ""
 "Belirtilen modelle uyuþan tüm kayýtlý kanallarý listeler.\n"
 "(PRIVATE özelliði aktif olan kanallar listelenmez.)"
 
-#: language.cpp:3077
+#: modules/core/ns_list.cpp:203
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -8051,7 +7576,8 @@ msgstr ""
 "    LIST *!*@*.ixir.com\n"
 "        ixir.com domainine sahip tüm kayýtlý nickleri listeler."
 
-#: language.cpp:3197
+#: modules/core/ns_list.cpp:178
+#, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -8079,7 +7605,6 @@ msgid ""
 " \n"
 "    LIST * NOEXPIRE\n"
 "        Lists all registered nicks which have been set to\n"
-"        not expire."
 msgstr ""
 "Kullanýmý: LIST model [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 "\n"
@@ -8109,13 +7634,14 @@ msgstr ""
 "    LIST * NOEXPIRE\n"
 "        Zaman asimi olmayan tüm kayýtlý nickler listelenir."
 
-#: language.cpp:4208
+#: modules/core/ms_list.cpp:147
+#, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
 "Lists any memos you currently have.  With NEW, lists only\n"
-"new (unread) memos.  Unread memos are marked with a \"*\"\n"
-"to the left of the memo number.  You can also specify a list\n"
+"new (unread) memos. Unread memos are marked with a \"*\"\n"
+"to the left of the memo number. You can also specify a list\n"
 "of numbers, as in the example below:\n"
 "   LIST 2-5,7-9\n"
 "      Lists memos numbered 2 through 5 and 7 through 9."
@@ -8130,11 +7656,11 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      2'den 5'e ve 7'den 9'a kadar olan mesajlarý listeler."
 
-#: language.cpp:2497
+#: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Kullanýmý: LOGONNEWS ADD yazý"
 
-#: language.cpp:2553
+#: modules/core/os_news.cpp:302
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -8163,11 +7689,11 @@ msgstr ""
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
-#: language.cpp:2503
+#: modules/core/os_news.cpp:41
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Kullanýmý: LOGONNEWS DEL {num | ALL}"
 
-#: language.cpp:2746
+#: modules/core/ns_logout.cpp:78
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -8183,7 +7709,7 @@ msgstr ""
 "saðlar. Fakat sizden nickinizi tekrar identify etmeniz \n"
 "istenmez."
 
-#: language.cpp:3176
+#: modules/core/ns_logout.cpp:67
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -8208,12 +7734,13 @@ msgstr ""
 "identify etmesini söyler. Servis adminlerinin Kullanýmýyla\n"
 "sýnýrlýdýr."
 
-#: language.cpp:4461
+#: modules/core/os_mode.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: MODE channel modes\n"
 " \n"
 "Allows Services operators to set channel modes for any\n"
-"channel.  Parameters are the same as for the standard /MODE\n"
+"channel. Parameters are the same as for the standard /MODE\n"
 "command."
 msgstr ""
 "Kullanýmý: MODE kanaladý modlar\n"
@@ -8224,7 +7751,34 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4809
+#: modules/core/cs_mode.cpp:283
+msgid ""
+"Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
+"        MODE channel SET modes\n"
+" \n"
+"Mainly controls mode locks and mode access (which is different from channel "
+"access)\n"
+"on a channel.\n"
+" \n"
+"The MODE LOCK command allows you to add, delete, and view mode locks on a "
+"channel.\n"
+"If a mode is locked on or off, services will not allow that mode to be "
+"changed.\n"
+"Example:\n"
+"     MODE #channel LOCK ADD +bmnt *!*@*aol*\n"
+" \n"
+"The MODE SET command allows you to set modes through services. Wildcards * "
+"and ? may\n"
+"be given as parameters for list and status modes.\n"
+"Example:\n"
+"     MODE #channel SET +v *\n"
+"       Sets voice status to all users in the channel.\n"
+" \n"
+"     MODE #channel SET -b ~c:*\n"
+"       Clears all extended bans that start with ~c:"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:69
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8233,7 +7787,7 @@ msgstr ""
 "Syntax: MODINFO FileName\n"
 "This command lists information about the specified loaded module"
 
-#: language.cpp:4813
+#: modules/core/os_modlist.cpp:210
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8242,7 +7796,7 @@ msgstr ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Lists all currently loaded modules."
 
-#: language.cpp:4795
+#: modules/core/os_modload.cpp:56
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8253,7 +7807,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4805
+#: modules/core/os_modreload.cpp:83
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8264,7 +7818,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4800
+#: modules/core/os_modunload.cpp:64
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8275,10 +7829,12 @@ msgstr ""
 "This command unloads the module named FileName from the modules\n"
 "directory."
 
-#: language.cpp:4726
+#: modules/core/os_noop.cpp:64
+#, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
-"        NOOP REVOKE server\n"
+"          NOOP REVOKE server\n"
+"\n"
 "NOOP SET remove all O:lines of the given\n"
 "server and kill all IRCops currently on it to\n"
 "prevent them from rehashing the server (because this\n"
@@ -8303,7 +7859,7 @@ msgstr ""
 "\n"
 "Services Operatorlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:5201
+#: modules/core/hs_off.cpp:42
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8315,7 +7871,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see your real IP address."
 
-#: language.cpp:4473
+#: modules/core/os_oline.cpp:55
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8329,7 +7885,7 @@ msgstr ""
 "Flags have to be prefixed with a \"+\" or a \"-\". To\n"
 "remove all flags simply type a \"-\" instead of any flags."
 
-#: language.cpp:5178
+#: modules/core/hs_on.cpp:52
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8341,12 +7897,14 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see the vhost instead of your real IP address."
 
-#: language.cpp:3968
+#: modules/core/cs_modes.cpp:104
+#, fuzzy
 msgid ""
-"Syntax: OP #channel [nick]\n"
+"Syntax: OP [#channel] [nick]\n"
 " \n"
 "Ops a selected nick on a channel. If nick is not given,\n"
-"it will op you.\n"
+"it will op you. If channel is not given, it will op you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel."
@@ -8359,11 +7917,11 @@ msgstr ""
 "Varsayýlan olarak, AOP lar ile access seviyesi 5 ve üzeri\n"
 "olanlar kullanabilir."
 
-#: language.cpp:2519
+#: modules/core/os_news.cpp:51
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Kullanýmý: OPERNEWS ADD yazý"
 
-#: language.cpp:2566
+#: modules/core/os_news.cpp:342
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8392,30 +7950,37 @@ msgstr ""
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
-#: language.cpp:2523
+#: modules/core/os_news.cpp:53
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Kullanýmý: OPERNEWS DEL {num | ALL}"
 
-#: language.cpp:4036
+#: modules/core/cs_modes.cpp:425
+#, fuzzy
 msgid ""
-"Syntax: OWNER #channel\n"
+"Syntax: OWNER [#channel] [nick]\n"
 " \n"
-"Gives you owner status on channel.\n"
+"Gives the selected nick owner status on channel. If nick is not\n"
+"given, it will give you owner. If channel is not given, it will\n"
+"give you owner on every channel.\n"
 " \n"
 "Limited to those with founder access on the channel."
 msgstr ""
-"Kullanýmý: OWNER #kanaladi\n"
+"Kullanýmý: OP #kanaladý [nick]\n"
 "\n"
-"Belirtilen kanalda owner statüsü verilir.\n"
+"Belirtilen nicki kanalda oplar. Eðer nick belirtilmemiþse,\n"
+"kendinizi oplarsýnýz.\n"
 "\n"
-"Belirtilen kanal founderlarinin kullanma yetkisi vardir."
+"Varsayýlan olarak, AOP lar ile access seviyesi 5 ve üzeri\n"
+"olanlar kullanabilir."
 
-#: language.cpp:4020
+#: modules/core/cs_modes.cpp:344
+#, fuzzy
 msgid ""
-"Syntax: PROTECT #channel [nick]\n"
+"Syntax: PROTECT [#channel] [nick]\n"
 " \n"
 "Protects a selected nick on a channel. If nick is not given,\n"
-"it will protect you.\n"
+"it will protect you. If channel is not given, it will protect\n"
+"you on every channel.\n"
 " \n"
 "By default, limited to the founder, or to SOPs or those with \n"
 "level 10 and above on the channel for self protecting."
@@ -8428,10 +7993,11 @@ msgstr ""
 "Varsayýlan olarak, founder kullanabilir, veya SOP lar ile access\n"
 "seviyesi 10 ve üzeri olanlar kendilerinde kullanabilirler."
 
-#: language.cpp:3622
+#: modules/core/cs_xop.cpp:417
+#, fuzzy
 msgid ""
-"Syntax: QOP channel ADD nick\n"
-"        QOP channel DEL {nick | entry-num | list}\n"
+"Syntax: QOP channel ADD mask\n"
+"        QOP channel DEL {mask | entry-num | list}\n"
 "        QOP channel LIST [mask | list]\n"
 "        QOP channel CLEAR\n"
 " \n"
@@ -8504,7 +8070,7 @@ msgstr ""
 "and /msg %S HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: language.cpp:4759
+#: modules/core/os_quit.cpp:37
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8524,11 +8090,11 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:2539
+#: modules/core/os_news.cpp:63
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Kullanýmý: RANDOMNEWS ADD yazi"
 
-#: language.cpp:2579
+#: modules/core/os_news.cpp:382
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8550,18 +8116,19 @@ msgstr ""
 "\n"
 "RANDOMNEWS may only be used by Services Operators."
 
-#: language.cpp:2543
+#: modules/core/os_news.cpp:65
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Kullanýmý: RANDOMNEWS DEL {no | ALL}"
 
-#: language.cpp:4217
+#: modules/core/ms_read.cpp:130
+#, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
-"Sends you the text of the memos specified.  If LAST is\n"
-"given, sends you the memo you most recently received.  If\n"
+"Sends you the text of the memos specified. If LAST is\n"
+"given, sends you the memo you most recently received. If\n"
 "NEW is given, sends you all of your new memos.  Otherwise,\n"
-"sends you memo number num.  You can also give a list of\n"
+"sends you memo number num. You can also give a list of\n"
 "numbers, as in this example:\n"
 " \n"
 "   READ 2-5,7-9\n"
@@ -8578,7 +8145,7 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      2'den 5'e ve 7'den 9'a kadar olan mesajlarý gösterir."
 
-#: language.cpp:3020
+#: modules/core/ns_recover.cpp:91
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8626,7 +8193,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:3350
+#: modules/core/cs_register.cpp:101
+#, fuzzy
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8637,7 +8205,7 @@ msgid ""
 "general description of the channel's purpose.\n"
 " \n"
 "When you register a channel, you are recorded as the\n"
-"\"founder\" of the channel.  The channel founder is allowed\n"
+"\"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.\n"
@@ -8668,24 +8236,25 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: language.cpp:2662
+#: modules/core/ns_register.cpp:313
+#, fuzzy
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
-"Registers your nickname in the %S database.  Once\n"
+"Registers your nickname in the %S database. Once\n"
 "your nick is registered, you can use the SET and ACCESS\n"
 "commands to configure your nick's settings as you like\n"
-"them.  Make sure you remember the password you use when\n"
+"them. Make sure you remember the password you use when\n"
 "registering - you'll need it to make changes to your nick\n"
-"later.  (Note that case matters!  ANOPE, Anope, and \n"
+"later. (Note that case matters! ANOPE, Anope, and \n"
 "anope are all different passwords!)\n"
 " \n"
 "Guidelines on choosing passwords:\n"
 " \n"
-"Passwords should not be easily guessable.  For example,\n"
-"using your real name as a password is a bad idea.  Using\n"
+"Passwords should not be easily guessable. For example,\n"
+"using your real name as a password is a bad idea. Using\n"
 "your nickname as a password is a much worse idea ;) and,\n"
-"in fact, %S will not allow it.  Also, short\n"
+"in fact, %S will not allow it. Also, short\n"
 "passwords are vulnerable to trial-and-error searches, so\n"
 "you should choose a password at least 5 characters long.\n"
 "Finally, the space character cannot be used in passwords.\n"
@@ -8737,15 +8306,15 @@ msgstr ""
 "saðlar. Bu özellik hakkýnda daha fazla bilgi için, \n"
 "/msg %S HELP GROUP yazýn."
 
-#: language.cpp:3043
-#, c-format
+#: modules/core/ns_release.cpp:77
+#, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
 " \n"
 "Instructs %S to remove any hold on your nickname\n"
 "caused by automatic kill protection or use of the RECOVER\n"
-"command.  This holds lasts for %s;\n"
-"this command gets rid of them sooner.\n"
+"command. This holds lasts for %s;\n"
+"This command gets rid of them sooner.\n"
 " \n"
 "In order to use the RELEASE command for a nick, your\n"
 "current address as shown in /WHOIS must be on that nick's\n"
@@ -8766,7 +8335,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: language.cpp:4753
+#: modules/core/os_reload.cpp:43
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8783,7 +8352,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3166
+#: modules/core/ns_register.cpp:400
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8795,7 +8364,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: language.cpp:3147
+#: modules/core/ns_resetpass.cpp:51
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8806,7 +8375,7 @@ msgstr ""
 "Sends a code key to the nickname with instructions on how to\n"
 "reset their password."
 
-#: language.cpp:4771
+#: modules/core/os_restart.cpp:37
 msgid ""
 "Syntax: RESTART\n"
 " \n"
@@ -8820,13 +8389,14 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr.\t"
 
-#: language.cpp:4324
+#: modules/core/ms_rsend.cpp:61
+#, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has 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"
@@ -8842,23 +8412,25 @@ msgstr ""
 "memo will be sent to the sender informing him/her that the memo\n"
 "has been read."
 
-#: language.cpp:2907
+#: modules/core/ns_saset.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
+"Sets various nickname options. option can be one of:"
 msgstr ""
 "Syntax: SASET nickname option parameters.\n"
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: language.cpp:3007
+#: modules/core/ns_set_autoop.cpp:77
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
 "Sets whether the given nickname will be opped automatically.\n"
 "Set to ON to allow ChanServ to op the given nickname \n"
-"automatically when joining channels."
+"omatically when joining channels."
 msgstr ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 "\n"
@@ -8866,7 +8438,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: language.cpp:2933
+#: modules/core/ns_saset.cpp:159
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8878,7 +8450,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: language.cpp:2942
+#: modules/core/ns_set_email.cpp:88
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8888,7 +8460,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: language.cpp:2946
+#: modules/core/ns_set_greet.cpp:72
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8904,7 +8476,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: language.cpp:2986
+#: modules/core/ns_set_hide.cpp:116
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8927,22 +8499,22 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: language.cpp:2953
-#, c-format
+#: modules/core/ns_set_kill.cpp:111
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
 "Turns the automatic protection option for the nick\n"
-"on or off.  With protection on, if another user\n"
+"on or off. With protection on, if another user\n"
 "tries to take the nick, they will be given one minute to\n"
 "change to another nick, after which %S will forcibly change\n"
 "their nick.\n"
 " \n"
 "If you select QUICK, the user will be given only 20 seconds\n"
-"to change nicks instead of the usual 60.  If you select\n"
-"IMMED, user's nick will be changed immediately without being\n"
+"to change nicks instead of the usual 60. If you select\n"
+"IMMED, the user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8960,7 +8532,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: language.cpp:3013
+#: modules/core/ns_set_language.cpp:112
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname LANGUAGE language\n"
@@ -8977,7 +8549,7 @@ msgstr ""
 "number should be chosen from a list of supported languages\n"
 "that you can get by typing /msg %S HELP SET LANGUAGE."
 
-#: language.cpp:2996
+#: modules/core/ns_set_message.cpp:84
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8991,7 +8563,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: language.cpp:3002
+#: modules/core/ns_saset_noexpire.cpp:49
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9003,17 +8575,18 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: language.cpp:2938
+#: modules/core/ns_saset.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
-"Changes the password used to identify as the nick's\towner."
+"Changes the password used to identify as the nick's owner."
 msgstr ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: language.cpp:2978
+#: modules/core/ns_set_private.cpp:80
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -9032,16 +8605,16 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: language.cpp:2968
-#, c-format
+#: modules/core/ns_set_secure.cpp:82
+#, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9055,7 +8628,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: language.cpp:5062
+#: modules/core/bs_say.cpp:65
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -9065,13 +8638,14 @@ msgstr ""
 "\n"
 "Botun belirtilen yazýyý belirtilen kanalda söylemesini saðlar."
 
-#: language.cpp:4196
+#: modules/core/ms_send.cpp:33
+#, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
 "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"
+"memo-text. When sending to a nickname, the recipient will\n"
+"receive a notice that he/she has a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Kullanýmý: SEND {nick | kanaladý} mesaj\n"
@@ -9080,15 +8654,17 @@ msgstr ""
 "Nicke gönderirken, gönderilen kiþi yeni mesajý olduðuna dair\n"
 "bir not alýr. Mesaj gönderilen nick/kanal kayýtlý olmalýdýr."
 
-#: language.cpp:4321
+#: modules/core/ms_sendall.cpp:50
+#, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
+" \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 "Syntax: SENDALL memo-text\n"
 "Sends all registered users a memo containing memo-text."
 
-#: language.cpp:3139
+#: modules/core/ns_sendpass.cpp:58
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -9105,7 +8681,7 @@ msgstr ""
 "\n"
 "Bazý networklerde sadece IRC operatörleri kullanabilir."
 
-#: language.cpp:2433
+#: modules/core/os_session.cpp:191
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -9141,7 +8717,7 @@ msgstr ""
 "\n"
 "Servis adminleri tarafýndan kullanýlabilir."
 
-#: language.cpp:5183
+#: modules/core/hs_set.cpp:100
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9155,7 +8731,65 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> set idents for users as \n"
 "well as vhosts."
 
-#: language.cpp:4874
+#: modules/core/cs_set_secureops.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s SECUREOPS {ON | OFF}\n"
+" \n"
+"Enables or disables the secure ops option for a channel.\n"
+"When secure ops is set, users who are not on the userlist\n"
+"will not be allowed chanop status."
+msgstr ""
+"Kullanýmý: %s kanaladý SECUREOPS {ON | OFF}\n"
+"\n"
+"Bir kanal için güvenli op özelliðini açar veya kapatýr.\n"
+"güvenli op özelliði aktifse, access listesinde olmayan\n"
+"kullanýcýlar kanalda op olamazlar."
+
+#: modules/core/cs_set_signkick.cpp:56
+#, fuzzy
+msgid ""
+"Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
+" \n"
+"Enables or disables signed kicks for a\n"
+"channel.  When SIGNKICK is set, kicks issued with\n"
+"%S KICK command will have the nick that used the\n"
+"command in their reason.\n"
+" \n"
+"If you use LEVEL, those who have a level that is superior \n"
+"or equal to the SIGNKICK level on the channel won't have their \n"
+"kicks signed. See %R%S HELP LEVELS for more information."
+msgstr ""
+"Kullanýmý: %s kanaladý SIGNKICK {ON | LEVEL | OFF}\n"
+"\n"
+"Bir kanal için iþaretli atmayý açar yada kapatýr.\n"
+"SIGNKICK ayarlandýðý zaman, %S KICK\n"
+"komutuyla yapýlan atmalarda komutu kullanan kiþinin\n"
+"nicki atma sebebinde yer alýr.\n"
+"\n"
+"Eðer LEVEL parametresini kullanýrsanýz, seviyesi\n"
+"SIGNKICK seviyesine eþit yada fazla olanlarýn yaptýðý\n"
+"atmalarda atanýn nicki sebepte gözükmez. Daha fazla\n"
+"bilgi için /msg %S HELP LEVELS yazýn."
+
+#: modules/core/cs_set_topiclock.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %S will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Kullanýmý: %s kanaladý TOPICLOCK {ON | OFF}\n"
+"\n"
+"Bir kanal için topic kilidini aktifleþtirir yada kapatýr.\n"
+"topic kilidi aktifse, %S SET TOPIC komutunun\n"
+"dýþýnda kanal topic inin deðiþtirilmesine izin vermez."
+
+#: modules/core/bs_set.cpp:204
+#, fuzzy
 msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
@@ -9166,6 +8800,7 @@ msgid ""
 "    GREET            Enable greet messages\n"
 "    FANTASY          Enable fantaisist commands\n"
 "    SYMBIOSIS        Allow the bot to act as a real bot\n"
+"    MSG              Configure how fantasy commands should be replied to\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option.\n"
@@ -9187,7 +8822,7 @@ msgstr ""
 "\n"
 "Not: Bu komuta access eriþimi seviye(level) ayarýyla saðlanýr."
 
-#: language.cpp:5104
+#: modules/core/bs_set.cpp:276
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9200,7 +8835,7 @@ msgstr ""
 "\n"
 "Bu komutu Servis Adminleri kullanabilir."
 
-#: language.cpp:3383
+#: modules/core/cs_set.cpp:76
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9216,7 +8851,7 @@ msgstr ""
 "\n"
 "Mevcut özellikler:"
 
-#: language.cpp:4889
+#: modules/core/bs_set.cpp:229
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9230,7 +8865,7 @@ msgstr ""
 "Aktifleþtirildiði zaman, oplar bot tarafýnda NOKICK\n"
 "seviyeleri olmasalar bile atýlmazlar."
 
-#: language.cpp:4895
+#: modules/core/bs_set.cpp:235
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9244,7 +8879,7 @@ msgstr ""
 "Aktifleþtirildiði zaman, voice lar bot tarafýndan\n"
 "NOKICK seviyeleri olmasalar bile atýlmazlar."
 
-#: language.cpp:4901
+#: modules/core/bs_set.cpp:241
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9278,7 +8913,7 @@ msgstr ""
 "komutunu kullanmak için, kullanýcýnýn OPDEOP\n"
 "seviyesine yeterli access i olmalýdýr)."
 
-#: language.cpp:4916
+#: modules/core/bs_set.cpp:256
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9294,7 +8929,22 @@ msgstr ""
 "kullanýcýlara bir karþýlama mesajý gönderir,\n"
 "tabi eðer bu kiþilerin yeterli access leri varsa."
 
-#: language.cpp:5098
+#: modules/core/bs_set.cpp:280
+msgid ""
+"Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
+" \n"
+"Configures how fantasy commands should be returned to the channel. Off "
+"disables\n"
+"fantasy from replying to the channel. Privmsg, notice, and noticeops message "
+"the\n"
+"channel, notice the channel, and notice the channel ops respectively.\n"
+" \n"
+"Note that replies over one line will not use this setting to prevent spam, "
+"and will\n"
+"go directly to the user who executed it."
+msgstr ""
+
+#: modules/core/bs_set.cpp:270
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9310,7 +8960,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4125
+#: modules/core/cs_saset_noexpire.cpp:47
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9325,7 +8975,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4923
+#: modules/core/bs_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9341,26 +8991,17 @@ msgstr ""
 "Aktifleþtirildiði zaman bot %s'ün yaptýðý herþeyi\n"
 "kendisi yapar. Modelar, kickler, ve giriþ mesajý gibi."
 
-#: language.cpp:2788
+#: modules/core/ms_set.cpp:232
+#, fuzzy
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
-"Sets various nickname options.  option can be one of:"
-msgstr ""
-"Kullanýmý: SET özellik parametre\n"
-"\n"
-"Çeþitli nick özelliklerini ayarlar.  özellik þunlardan biri \n"
-"olabilir:"
-
-#: language.cpp:4245
-msgid ""
-"Syntax: SET option parameters\n"
 "Sets various memo options.  option can be one of:\n"
 " \n"
 "    NOTIFY      Changes when you will be notified about\n"
-"                    new memos (only for nicknames)\n"
+"                   new memos (only for nicknames)\n"
 "    LIMIT       Sets the maximum number of memos you can\n"
-"                    receive\n"
+"                   receive\n"
 " \n"
 "Type %R%S HELP SET option for more information\n"
 "on a specific option."
@@ -9378,7 +9019,18 @@ msgstr ""
 "Belirli bir özellik hakkýnda daha fazla bilgi için, \n"
 "/msg %S HELP SET özellik yazýn."
 
-#: language.cpp:4672
+#: modules/core/ns_set.cpp:71
+msgid ""
+"Syntax: SET option parameters\n"
+" \n"
+"Sets various nickname options.  option can be one of:"
+msgstr ""
+"Kullanýmý: SET özellik parametre\n"
+"\n"
+"Çeþitli nick özelliklerini ayarlar.  özellik þunlardan biri \n"
+"olabilir:"
+
+#: modules/core/os_set.cpp:193
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9388,7 +9040,6 @@ msgid ""
 "    DEBUG      Activate or deactivate debug mode\n"
 "    NOEXPIRE   Activate or deactivate no expire mode\n"
 "    SUPERADMIN Activate or deactivate super-admin mode\n"
-"    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 msgstr ""
 "Kullanýmý: SET özellik ayar\n"
@@ -9405,7 +9056,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:2902
+#: modules/core/ns_set_autoop.cpp:50
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9417,29 +9068,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: language.cpp:4696
-msgid ""
-"Syntax: SET DEBUG {ON | OFF | num}\n"
-" \n"
-"Sets debug mode on or off.  In debug mode, all data sent to\n"
-"and from Services as well as a number of other debugging\n"
-"messages are written to the log file.  If num is\n"
-"given, debug mode is activated, with the debugging level set\n"
-"to num.\n"
-"This option is equivalent to the command-line option\n"
-"-debug."
-msgstr ""
-"Kullanýmý: SET DEBUG {ON | OFF | num}\n"
-"\n"
-"Debug modunu açar yada kapatýr. Debug modunda, servislere \n"
-"gönderilen ve alýnan tüm veriler diðer bir kaç debug \n"
-"mesajlarýyla beraber bir kayýt dosyasýna yazýlýr. Eðer num \n"
-"parametresi belirtilmiþse, debug modu num a baðlý debug \n"
-"seviye ayarý ile aktifleþtirilir.\n"
-"\n"
-"-debug komut satýrý özelliðiyle aynýdýr."
-
-#: language.cpp:2823
+#: modules/core/ns_set.cpp:153
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9452,7 +9081,7 @@ msgstr ""
 "ayarlar. Yeni görünüm grubunuzda bulunan nicklerden biri \n"
 "olmalýdýr."
 
-#: language.cpp:2840
+#: modules/core/ns_set_email.cpp:65
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9466,7 +9095,7 @@ msgstr ""
 "birisi sizin hakkýnýzda bilgi almak için INFO komutunu \n"
 "kullandýðýnda görünür."
 
-#: language.cpp:2846
+#: modules/core/ns_set_greet.cpp:48
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9482,7 +9111,7 @@ msgstr ""
 "girdiðinizde gönderilir, kanaldaki access seviyenize\n"
 "baðlýdýr."
 
-#: language.cpp:2886
+#: modules/core/ns_set_hide.cpp:84
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9504,18 +9133,8 @@ msgstr ""
 "saklayabilirsiniz. Ýkinici parametre bilginin görünüp (OFF)\n"
 "görünmeyeceðini (ON) belirtmenizi saðlar."
 
-#: language.cpp:4719
-msgid ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-msgstr ""
-"Syntax: SET IGNORE {ON | OFF}\n"
-"Setting this will toggle Anope's usage of the IGNORE system \n"
-"on or off."
-
-#: language.cpp:2853
-#, c-format
+#: modules/core/ns_set_kill.cpp:74
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
 " \n"
@@ -9529,7 +9148,7 @@ msgid ""
 "to change nicks instead of the usual 60.  If you select\n"
 "IMMED, user's nick will be changed immediately without being\n"
 "warned first or given a chance to change their nick; please\n"
-"do not use this option unless necessary.  Also, your\n"
+"do not use this option unless necessary. Also, your\n"
 "network's administrators may have disabled this option."
 msgstr ""
 "Kullanýmý: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9547,7 +9166,7 @@ msgstr ""
 "bu özelliði kullanmayýn. Hatta network yöneticileri bu\n"
 "özelliði devre dýþý býrakmýþ olabilirler."
 
-#: language.cpp:2833
+#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9564,7 +9183,7 @@ msgstr ""
 "numara aþaðýdaki listede desteklenen dillerden biri olarak \n"
 "belirlenir:"
 
-#: language.cpp:4273
+#: modules/core/ms_set.cpp:282
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9580,7 +9199,7 @@ msgstr ""
 "sayýsýný belirler. Eðer bunu 0 yaparsanýz kimse size mesaj \n"
 "gönderemeyecektir. Ayrýca bu limiti %d den fazla yapamazsýnýz."
 
-#: language.cpp:4287
+#: modules/core/ms_set.cpp:263
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9620,7 +9239,7 @@ msgstr ""
 "ayrýcalýklarý varsa bir kanalýn mesaj limitini ve kendi mesaj\n"
 "limitlerini ayarlayabilirler."
 
-#: language.cpp:4723
+#: modules/core/os_set.cpp:202
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9629,7 +9248,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %S settings"
 
-#: language.cpp:2896
+#: modules/core/ns_set_message.cpp:56
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9643,10 +9262,11 @@ msgstr ""
 "you. With MSG set, Services will use messages, else they'll \n"
 "use notices."
 
-#: language.cpp:4706
+#: modules/core/os_set.cpp:219
+#, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
-"Sets no expire mode on or off.  In no expire mode, nicks,\n"
+"Sets no expire mode on or off. In no expire mode, nicks,\n"
 "channels, akills and exceptions won't expire until the\n"
 "option is unset.\n"
 "This option is equivalent to the command-line option\n"
@@ -9660,7 +9280,7 @@ msgstr ""
 "\n"
 "-noexpire komut satýrý özelliðiyle aynýdýr."
 
-#: language.cpp:4256
+#: modules/core/ms_set.cpp:243
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9697,7 +9317,7 @@ msgstr ""
 "\n"
 "ON parametresi LOGON ve NEW 'in kombinasyonudur"
 
-#: language.cpp:2828
+#: modules/core/ns_set.cpp:215
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9709,7 +9329,7 @@ msgstr ""
 "Nickinizi tanýtmak için kullandýðýnýz þifreyi\n"
 "deðiþtirir."
 
-#: language.cpp:2878
+#: modules/core/ns_set_private.cpp:50
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9727,7 +9347,7 @@ msgstr ""
 "gözükmeyecektir.(Buna raðmen, nickinizi bilen biri INFO \n"
 "komutunu kullanarak hakkýnýzda bilgi alabilir.)"
 
-#: language.cpp:4682
+#: modules/core/os_set.cpp:205
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9755,16 +9375,16 @@ msgstr ""
 "\n"
 "-readonly komut satýrý özelliðiyle aynýdýr."
 
-#: language.cpp:2868
-#, c-format
+#: modules/core/ns_set_secure.cpp:50
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
 " \n"
 "Turns %S's security features on or off for your\n"
-"nick.  With SECURE set, you must enter your password\n"
+"nick. With SECURE set, you must enter your password\n"
 "before you will be recognized as the owner of the nick,\n"
 "regardless of whether your address is on the access\n"
-"list.  However, if you are on the access list, %S\n"
+"list. However, if you are on the access list, %S\n"
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 msgstr ""
@@ -9778,7 +9398,7 @@ msgstr ""
 "kullanýlmýþ olsa bile %S sizi otomatik olarak kill\n"
 "lemeyecektir."
 
-#: language.cpp:4713
+#: modules/core/os_set.cpp:226
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9792,14 +9412,15 @@ msgstr ""
 "This opion is _NOT_ persistant, and should only be used when\n"
 "needed, and set back to OFF when no longer needed."
 
-#: language.cpp:5193
+#: modules/core/hs_setall.cpp:105
+#, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
 "of the given nick.  If your IRCD supports vIdents, then\n"
 "using SETALL <nick> <ident>@<hostmask> will set idents\n"
 "for users as well as vhosts.\n"
-"* NOTE, this will not update the vhost for any nick's\n"
+"* NOTE, this will not update the vhost for any nicks\n"
 "added to the group after this command was used."
 msgstr ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9810,7 +9431,7 @@ msgstr ""
 "* NOTE, this will not update the vhost for any nick's\n"
 "added to the group after this command was used."
 
-#: language.cpp:4767
+#: modules/core/os_shutdown.cpp:36
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9822,10 +9443,11 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4541
+#: modules/core/os_snline.cpp:422
+#, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
-"    SNLINE DEL {mask | entry-num | list}\n"
+"        SNLINE DEL {mask | entry-num | list}\n"
 "        SNLINE LIST [mask | list]\n"
 "        SNLINE VIEW [mask | list]\n"
 "        SNLINE CLEAR\n"
@@ -9861,7 +9483,7 @@ msgid ""
 "   SNLINE LIST 2-5,7-9\n"
 "      Lists SNLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
 "will show who added an SNLINE, the date it was added, and when \n"
 "it expires, as well as the realname mask and reason.\n"
@@ -9914,10 +9536,11 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3735
+#: modules/core/cs_xop.cpp:612
+#, fuzzy
 msgid ""
-"Syntax: SOP channel ADD nick\n"
-"        SOP channel DEL {nick | entry-num | list}\n"
+"Syntax: SOP channel ADD mask\n"
+"        SOP channel DEL {mask | entry-num | list}\n"
 "        SOP channel LIST [mask | list]\n"
 "        SOP channel CLEAR\n"
 " \n"
@@ -9989,7 +9612,8 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %S HELP SET XOP yazarak ulasabilirsiniz."
 
-#: language.cpp:4585
+#: modules/core/os_sqline.cpp:401
+#, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -10005,31 +9629,31 @@ msgid ""
 "prevent the use of matching channels (on IRCds that \n"
 "support it).\n"
 " \n"
-"SQLINE ADD adds the given mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick's) 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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SQLINE which does not expire, use +0.  \n"
+"days). To add an SQLINE which does not expire, use +0. \n"
 "If the mask to be added starts with a +, an expiry time \n"
 "must be given, even if it is the same as the default. The\n"
 "current SQLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SQLINE DEL command removes the given mask from the\n"
-"SQLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SQLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SQLINE LIST command displays the SQLINE list.  \n"
+"The SQLINE LIST command displays the SQLINE list. \n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SQLINE LIST 2-5,7-9\n"
 "      Lists SQLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
 "will show who added an SQLINE, the date it was added, and when \n"
 "it expires, as well as the mask and reason.\n"
@@ -10082,21 +9706,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin kullanimiyla sinirlidir."
 
-#: language.cpp:5229
-msgid ""
-"Syntax: SQLSYNC\n"
-" \n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-msgstr ""
-"Syntax: SQLSYNC\n"
-"\n"
-"This command syncs your databases with SQL. You should\n"
-"only have to execute this command once, when you initially\n"
-"import your databases into SQL."
-
-#: language.cpp:2448
+#: modules/core/os_staff.cpp:55
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10106,15 +9716,17 @@ msgstr ""
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 
-#: language.cpp:4318
+#: modules/core/ms_staff.cpp:46
+#, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
+" \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 "Syntax: STAFF memo-text\n"
 "Sends all services staff a memo containing memo-text."
 
-#: language.cpp:4423
+#: modules/core/os_stats.cpp:262
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10158,7 +9770,7 @@ msgstr ""
 "RESET parametresi önceki maksimum kullanýcý sayýsýný o anda\n"
 "networkte bulunan kullanýcý sayýsýyla deðiþtirir."
 
-#: language.cpp:4150
+#: modules/core/cs_status.cpp:39
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10184,12 +9796,13 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3118
+#: modules/core/ns_status.cpp:54
+#, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
 "Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname.  The response has\n"
+"recognized as the owner of the nickname. The response has\n"
 "this format:\n"
 " \n"
 "    nickname status-code account\n"
@@ -10229,7 +9842,7 @@ msgstr ""
 "yoksayýlýr. If no nickname is given, your status\n"
 "will be returned."
 
-#: language.cpp:4137
+#: modules/core/cs_suspend.cpp:79
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10247,7 +9860,7 @@ msgstr ""
 "\n"
 "Reason may be required on certain networks."
 
-#: language.cpp:4494
+#: modules/core/os_svsnick.cpp:70
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10257,7 +9870,8 @@ msgstr ""
 "\n"
 "Forcefully changes a user's nickname from nick to newnick."
 
-#: language.cpp:4630
+#: modules/core/os_szline.cpp:404
+#, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -10270,31 +9884,31 @@ msgid ""
 "connect, Services will not allow it to pursue his IRC\n"
 "session (and this, whether the IP has a PTR RR or not).\n"
 " \n"
-"SZLINE ADD adds the given IP mask to the SZLINE\n"
+"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-"1h30m) are not permitted.  If a unit specifier is not \n"
+"(days), h (hours), or m (minutes). Combinations (such as \n"
+"1h30m) are not permitted. If a unit specifier is not \n"
 "included, the default is days (so +30 by itself means 30 \n"
-"days).  To add an SZLINE which does not expire, use +0.  If the\n"
+"days). To add an SZLINE which does not expire, use +0. If the\n"
 "realname mask to be added starts with a +, an expiry time must\n"
-"be given, even if it is the same as the default.  The\n"
+"be given, even if it is the same as the default. The\n"
 "current SZLINE default expiry time can be found with the\n"
 "STATS AKILL command.\n"
 " \n"
 "The SZLINE DEL command removes the given mask from the\n"
-"SZLINE list if it is present.  If a list of entry numbers is \n"
-"given, those entries are deleted.  (See the example for LIST \n"
+"SZLINE list if it is present. If a list of entry numbers is \n"
+"given, those entries are deleted. (See the example for LIST \n"
 "below.)\n"
 " \n"
-"The SZLINE LIST command displays the SZLINE list.  \n"
+"The SZLINE LIST command displays the SZLINE list.\n"
 "If a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
+"mask are displayed. If a list of entry numbers is given,\n"
 "only those entries are shown; for example:\n"
 "   SZLINE LIST 2-5,7-9\n"
 "      Lists SZLINE entries numbered 2 through 5 and 7 \n"
 "      through 9.\n"
-"      \n"
+" \n"
 "SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
 "will show who added an SZLINE, the date it was added, and when\n"
 "it expires, as well as the IP mask and reason.\n"
@@ -10344,7 +9958,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4077
+#: modules/core/cs_topic.cpp:51
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10367,7 +9981,7 @@ msgstr ""
 "\n"
 "Varsayilan olarak, founderin kullanma yetkisi vardir."
 
-#: language.cpp:4467
+#: modules/core/os_umode.cpp:57
 msgid ""
 "Syntax: UMODE user modes\n"
 " \n"
@@ -10381,7 +9995,7 @@ msgstr ""
 "Parameters are the same as for the standard /MODE\n"
 "command."
 
-#: language.cpp:4858
+#: modules/core/bs_unassign.cpp:51
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10398,7 +10012,7 @@ msgstr ""
 "ayarlarý saklanýr, böylece istediðinz zaman tekrar ayar \n"
 "yapmaya gerek olmadan kanala bot sokabilirsiniz."
 
-#: language.cpp:4055
+#: modules/core/cs_unban.cpp:62
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10416,7 +10030,7 @@ msgstr ""
 "Varsayýlan olarak, AOP lar ile 5 ve üzeri access seviyesi olanlar\n"
 "kullanabilir."
 
-#: language.cpp:2725
+#: modules/core/ns_group.cpp:235
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10433,7 +10047,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: language.cpp:4145
+#: modules/core/cs_suspend.cpp:143
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10445,7 +10059,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspension."
 
-#: language.cpp:4748
+#: modules/core/os_update.cpp:32
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10459,7 +10073,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:4785
+#: modules/core/os_userlist.cpp:79
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10484,12 +10098,14 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanýmýyla sýnýrlýdýr."
 
-#: language.cpp:3984
+#: modules/core/cs_modes.cpp:180
+#, fuzzy
 msgid ""
-"Syntax: VOICE #channel [nick]\n"
+"Syntax: VOICE [#channel] [nick]\n"
 " \n"
 "Voices a selected nick on a channel. If nick is not given,\n"
-"it will voice you.\n"
+"it will voice you. If channel is not given, it will voice you\n"
+"on every channel.\n"
 " \n"
 "By default, limited to AOPs or those with level 5 access \n"
 "and above on the channel, or to VOPs or those with level 3 \n"
@@ -10504,10 +10120,11 @@ msgstr ""
 "kullanabilir, veya VOP lar ile access seviyesi 3 ve yukarý olanlar\n"
 "kendilerine voice vermek için kullanabilirler."
 
-#: language.cpp:3773
+#: modules/core/cs_xop.cpp:677
+#, fuzzy
 msgid ""
-"Syntax: VOP channel ADD nick\n"
-"        VOP channel DEL {nick | entry-num | list}\n"
+"Syntax: VOP channel ADD mask\n"
+"        VOP channel DEL {mask | entry-num | list}\n"
 "        VOP channel LIST [mask | list]\n"
 "        VOP channel CLEAR\n"
 " \n"
@@ -10575,7 +10192,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %S HELP SET XOP yazarak ulasabilirsiniz."
 
-#: language.cpp:3376
+#: modules/core/cs_saset.cpp:72
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10591,7 +10208,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: language.cpp:3262
+#: modules/core/ns_suspend.cpp:91
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10599,7 +10216,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: language.cpp:3265
+#: modules/core/ns_suspend.cpp:159
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10607,7 +10224,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: language.cpp:2741
+#: modules/core/ns_update.cpp:44
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10619,143 +10236,144 @@ msgstr ""
 "sets needed chanmodes (ModeonID) and updates your vhost and\n"
 "your userflags (lastseentime, etc)."
 
-#: language.cpp:1304
+#: modules/core/cs_topic.cpp:66
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC kanaladi [konu]"
 
-#: language.cpp:388
+#: modules/core/ns_set_kill.cpp:57
 msgid "The IMMED option is not available on this network."
 msgstr "HEMEN seçeneði bu networkte aktif deðil."
 
-#: language.cpp:2111
+#: modules/core/os_akill.cpp:376
 msgid "The AKILL list has been cleared."
 msgstr "AKILL listesi temizlendi."
 
-#: language.cpp:2306
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "The Defcon Level is now at Level: %d"
 
-#: language.cpp:448
+#: modules/core/ns_set_hide.cpp:39
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:450
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: language.cpp:2138
+#: modules/core/os_snline.cpp:391
 msgid "The SNLINE list has been cleared."
 msgstr "SNLINE listesi temizlendi."
 
-#: language.cpp:2165
+#: modules/core/os_sqline.cpp:371
 msgid "The SQLINE list has been cleared."
 msgstr "SQLINE listesi temizlendi."
 
-#: language.cpp:2192
+#: modules/core/os_szline.cpp:373
 msgid "The SZLINE list has been cleared."
 msgstr "SZLINE listesi temizlendi."
 
-#: language.cpp:1322
+#: modules/core/cs_getkey.cpp:39
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: language.cpp:3947
+#: modules/core/cs_access.cpp:698
+#, fuzzy
 msgid ""
-"The following feature/function names are understood.  Note\n"
-"that the levels for AUTODEOP and NOJOIN are maximum levels,\n"
+"The following feature/function names are understood. Note\n"
+"that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 "Aþaðýda seviyeleri deðiþtirilebilecek  fonksiyonlar listelidir.\n"
 "Dikkat edilirse AUTODEOP ve NOJOIN deðerleri maximum, diðerleri\n"
 "minimum seviyelerdir."
 
-#: language.cpp:2393
+#: modules/core/os_session.cpp:159
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Host %s þu anda %d session a sahip ve %d ile limitli."
 
-#: language.cpp:1597
+#: modules/core/ms_check.cpp:58
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "The last memo you sent to %s (sent on %s) has been read."
 
-#: language.cpp:1595
+#: modules/core/ms_check.cpp:56
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "The last memo you sent to %s (sent on %s) has not yet been read."
 
-#: language.cpp:456
+#: modules/core/ns_set_hide.cpp:57
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:458
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: language.cpp:452
+#: modules/core/ns_set_hide.cpp:45
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:454
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1490
+#: modules/core/ms_set.cpp:154
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "%s nickinin mesaj limiti deðiþtirelemez."
 
-#: language.cpp:406
+#: include/language.h:57
 #, c-format
 msgid "The new display for %s MUST be a nickname of the nickname group!"
 msgstr "The new display for %s MUST be a nickname of the nickname group!"
 
-#: language.cpp:372
+#: include/language.h:55
 #, c-format
 msgid "The new display is now %s."
 msgstr "Yeni gösterim %s."
 
-#: language.cpp:2075
+#: modules/core/os_svsnick.cpp:61
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "The nick %s is now being changed to %s."
 
-#: language.cpp:328
+#: modules/core/ns_group.cpp:200
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: language.cpp:460
+#: modules/core/ns_set_hide.cpp:51
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: language.cpp:462
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: language.cpp:1394
+#: src/channels.cpp:138
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "There are %d memos on channel %s."
 
-#: language.cpp:1654
+#: modules/core/bs_botlist.cpp:58
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10763,7 +10381,7 @@ msgstr ""
 "Þu an mevcut bot yok.\n"
 "Server adminine bir tane yaratmasýný söyleyin!"
 
-#: language.cpp:320
+#: modules/core/ns_group.cpp:81
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %R%s HELP GLIST and %R%s HELP DROP\n"
@@ -10773,12 +10391,12 @@ msgstr ""
 "Daha fazla bilgi için /msg %s HELP GLIST ve /msg %s HELP DROP \n"
 "yazin."
 
-#: language.cpp:1396
+#: src/channels.cpp:136
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "There is %d memo on channel %s."
 
-#: language.cpp:1398
+#: include/language.h:93
 msgid ""
 "There is a new memo on channel %s.\n"
 "Type %R%s READ %s %d to read it."
@@ -10786,28 +10404,28 @@ msgstr ""
 "There is a new memo on channel %s.\n"
 "Type /msg %s READ %s %d to read it."
 
-#: language.cpp:1667
+#: modules/core/bs_unassign.cpp:44
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "%s kanalýndan bot çýkarýldý."
 
-#: language.cpp:2495
+#: modules/core/os_news.cpp:38
 msgid "There is no logon news."
 msgstr "Hiç baðlantý haberi yok."
 
-#: language.cpp:2517
+#: modules/core/os_news.cpp:50
 msgid "There is no oper news."
 msgstr "Hiç operatör haberi yok."
 
-#: language.cpp:2537
+#: modules/core/os_news.cpp:62
 msgid "There is no random news."
 msgstr "Hiç karisik haber yok."
 
-#: language.cpp:1482
+#: modules/core/ms_set.cpp:50
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: language.cpp:5091
+#: modules/core/bs_set.cpp:221
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10823,32 +10441,28 @@ msgstr ""
 "                        sokulmasini engeller\n"
 "                        "
 
-#: language.cpp:1334
+#: modules/core/cs_forbid.cpp:77
 msgid "This channel has been forbidden."
 msgstr "This channel has been forbidden."
 
-#: language.cpp:776
+#: src/chanserv.cpp:304 src/chanserv.cpp:334
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Bu kanal %s ile kayýtlýdýr."
 
-#: language.cpp:1344
+#: modules/core/cs_suspend.cpp:62
 msgid "This channel has been suspended."
 msgstr "This channel has been suspended."
 
-#: language.cpp:778
+#: src/regchannel.cpp:747
 msgid "This channel may not be used."
 msgstr "Bu kanal kullanýlamaz."
 
-#: language.cpp:1286
+#: modules/core/cs_info.cpp:104
 msgid "This channel will not expire."
 msgstr "Bu kanal için zaman aþýmý söz konusu deðil."
 
-#: language.cpp:2318
-msgid "This module can not be unloaded."
-msgstr "This module can not be unloaded."
-
-#: language.cpp:663
+#: include/language.h:66
 msgid ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
@@ -10856,7 +10470,7 @@ msgstr ""
 "This nick has already been requested, please check your e-mail address for "
 "the pass code"
 
-#: language.cpp:669
+#: include/language.h:67
 msgid ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
@@ -10864,7 +10478,7 @@ msgstr ""
 "This nick is awaiting an e-mail verification code before completing "
 "registration."
 
-#: language.cpp:269
+#: include/language.h:44
 msgid ""
 "This nick is owned by someone else.  Please choose another.\n"
 "(If this is your nick, type %R%s IDENTIFY password.)"
@@ -10872,20 +10486,20 @@ msgstr ""
 "Bu nick baþkasýna ait. Lütfen baþka bir tane seçin.\n"
 "(Eðer bu sizin nickiniz ise, /msg %s IDENTIFY þifreniz yazýnýz.)"
 
-#: language.cpp:282
+#: include/language.h:49
 msgid "This nickname has been registered; you may not use it."
 msgstr "Bu nick kayýtlýdýr; bunu kullanamazsýnýz."
 
-#: language.cpp:552
+#: modules/core/ns_info.cpp:135
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: language.cpp:550
+#: modules/core/ns_info.cpp:133
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: language.cpp:272
+#: include/language.h:46
 msgid ""
 "This nickname is registered and protected.  If it is your\n"
 "nick, type %R%s IDENTIFY password.  Otherwise,\n"
@@ -10894,15 +10508,15 @@ msgstr ""
 "Bu nick kayýtlý ve korumalýdýr. Eðer bu sizin nickiniz ise, \n"
 "/msg %s IDENTIFY þifreniz yazýnýz. Yada, baþka bir nick seçin."
 
-#: language.cpp:276
+#: src/nickserv.cpp:185
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Bu nick kullanýlamaz.  Lütfen baþka bir tane seçin."
 
-#: language.cpp:548
+#: modules/core/ns_info.cpp:139
 msgid "This nickname will not expire."
 msgstr "Bu nick zaman aþýmýna uðramayacak."
 
-#: language.cpp:266
+#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10910,44 +10524,35 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: language.cpp:1276
+#: modules/core/cs_info.cpp:95
 msgid "Topic Lock"
 msgstr "Topic kilidi"
 
-#: language.cpp:1260
+#: modules/core/cs_info.cpp:83
 msgid "Topic Retention"
 msgstr "Topic hatýrlama"
 
-#: language.cpp:884
-#, c-format
-msgid "Topic lock option for %s is now OFF."
-msgstr "Topic lock option for %s is now OFF."
-
-#: language.cpp:882
-#, c-format
-msgid "Topic lock option for %s is now ON."
+#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now ."
 msgstr "Topic lock option for %s is now ON."
 
-#: language.cpp:878
-#, c-format
-msgid "Topic retention option for %s is now OFF."
-msgstr "Topic retention option for %s is now OFF."
-
-#: language.cpp:876
-#, c-format
-msgid "Topic retention option for %s is now ON."
+#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now ."
 msgstr "Topic retention option for %s is now ON."
 
-#: language.cpp:1616
+#: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Lütfen büyük harf kullanmayýn!"
 
-#: language.cpp:4190
+#: modules/core/ms_help.cpp:42
+#, fuzzy
 msgid ""
 "Type %R%S HELP command for help on any of the\n"
 "above commands.\n"
 "(*) By default, any user with at least level 10 access on a\n"
-"    channel can read that channel's memos.  This can be\n"
+"    channel can read that channel's memos. This can be\n"
 "    changed with the %s LEVELS command."
 msgstr ""
 "Yukardaki herhangi bir komut hakkýnda yardým için \n"
@@ -10957,7 +10562,7 @@ msgstr ""
 "    seviyesi en az 10 olanlar okuyabilir. Bu %s LEVELS \n"
 "    komutuyla deðiþtirebilir."
 
-#: language.cpp:2929
+#: modules/core/ns_saset.cpp:82
 msgid ""
 "Type %R%S HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10967,7 +10572,7 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname."
 
-#: language.cpp:3432
+#: modules/core/cs_saset.cpp:80
 msgid ""
 "Type %R%S HELP SASET option for more information on a\n"
 "particular option."
@@ -10975,7 +10580,7 @@ msgstr ""
 "Type /msg %S HELP SASET option for more information on a\n"
 "particular option."
 
-#: language.cpp:3429
+#: modules/core/cs_set.cpp:84
 msgid ""
 "Type %R%S HELP SET option for more information on a\n"
 "particular option."
@@ -10983,7 +10588,7 @@ msgstr ""
 "Belirli bir özellik hakkýnda daha fazla bilgi için\n"
 "/msg %S HELP özellik yazýn."
 
-#: language.cpp:342
+#: modules/core/ns_identify.cpp:93
 msgid ""
 "Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
 "Your privacy is respected; this e-mail won't be given to\n"
@@ -10993,127 +10598,108 @@ msgstr ""
 "yazýn. Gizliliðiniz korunacaktýr; bu mail adresi herhangi üçüncü \n"
 "þahýslara verilmeyecektir."
 
-#: language.cpp:1388
+#: src/memoserv.cpp:73
 msgid "Type %R%s LIST NEW to list them."
 msgstr "Listelemek için /msg %s LIST NEW yazýn."
 
-#: language.cpp:1386
+#: src/memoserv.cpp:70
 msgid "Type %R%s READ %d to read it."
 msgstr "Okumak için /msg %s READ %d yazýn."
 
-#: language.cpp:1384
+#: src/memoserv.cpp:62
 msgid "Type %R%s READ LAST to read it."
 msgstr "Okumak için /msg %s READ LAST yazýn."
 
-#: language.cpp:2053
+#: modules/core/os_umode.cpp:67
 msgid "UMODE nick modes"
 msgstr "UMODE nick modes"
 
-#: language.cpp:1665
+#: modules/core/bs_unassign.cpp:63
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN kanaladý"
 
-#: language.cpp:1298
+#: modules/core/cs_unban.cpp:74
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN kanaladý [name]"
 
-#: language.cpp:1346
+#: modules/core/cs_suspend.cpp:152
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND channel"
 
-#: language.cpp:651
+#: modules/core/ns_suspend.cpp:166
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: language.cpp:2314
+#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Unable to load module %s"
 
-#: language.cpp:2316
+#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
+#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
+#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Unable to remove module %s"
 
-#: language.cpp:402
+#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: language.cpp:368
+#: include/language.h:54
 #, c-format
 msgid "Unknown SET option %s."
 msgstr "Varolmayan SET özelliði: %s."
 
-#: language.cpp:1931
+#: modules/core/os_stats.cpp:245
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Varolmayan STATS özelliði: %s."
 
-#: language.cpp:145
-#, c-format
-msgid "Unknown command %s."
-msgstr "Varolmayan komut %s."
-
-#: language.cpp:147
+#: src/commands.cpp:60
 msgid "Unknown command %s.  \"%R%s HELP\" for help."
 msgstr "Varolmayan komut %s. yardým için \"/msg %s HELP\" yazýnýz."
 
-#: language.cpp:864
-#, c-format
-msgid "Unknown mode character %c ignored."
+#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#, fuzzy, c-format
+msgid "Unknown mode character %c ignored."
 msgstr "Varolmayan mod karakteri %c yoksayýldý."
 
-#: language.cpp:2222
+#: modules/core/os_set.cpp:185
 #, c-format
 msgid "Unknown option %s."
 msgstr "Varolmayan özellik %s."
 
-#: language.cpp:1806
-msgid ""
-"Unknown option %s.\n"
-"Type %R%S HELP KICK for more information."
-msgstr ""
-"Varolmayan özellik %s.\n"
-"Daha fazla bilgi için /msg %S HELP KICK yazýn."
-
-#: language.cpp:1757
+#: include/language.h:41
+#, fuzzy
 msgid ""
 "Unknown option %s.\n"
-"Type %R%S HELP SET for more information."
+"Type %R%S HELP %s for more information."
 msgstr ""
 "Varolmayan özellik %s.\n"
 "Daha fazla bilgi için /msg %S HELP SET yazýn."
 
-#: language.cpp:5237
-msgid "Updating MySQL."
-msgstr "Updating MySQL."
-
-#: language.cpp:2240
+#: modules/core/os_update.cpp:25
 msgid "Updating databases."
 msgstr "Veritabaný güncelleniyor."
 
-#: language.cpp:2047
+#: modules/core/os_stats.cpp:190
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: language.cpp:2045
+#: modules/core/os_stats.cpp:189
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: language.cpp:5132
-#, c-format
-msgid "User %s not found in the nickserv db."
-msgstr "User %s not found in the nickserv db."
-
-#: language.cpp:1961
+#: modules/core/os_stats.cpp:203
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Kullanýcý  : %6d kayýt, %5d kB"
 
-#: language.cpp:588
+#: include/language.h:64
 msgid ""
 "User claiming your nick has been killed.\n"
 "%R%s RELEASE %s to get it back before %s timeout."
@@ -11121,11 +10707,11 @@ msgstr ""
 "User claiming your nick has been killed.\n"
 "/msg %s RELEASE %s to get it back before %s timeout."
 
-#: language.cpp:1913
+#: src/botserv.cpp:533
 msgid "User matches channel except."
 msgstr "User matches channel except."
 
-#: language.cpp:2272
+#: modules/core/os_userlist.cpp:52
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11133,66 +10719,76 @@ msgstr ""
 "Kullanýcý listesi:\n"
 "Nick                 Mask"
 
-#: language.cpp:1360
-msgid "VOICE #channel [nick]"
+#: modules/core/cs_modes.cpp:194
+#, fuzzy
+msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: language.cpp:1080
+#: modules/core/cs_xop.cpp:718
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: language.cpp:1104
-#, c-format
+#: modules/core/bs_info.cpp:191
+msgid "Voices protection"
+msgstr "Voicelarý koruma"
+
+#: src/memoserv.cpp:78
+#, fuzzy, c-format
 msgid ""
-"VOP list for %s:\n"
-"  Num  Nick"
+"Warning: You are over your maximum number of memos (%d).  You will be unable "
+"to receive any new memos until you delete some of your current ones."
 msgstr ""
-"%s kanali VOP listesi:\n"
-"  Num  Nick"
+"Dikkat: Maksimum mesaj sayýnýzý aþtýnýz (%d).  Þimdiki mesajlarýnýzdan bir "
+"kaçýný silmezseniz yeni mesaj alamayacaksýnýz."
 
-#: language.cpp:1741
-msgid "Voices protection"
-msgstr "Voicelarý koruma"
+#: src/memoserv.cpp:80
+#, fuzzy, c-format
+msgid ""
+"Warning: You have reached your maximum number of memos (%d).  You will be "
+"unable to receive any new memos until you delete some of your current ones."
+msgstr ""
+"Dikkat: Maksimum mesaj sayýnýza ulaþtýnýz (%d).  Þimdiki mesajlarýnýzdan bir "
+"kaçýný silmezseniz yeni mesaj alamayacaksýnýz."
 
-#: language.cpp:1612
+#: src/botserv.cpp:258
 msgid "Watch your language!"
 msgstr "Konuþmalarýna dikkat et!"
 
-#: language.cpp:318
+#: modules/core/ns_group.cpp:75
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "%s grubunun zaten bir üyesisiniz."
 
-#: language.cpp:346
+#: modules/core/ns_identify.cpp:49
 msgid "You are already identified."
 msgstr "You are already identified."
 
-#: language.cpp:1292
+#: modules/core/cs_invite.cpp:61
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
 
-#: language.cpp:2284
+#: modules/core/os_set.cpp:92
 msgid "You are no longer a SuperAdmin"
 msgstr "You are no longer a SuperAdmin"
 
-#: language.cpp:780
+#: include/language.h:69
 msgid "You are not permitted to be on this channel."
 msgstr "Bu kanalda bulunmanýza müsaade yok."
 
-#: language.cpp:1488
+#: modules/core/ms_set.cpp:159
 msgid "You are not permitted to change your memo limit."
 msgstr "Mesaj limitinizi belirlemeye izinli deðilsiniz."
 
-#: language.cpp:2282
+#: modules/core/os_set.cpp:85
 msgid "You are now a SuperAdmin"
 msgstr "You are now a SuperAdmin"
 
-#: language.cpp:2063
+#: modules/core/os_oline.cpp:37
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: language.cpp:694
+#: modules/core/ns_resetpass.cpp:122
 msgid ""
 "You are now identified for your nick. Change your password using \"%R%s SET "
 "PASSWORD newpassword\" now."
@@ -11200,36 +10796,41 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: language.cpp:324
+#: modules/core/ns_group.cpp:126
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "%s grubuna dahil edildiniz."
 
-#: language.cpp:2238
+#: modules/core/os_jupe.cpp:33
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: language.cpp:1601
+#: modules/core/ms_rsend.cpp:34
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: language.cpp:1669
+#: modules/core/bs_unassign.cpp:37
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: language.cpp:141
+#: src/commands.cpp:217
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: language.cpp:599
+#: modules/core/ns_ghost.cpp:42
 msgid "You can't ghost yourself!"
 msgstr "Kendinizi ghost edemezsiniz!"
 
-#: language.cpp:586
+#: modules/core/ns_logout.cpp:36
+#, fuzzy, c-format
+msgid "You can't logout %s because they are a Services Operator."
+msgstr "Can't logout %s because he's a Services Operator."
+
+#: modules/core/ns_recover.cpp:42
 msgid "You can't recover yourself!"
 msgstr "Kendizi recover edemezsiniz!"
 
-#: language.cpp:1111
+#: modules/core/cs_access.cpp:432
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11239,7 +10840,7 @@ msgstr ""
 "Yerine AOP, SOP veya VOP komutlarini kullanin.\n"
 "Daha fazla bilgi için /msg %s HELP komut yazin."
 
-#: language.cpp:1115
+#: modules/core/cs_access.cpp:428
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11249,7 +10850,7 @@ msgstr ""
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
 "Type /msg %s HELP command for more information."
 
-#: language.cpp:959
+#: modules/core/cs_xop.cpp:370
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %R%s HELP ACCESS for more information."
@@ -11257,66 +10858,66 @@ msgstr ""
 "Bu komutu kullanamazsiniz. Yerine ACCESS komutunu kullanin.\n"
 "Daha fazla bilgi için /msg %s HELP ACCESS yazin."
 
-#: language.cpp:1494
+#: modules/core/ms_set.cpp:168
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "%s nickinin mesaj limitini %d sayýsýndan daha fazla yapamazsýnýz."
 
-#: language.cpp:1492
+#: modules/core/ms_set.cpp:170
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Mesaj limitinizi %d sayýsýndan daha fazla yapamazsýnýz."
 
-#: language.cpp:380
+#: modules/core/ns_set_email.cpp:35
 msgid "You cannot unset the e-mail on this network."
 msgstr "E-mail adresini bu networkte silemezsiniz."
 
-#: language.cpp:139
+#: src/commands.cpp:214
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: language.cpp:1520
+#: modules/core/ms_info.cpp:156
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Þu an %d mesajýnýz var, %d tanesi okunmamýþ."
 
-#: language.cpp:1518
+#: modules/core/ms_info.cpp:154
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Þu an %d mesajýnýz var, 1 tanesi okunmamýþ."
 
-#: language.cpp:1516
+#: modules/core/ms_info.cpp:152
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Þu an %d mesajýnýz var."
 
-#: language.cpp:1522
+#: modules/core/ms_info.cpp:150
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Þu an %d mesajýnýz var; hiçbiri okunmamýþ."
 
-#: language.cpp:1514
+#: modules/core/ms_info.cpp:139
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Þu an 1 mesajýnýz var, ve henüz okunmadý."
 
-#: language.cpp:1512
+#: modules/core/ms_info.cpp:141
 msgid "You currently have 1 memo."
 msgstr "Þu an 1 mesajýnýz var."
 
-#: language.cpp:1510
+#: modules/core/ms_info.cpp:135
 msgid "You currently have no memos."
 msgstr "Þu an hiç mesajýnýz yok."
 
-#: language.cpp:1382
+#: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
 msgstr "%d yeni mesajýnýz var."
 
-#: language.cpp:1380
+#: src/memoserv.cpp:60
 msgid "You have 1 new memo."
 msgstr "1 yeni mesajýnýz var."
 
-#: language.cpp:1401
+#: include/language.h:95
 msgid ""
 "You have a new memo from %s.\n"
 "Type %R%s READ %d to read it."
@@ -11324,33 +10925,37 @@ msgstr ""
 "%s nickinden yeni mesajýnýz var.\n"
 "Okumak için /msg %s READ %d yazýn."
 
-#: language.cpp:1294
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: language.cpp:1300
+#: modules/core/cs_unban.cpp:53
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "%s kanalýndaki banýnýz kaldýrýldý."
 
-#: language.cpp:1532
+#: modules/core/ms_info.cpp:174
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Saklayabileceðiniz mesaj sayýsýnda limit yok."
 
-#: language.cpp:1404
+#: include/language.h:97
 msgid "You have no memos."
 msgstr "Hiç mesajýnýz yok."
 
-#: language.cpp:1434
+#: include/language.h:101
 msgid "You have no new memos."
 msgstr "Hiç yeni mesajýnýz yok."
 
-#: language.cpp:2246
+#: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "You have to enter a valid number as time."
 
-#: language.cpp:1605
+#: modules/core/ns_ghost.cpp:47
+msgid "You may not ghost an unidentified user, use RECOVER instead."
+msgstr ""
+
+#: include/language.h:104
 msgid ""
 "You must assign a bot to the channel before using this command.\n"
 "Type %R%S HELP ASSIGN for more information."
@@ -11358,26 +10963,18 @@ msgstr ""
 "Bu komutu kullanmadan önce kanala bir bot sokmalýsýnýz.\n"
 "Daha fazla bilgi için /msg %S HELP ASSIGN yazýn."
 
-#: language.cpp:794
+#: modules/core/cs_register.cpp:48
 msgid "You must be a channel operator to register the channel."
 msgstr ""
 "Kanal kayýt edebilmeniz için kayýt edilmemiþ bir kanala ilk girip op olmanýz "
 "gerekmektedir."
 
-#: language.cpp:306
+#: modules/core/ns_register.cpp:212
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: language.cpp:870
-msgid "You must lock mode +i as well to lock mode +K."
-msgstr "+K modunu kullanabilmek için +i modunuda kullanmalisiniz."
-
-#: language.cpp:868
-msgid "You must lock mode +l as well to lock mode +L."
-msgstr "+L modunu kullanabilmek için +l modunuda kullanmalisiniz."
-
-#: language.cpp:338
+#: modules/core/ns_identify.cpp:90
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11387,40 +10984,40 @@ msgstr ""
 "Bu e-mail adresi þifrenizi unutmanýz halinde þifrenizi\n"
 "isterken kullanýlacaktýr."
 
-#: language.cpp:137
+#: src/commands.cpp:211
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: language.cpp:1536
+#: modules/core/ms_info.cpp:178
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Yeni mesajlar için baðlandýðýnýzda ve size ulaþtýðýnda uyarýlacaksýnýz."
 
-#: language.cpp:1540
+#: modules/core/ms_info.cpp:182
 msgid "You will be notified of new memos at logon."
 msgstr "Yeni mesajlar için baðlandýðýnýzda uyarýlacaksýnýz."
 
-#: language.cpp:1538
+#: modules/core/ms_info.cpp:180
 msgid "You will be notified when new memos arrive."
 msgstr "Yeni mesajlar için ulaþtýklarý anda uyarýlacaksýnýz."
 
-#: language.cpp:1500
+#: modules/core/ms_set.cpp:190
 msgid "You will no longer be able to receive memos."
 msgstr "Limitiniz sýfýr olduðundan artýk mesaj alamayacaksýnýz."
 
-#: language.cpp:1480
+#: modules/core/ms_set.cpp:55
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: language.cpp:1534
+#: modules/core/ms_info.cpp:184
 msgid "You will not be notified of new memos."
 msgstr "Yeni mesajlar için uyarýlmayacaksýnýz."
 
-#: language.cpp:1478
+#: modules/core/ms_set.cpp:47
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: language.cpp:5150
+#: include/language.h:118
 msgid ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
@@ -11428,34 +11025,54 @@ msgstr ""
 "Your IRCD does not support vIdent's, if this is incorrect, please report "
 "this as a possible bug"
 
-#: language.cpp:500
+#: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
-#: language.cpp:1502
+#: modules/core/ns_ajoin.cpp:24
+#, fuzzy
+msgid "Your auto join list is empty."
+msgstr "%s kanalýnýn akick listesi boþ."
+
+#: modules/core/ns_ajoin.cpp:40
+msgid "Your auto join list is full."
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:27
+msgid ""
+"Your auto join list:\n"
+"  Num   Channel      Key"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:74
+#, fuzzy
+msgid "Your memo ignore list is empty."
+msgstr "Ignore listesi boþ."
+
+#: modules/core/ms_set.cpp:197
 msgid "Your memo limit has been disabled."
 msgstr "Mesaj limitiniz kapatýldý."
 
-#: language.cpp:1498
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Mesaj limitiniz %d olarak ayarlandý."
 
-#: language.cpp:1526
+#: modules/core/ms_info.cpp:169
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Mesaj limitiniz %d, ve deðiþtirilemez."
 
-#: language.cpp:1524
+#: modules/core/ms_info.cpp:171
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Mesaj limitiniz %d."
 
-#: language.cpp:1528
+#: modules/core/ms_info.cpp:164
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Mesaj limitiniz 0; hiç mesaj alamayacaksýnýz."
 
-#: language.cpp:1530
+#: modules/core/ms_info.cpp:162
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11463,180 +11080,729 @@ msgstr ""
 "Mesaj limitiniz 0; hiç yeni mesaj alamayacaksýnýz.  Bu limiti "
 "deðiþtiremezsiniz."
 
-#: language.cpp:352
+#: modules/core/ns_logout.cpp:49
 msgid "Your nick has been logged out."
 msgstr "Nickinizin çýkýþý yapýldý."
 
-#: language.cpp:316
+#: modules/core/ns_group.cpp:79
+#, fuzzy
 msgid "Your nick is already registered; type %R%s DROP first."
 msgstr "Nickiniz zaten kayýtlý; önce /msg %s DROP yazýn."
 
-#: language.cpp:326
+#: modules/core/ns_group.cpp:196
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: language.cpp:175
+#: include/language.h:20
 msgid "Your nick isn't registered."
 msgstr "Nickiniz kayýtlý deðil."
 
-#: language.cpp:360
+#: modules/core/ns_drop.cpp:110
 msgid "Your nickname has been dropped."
 msgstr "Nickinizin kaydý silindi (dropped)."
 
-#: language.cpp:284
+#: src/users.cpp:320
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Nickiniz %s olarak deðiþtirildi."
 
-#: language.cpp:665
+#: modules/core/ns_register.cpp:385
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: language.cpp:304
+#: modules/core/ns_register.cpp:64
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
 "Nick Þifreniz %s - Ýlerde kullanacaðýnýz için unutmayýnýz ve kimseye "
 "söylemeyiniz."
 
-#: language.cpp:173
+#: include/language.h:19
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Your password is too long. Please try again with a shorter password."
 
-#: language.cpp:692
+#: modules/core/ns_resetpass.cpp:102
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: language.cpp:5140
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Your vhost of %s is now activated."
 
-#: language.cpp:5142
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Your vhost of %s@%s is now activated."
 
-#: language.cpp:5148
+#: modules/core/hs_off.cpp:34
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
-#: language.cpp:2482
+#: modules/core/os_news.cpp:79
 #, c-format
 msgid "[Logon News - %s] %s"
 msgstr "[Baðlantý Haberleri - %s] %s"
 
-#: language.cpp:2484
+#: modules/core/os_news.cpp:81
 #, c-format
 msgid "[Oper News - %s] %s"
 msgstr "[Operatör Haberleri - %s] %s"
 
-#: language.cpp:2486
+#: modules/core/os_news.cpp:83
 #, c-format
 msgid "[Random News - %s] %s"
 msgstr "[Karisik Haberler - %s] %s"
 
-#: language.cpp:1735
-msgid "disabled"
-msgstr "Kapalý"
-
-#: language.cpp:242
+#: include/language.h:38
 msgid "does not expire"
 msgstr "zaman aþýmý yok"
 
-#: language.cpp:1733
-msgid "enabled"
-msgstr "Aktif"
-
-#: language.cpp:244
+#: src/misc.cpp:311
 msgid "expires at next database update"
 msgstr "bir sonraki veritabaný güncellemesinde zaman aþýmý süresi dolacak"
 
-#: language.cpp:260
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d day"
 msgstr "%d gün sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:258
+#: src/misc.cpp:320
 #, c-format
 msgid "expires in %d days"
 msgstr "%d gün sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:256
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "%d saat, %d dakika sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:254
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "%d saat, %d dakika sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:252
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "%d saat, %d dakika sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:250
+#: src/misc.cpp:334
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "%d saat, %d dakika sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:248
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minute"
 msgstr "%d dakika sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:246
+#: src/misc.cpp:327
 #, c-format
 msgid "expires in %d minutes"
 msgstr "%d dakika sonra zaman aþýmý süresi dolacak"
 
-#: language.cpp:5144
+#: modules/core/hs_del.cpp:38
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost for %s removed."
 
-#: language.cpp:5112
+#: modules/core/hs_set.cpp:90
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost for %s set to %s."
 
-#: language.cpp:5114
+#: modules/core/hs_set.cpp:88
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost for %s set to %s@%s."
 
-#: language.cpp:5116
+#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost for group %s set to %s."
 
-#: language.cpp:5122
+#: modules/core/hs_setall.cpp:97
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost for group %s set to %s@%s."
 
-#: language.cpp:5118
+#: modules/core/hs_delall.cpp:43
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts for group %s have been removed."
 
-#: language.cpp:1278
+#: modules/core/cs_info.cpp:96
 msgid "xOP lists system"
 msgstr "xOP sistemi"
 
-#: language.cpp:941
-#, c-format
-msgid "xOP lists system for %s is now OFF."
-msgstr "xOP lists system for %s is now OFF."
-
-#: language.cpp:939
-#, c-format
-msgid "xOP lists system for %s is now ON."
+#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now ."
 msgstr "xOP lists system for %s is now ON."
 
-#: language.cpp:962
+#: modules/core/cs_set_xop.cpp:31
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
+
+#: src/memoserv.cpp:180
+#, fuzzy
+msgid "{nick | channel} memo-text"
+msgstr "SEND {nick | kanaladý} mesaj"
+
+#~ msgid "%s added to %s AOP list."
+#~ msgstr "%s %s kanalinin AOP listesine eklenmistir."
+
+#~ msgid "%s added to %s HOP list."
+#~ msgstr "%s %s kanali HOP listesine eklendi."
+
+#~ msgid "%s added to %s QOP list."
+#~ msgstr "%s added to %s QOP list."
+
+#~ msgid "%s added to %s SOP list."
+#~ msgstr "%s %s kanali SOP listesine eklendi."
+
+#~ msgid "%s added to %s VOP list."
+#~ msgstr "%s %s kanali VOP listesine eklendi."
+
+#~ msgid "%s deleted from %s HOP list."
+#~ msgstr "%s %s kanali HOP listesinden silindi."
+
+#~ msgid "%s deleted from %s QOP list."
+#~ msgstr "%s deleted from %s QOP list."
+
+#~ msgid "%s deleted from %s SOP list."
+#~ msgstr "%s %s kanali SOP listesinden silindi."
+
+#~ msgid "%s deleted from %s VOP list."
+#~ msgstr "%s %s kanali VOP listesinden silindi."
+
+#~ msgid "%s moved to %s HOP list."
+#~ msgstr "%s moved to %s HOP list."
+
+#~ msgid "%s moved to %s QOP list."
+#~ msgstr "%s moved to %s QOP list."
+
+#~ msgid "%s moved to %s SOP list."
+#~ msgstr "%s moved to %s SOP list."
+
+#~ msgid "%s moved to %s VOP list."
+#~ msgstr "%s moved to %s VOP list."
+
+#~ msgid "%s not found on %s HOP list."
+#~ msgstr "%s %s kanali HOP listesinde bulunamadi."
+
+#~ msgid "%s not found on %s QOP list."
+#~ msgstr "%s not found on %s QOP list."
+
+#~ msgid "%s not found on %s SOP list."
+#~ msgstr "%s %s kanali SOP listesinde bulunamadi."
+
+#~ msgid "%s not found on %s VOP list."
+#~ msgstr "%s %s kanali VOP listesinde bulunamadi."
+
+#, fuzzy
+#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+#~ msgstr "    PERSIST       Set the channel as permanent"
+
+#~ msgid ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+#~ msgstr ""
+#~ "    LANGUAGE   Set the language Services will use when\n"
+#~ "               sending messages to nickname"
+
+#~ msgid ""
+#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
+#~ "                   %R%S LIST"
+#~ msgstr ""
+#~ "    PRIVATE    Nickinizin /msg %S LIST yazýldýðýnda görünmesini\n"
+#~ "                  engeller"
+
+#~ msgid "    SQLSYNC     Import your databases to SQL"
+#~ msgstr "    SQLSYNC     Import your databases to SQL"
+
+#~ msgid "%d days"
+#~ msgstr "%d gün"
+
+#~ msgid "%d hours"
+#~ msgstr "%d saat"
+
+#~ msgid "%d minutes"
+#~ msgstr "%d dakika"
+
+#~ msgid "%d seconds"
+#~ msgstr "%d saniye"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s HOP list is empty."
+#~ msgstr "%s kanali HOP listesi bos."
+
+#~ msgid "%s QOP list is empty."
+#~ msgstr "%s QOP list is empty."
+
+#~ msgid "%s SOP list is empty."
+#~ msgstr "%s kanali SOP listesi bos."
+
+#~ msgid "%s VOP list is empty."
+#~ msgstr "%s kanali VOP listesi bos."
+
+#~ msgid "1 day"
+#~ msgstr "1 gün"
+
+#~ msgid "1 hour"
+#~ msgstr "1 saat"
+
+#~ msgid "1 minute"
+#~ msgstr "1 dakika"
+
+#~ msgid "1 second"
+#~ msgstr "1 saniye"
+
+#, fuzzy
+#~ msgid "Allowed to use CLEARUSERS command"
+#~ msgstr "CLEAR komutunu kullanmaya izinlidir."
+
+#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
+#~ msgstr "HALFOP/DEHALFOP komutlarýný kullanmaya izinlidir."
+
+#~ msgid "Channel %s HOP list has been cleared."
+#~ msgstr "Kanal %s HOP listesi temizlendi."
+
+#~ msgid "Channel %s QOP list has been cleared."
+#~ msgstr "Channel %s QOP list has been cleared."
+
+#~ msgid "Channel %s SOP list has been cleared."
+#~ msgstr "Kanal %s SOP listesi temizlendi."
+
+#~ msgid "Channel %s VOP list has been cleared."
+#~ msgstr "Kanal %s VOP listesi temizlendi."
+
+#~ msgid "Deleted %d entries from %s HOP list."
+#~ msgstr "Deleted %d entries from %s HOP list."
+
+#~ msgid "Deleted %d entries from %s QOP list."
+#~ msgstr "Deleted %d entries from %s QOP list."
+
+#~ msgid "Deleted %d entries from %s SOP list."
+#~ msgstr "Deleted %d entries from %s SOP list."
+
+#~ msgid "Deleted %d entries from %s VOP list."
+#~ msgstr "Silindi %d VOP listesinden kayit %s kanali."
+
+#~ msgid "Deleted 1 entry from %s HOP list."
+#~ msgstr "%s kanali HOP listesinden 1 kayit silindi."
+
+#~ msgid "Deleted 1 entry from %s QOP list."
+#~ msgstr "Deleted 1 entry from %s QOP list."
+
+#~ msgid "Deleted 1 entry from %s SOP list."
+#~ msgstr "%s kanali SOP listesinden 1 kayit silindi."
+
+#~ msgid "Deleted 1 entry from %s VOP list."
+#~ msgstr "%s kanali VOP listesinden 1 kayit silindi."
+
+#~ msgid "E-mail address unset."
+#~ msgstr "E-mail adresi silindi."
+
+#, fuzzy
+#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+#~ msgstr "SOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
+
+#, fuzzy
+#~ msgid "End of entry message list."
+#~ msgstr "Kullanýcý listesi sonu."
+
+#, fuzzy
+#~ msgid "Entry message %i for %s deleted."
+#~ msgstr "%s kanalýnýn giriþ mesajý kaldýrýldý."
+
+#, fuzzy
+#~ msgid "Entry message %s not found on channel %s."
+#~ msgstr "Bot %s kanalýnda deðil."
+
+#, fuzzy
+#~ msgid "Entry message added to %s"
+#~ msgstr "   Giriþ mesajý: %s"
+
+#, fuzzy
+#~ msgid "Entry message list for %s is empty."
+#~ msgstr "Access list for %s is empty."
+
+#, fuzzy
+#~ msgid "Entry message list for %s:"
+#~ msgstr "%s nickinin access listesi:"
+
+#, fuzzy
+#~ msgid "Entry messages for %s have been cleared."
+#~ msgstr "%s kanalýnýn giriþ mesajý deðiþtirildi."
+
+#~ msgid "Fantasy mode is now OFF on channel %s."
+#~ msgstr "Fantazi modu %s kanalýnda KAPALI."
+
+#~ msgid "Greet mode is now OFF on channel %s."
+#~ msgstr "Karþýlama modu %s kanalýnda KAPALI."
+
+#~ msgid ""
+#~ "HOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "%s kanali HOP listesi:\n"
+#~ "  Num  Nick"
+
+#~ msgid ""
+#~ "Hi %s\n"
+#~ " \n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ " \n"
+#~ "Memo text:\n"
+#~ " \n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hi %s\n"
+#~ "\n"
+#~ "You've just received a new memo from %s. This is memo number %d.\n"
+#~ "\n"
+#~ "Memo text:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type %R%s CONFIRM %s\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to have the password for %s reset.\n"
+#~ "To reset your password, type /msg %s CONFIRM %s\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to receive the password of nickname %s by e-mail.\n"
+#~ "The password is %s. For security purposes, you should change it as soon "
+#~ "as you receive this mail.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid ""
+#~ "Hi,\n"
+#~ " \n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" %R%s confirm %s \" to complete registration.\n"
+#~ " \n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ " \n"
+#~ "%s administrators."
+#~ msgstr ""
+#~ "Hi,\n"
+#~ "\n"
+#~ "You have requested to register the nickname %s on %s.\n"
+#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
+#~ "\n"
+#~ "If you don't know why this mail was sent to you, please ignore it "
+#~ "silently.\n"
+#~ "\n"
+#~ "%s administrators."
+
+#~ msgid "Internal error - unable to process request."
+#~ msgstr "Dahili hata - Kullanýcý kaydý bulunamadý."
+
+#~ msgid "Logon news item #%d deleted."
+#~ msgstr "Baðlantý haberleri maddesi #%d silindi."
+
+#~ msgid "Nickname %s not registered."
+#~ msgstr "Nickname %s not registered."
+
+#~ msgid "Nickname Registration (%s)"
+#~ msgstr "Nickname Registration (%s)"
+
+#~ msgid "Nickname password (%s)"
+#~ msgstr "Nick þifresi (%s)"
+
+#~ msgid "No # found in front of channel name."
+#~ msgstr "No # found in front of channel name."
+
+#~ msgid "No Bot mode is now OFF on channel %s."
+#~ msgstr "Bot yok modu %s kanalý için KAPALI."
+
+#~ msgid "No matching entries on %s HOP list."
+#~ msgstr "%s kanali HOP listesinde uyusan kayit bulunamadi."
+
+#~ msgid "No matching entries on %s QOP list."
+#~ msgstr "No matching entries on %s QOP list."
+
+#~ msgid "No matching entries on %s SOP list."
+#~ msgstr "%s kanali SOP listesinde uyusan kayit bulunamadi."
+
+#~ msgid "No matching entries on %s VOP list."
+#~ msgstr "%s kanali VOP listesinde uyusan kayit bulunamadi."
+
+#~ msgid "No such entry (#%d) on %s AOP list."
+#~ msgstr "(#%d) %s kanalinin AOP listesinde böyle bir kayit bulunamadi."
+
+#~ msgid "No such entry (#%d) on %s HOP list."
+#~ msgstr "(#%d) %s kanali HOP listesinde uyusan kayit bulunamadi."
+
+#~ msgid "No such entry (#%d) on %s QOP list."
+#~ msgstr "No such entry (#%d) on %s QOP list."
+
+#~ msgid "No such entry (#%d) on %s SOP list."
+#~ msgstr "(#%d) %s kanali SOP listesinde uyusan kayit bulunamadi."
+
+#~ msgid "No such entry (#%d) on %s VOP list."
+#~ msgstr "(#%d) %s kanali VOP listesinde uyusan kayit bulunamadi."
+
+#~ msgid "Op-notice option for %s is now OFF."
+#~ msgstr "Op-notice option for %s is now OFF."
+
+#~ msgid "Peace option for %s is now OFF."
+#~ msgstr "Peace option for %s is now OFF."
+
+#, fuzzy
+#~ msgid "Please wait %d seconds before requesting a new vHost"
+#~ msgstr "Lütfen %d saniye SEND komutunu tekrar kullanmak için bekleyin."
+
+#~ msgid "Private mode of bot %s is now OFF."
+#~ msgstr "%s botunun özel seçenegi artik KAPALI."
+
+#~ msgid "Private option for %s is now OFF."
+#~ msgstr "Private option for %s is now OFF."
+
+#~ msgid "Private option is now OFF for %s."
+#~ msgstr "Private option is now OFF for %s."
+
+#~ msgid "Protection is now OFF for %s."
+#~ msgstr "Protection is now OFF for %s."
+
+#~ msgid "Protection is now ON, with no delay."
+#~ msgstr "Anýnda kill korumasý: AKTÝF."
+
+#~ msgid ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "QOP list for %s:\n"
+#~ "  Num  Nick"
+
+#~ msgid "REGISTER password [email]"
+#~ msgstr "REGISTER þifreniz [emailiniz]"
+
+#~ msgid "Restricted access option for %s is now OFF."
+#~ msgstr "Restricted access option for %s is now OFF."
+
+#~ msgid ""
+#~ "SOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "%s kanali SOP listesi:\n"
+#~ "  Num  Nick"
+
+#~ msgid "STATUS ERROR Channel %s not registered"
+#~ msgstr "STATUS ERROR Channel %s not registered"
+
+#~ msgid "SUSPEND channel [reason]"
+#~ msgstr "SUSPEND channel [reason]"
+
+#~ msgid "Secure founder option for %s is now OFF."
+#~ msgstr "Secure founder option for %s is now OFF."
+
+#~ msgid "Secure ops option for %s is now OFF."
+#~ msgstr "Secure ops option for %s is now OFF."
+
+#~ msgid "Secure option for %s is now OFF."
+#~ msgstr "Secure option for %s is now OFF."
+
+#~ msgid "Secure option is now OFF for %s."
+#~ msgstr "Secure option is now OFF for %s."
+
+#~ msgid ""
+#~ "Services is unable to change modes.  Are your servers configured "
+#~ "correctly?"
+#~ msgstr ""
+#~ "Servisler mod deðiþtiremiyor.  Serverin doðru ayarlandýðýna emin olun."
+
+#~ msgid "Services up %d day, %02d:%02d"
+#~ msgstr "Servisler %d gündür çalýþýyor, %02d:%02d"
+
+#~ msgid "Services up %d hour, %d minute"
+#~ msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
+
+#~ msgid "Services up %d hour, %d minutes"
+#~ msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
+
+#~ msgid "Services up %d hours, %d minute"
+#~ msgstr "Servisler %d saat, %d dakikadýr çalýþýyor."
+
+#~ msgid "Services up %d minute, %d second"
+#~ msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+
+#~ msgid "Services up %d minute, %d seconds"
+#~ msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+
+#~ msgid "Services up %d minutes, %d second"
+#~ msgstr "Servisler %d dakika, %d saniyedir çalýþýyor."
+
+#~ msgid "Signed kick option for %s is now OFF."
+#~ msgstr "Signed kick option for %s is now OFF."
+
+#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
+#~ msgstr "Kanal HOP listesi degisiklikleri geçici olarak devre disidir."
+
+#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
+#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
+
+#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
+#~ msgstr "Kanal SOP listesi degisikligi geçici olarak devre disidir."
+
+#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
+#~ msgstr "Kanal VOP listesi degisikligi geçici olarak devre disidir."
+
+#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
+#~ msgstr "Bir kanala toplam %d AOP/SOP/VOP kayit edilebilir."
+
+#~ msgid "Symbiosis mode is now OFF on channel %s."
+#~ msgstr "Gerçek bot modu %s kanalýnda KAPALI."
+
+#, fuzzy
+#~ msgid "Syntax: APPENDTOPIC channel text"
+#~ msgstr "Kullanýmý: RANDOMNEWS ADD yazi"
+
+#, fuzzy
+#~ msgid "Syntax: ENFORCE channel [what]"
+#~ msgstr "CLEAR kanaladý neyi"
+
+#, fuzzy
+#~ msgid "Syntax: REQUEST vhost"
+#~ msgstr "Kullanýmý: OPERNEWS ADD yazý"
+
+#~ msgid ""
+#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
+#~ " \n"
+#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
+#~ "and from Services as well as a number of other debugging\n"
+#~ "messages are written to the log file.  If num is\n"
+#~ "given, debug mode is activated, with the debugging level set\n"
+#~ "to num.\n"
+#~ "This option is equivalent to the command-line option\n"
+#~ "-debug."
+#~ msgstr ""
+#~ "Kullanýmý: SET DEBUG {ON | OFF | num}\n"
+#~ "\n"
+#~ "Debug modunu açar yada kapatýr. Debug modunda, servislere \n"
+#~ "gönderilen ve alýnan tüm veriler diðer bir kaç debug \n"
+#~ "mesajlarýyla beraber bir kayýt dosyasýna yazýlýr. Eðer num \n"
+#~ "parametresi belirtilmiþse, debug modu num a baðlý debug \n"
+#~ "seviye ayarý ile aktifleþtirilir.\n"
+#~ "\n"
+#~ "-debug komut satýrý özelliðiyle aynýdýr."
+
+#~ msgid ""
+#~ "Syntax: SQLSYNC\n"
+#~ " \n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+#~ msgstr ""
+#~ "Syntax: SQLSYNC\n"
+#~ "\n"
+#~ "This command syncs your databases with SQL. You should\n"
+#~ "only have to execute this command once, when you initially\n"
+#~ "import your databases into SQL."
+
+#, fuzzy
+#~ msgid "Syntax: WAITING"
+#~ msgstr "Kullanýmý: %s"
+
+#, fuzzy
+#~ msgid "The entry message list for %s is full."
+#~ msgstr "Greet message for %s unset."
+
+#~ msgid "This module can not be unloaded."
+#~ msgstr "This module can not be unloaded."
+
+#~ msgid "Topic lock option for %s is now OFF."
+#~ msgstr "Topic lock option for %s is now OFF."
+
+#~ msgid "Topic retention option for %s is now OFF."
+#~ msgstr "Topic retention option for %s is now OFF."
+
+#~ msgid "Unknown command %s."
+#~ msgstr "Varolmayan komut %s."
+
+#~ msgid ""
+#~ "Unknown option %s.\n"
+#~ "Type %R%S HELP KICK for more information."
+#~ msgstr ""
+#~ "Varolmayan özellik %s.\n"
+#~ "Daha fazla bilgi için /msg %S HELP KICK yazýn."
+
+#~ msgid "Updating MySQL."
+#~ msgstr "Updating MySQL."
+
+#~ msgid "User %s not found in the nickserv db."
+#~ msgstr "User %s not found in the nickserv db."
+
+#~ msgid ""
+#~ "VOP list for %s:\n"
+#~ "  Num  Nick"
+#~ msgstr ""
+#~ "%s kanali VOP listesi:\n"
+#~ "  Num  Nick"
+
+#, fuzzy
+#~ msgid "Your vHost has been requested"
+#~ msgstr "%s botu silindi."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been approved."
+#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
+
+#, fuzzy
+#~ msgid "[auto memo] Your requested vHost has been rejected."
+#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
+
+#, fuzzy
+#~ msgid "[auto memo] vHost %s has been requested."
+#~ msgstr "%s nickine gönderilen son mesaj iptal edildi."
+
+#, fuzzy
+#~ msgid "vHost for %s has been activated"
+#~ msgstr "Your vhost of %s is now activated."
+
+#, fuzzy
+#~ msgid "vHost for %s has been rejected"
+#~ msgstr "%s botu silindi."
+
+#~ msgid "xOP lists system for %s is now OFF."
+#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/language/update.sh b/language/update.sh
new file mode 100755
index 000000000..cbd17f8f3
--- /dev/null
+++ b/language/update.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+rm anope.pot
+touch anope.pot
+
+cd ..
+FILES=`find ./ -name *.cpp -o -name *.h | grep -v /modules/extra/`
+for f in $FILES
+do
+	xgettext -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword=_ $f
+done
+
+cd -
+
+for f in *.po
+do
+	msgmerge -v -s -U $f `echo $f | cut -d'.' -f1`.pot
+done
+
+rm -f *~
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index a9a73e775..0ee3806d0 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory("extra/language")
+
 # Get a list of ALL files and directories within the current directory
 file(GLOB MODULES_FOLDERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
 remove_item_from_list(MODULES_FOLDERS "CMakeFiles")
@@ -75,7 +77,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
             set(WIN32_NO_LIBS)
           endif(WIN32)
           set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${TEMP_LDFLAGS} ${WIN32_NO_LIBS}")
-          add_dependencies(${SO} ${PROGRAM_NAME})
+          add_dependencies(${SO} ${PROGRAM_NAME} module_language)
           # For Windows only, have the module link to the export library of Anope as well as wsock32 and Ws2_32 libraries (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
           if(WIN32)
             target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY} ${TEMP_DEPENDENCIES})
@@ -92,6 +94,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
     # Get a list of ALL files and directories within this modules directory
     file(GLOB SUBMODULE_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${MODULE_FOLDER}/*")
     remove_item_from_list(SUBMODULE_DIRS "CMakeFiles")
+    remove_item_from_list(SUBMODULE_DIRS "extra/language")
 
     foreach(SUBDIR ${SUBMODULE_DIRS})
       if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}")
@@ -169,7 +172,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
           # Generate the module and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand
           add_library(${SO} MODULE ${MODULES_SUBDIR_SRCS})
           set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${SUBDIR_LDFLAGS}")
-          add_dependencies(${SO} ${PROGRAM_NAME})
+          add_dependencies(${SO} ${PROGRAM_NAME} module_language)
           # For Windows only, have the module link to the export library of Anope as well as wsock32 and Ws2_32 libraries (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
           if(WIN32)
              target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY} ${SUBDIR_EXTRA_DEPENDS})
diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp
index c1710c26b..b29e99fac 100644
--- a/modules/core/bs_act.cpp
+++ b/modules/core/bs_act.cpp
@@ -28,19 +28,19 @@ class CommandBSAct : public Command
 
 		if (!check_access(u, ci, CA_SAY))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (!ci->bi)
 		{
-			source.Reply(BOT_NOT_ASSIGNED);
+			source.Reply(LanguageString::BOT_NOT_ASSIGNED);
 			return MOD_CONT;
 		}
 
 		if (!ci->c || !ci->c->FindUser(ci->bi))
 		{
-			source.Reply(BOT_NOT_ON_CHANNEL, ci->name.c_str());
+			source.Reply(LanguageString::BOT_NOT_ON_CHANNEL, ci->name.c_str());
 			return MOD_CONT;
 		}
 
@@ -59,18 +59,21 @@ class CommandBSAct : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "ACT", BOT_ACT_SYNTAX);
+		SyntaxError(source, "ACT", _("ACT \037channel\037 \037text\037"));
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_ACT);
+		source.Reply(_("Syntax: \002ACT \037channel\037 \037text\037\002\n"
+				" \n"
+				"Makes the bot do the equivalent of a \"/me\" command\n"
+				"on the given channel using the given text."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_ACT);
+		source.Reply(_("    ACT            Makes the bot do the equivalent of a \"/me\" command"));
 	}
 };
 
diff --git a/modules/core/bs_assign.cpp b/modules/core/bs_assign.cpp
index 38762259d..4a32c4330 100644
--- a/modules/core/bs_assign.cpp
+++ b/modules/core/bs_assign.cpp
@@ -29,32 +29,32 @@ class CommandBSAssign : public Command
 
 		if (readonly)
 		{
-			source.Reply(BOT_ASSIGN_READONLY);
+			source.Reply(LanguageString::BOT_ASSIGN_READONLY);
 			return MOD_CONT;
 		}
 
 		BotInfo *bi = findbot(nick);
 		if (!bi)
 		{
-			source.Reply(BOT_DOES_NOT_EXIST, nick.c_str());
+			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (ci->botflags.HasFlag(BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->Account()->HasPriv("botserv/administration")))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (bi->HasFlag(BI_PRIVATE) && !u->Account()->HasCommand("botserv/assign/private"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (ci->bi && nick.equals_ci(ci->bi->nick))
 		{
-			source.Reply(BOT_ASSIGN_ALREADY, ci->bi->nick.c_str(), chan.c_str());
+			source.Reply(_("Bot \002%s\002 is already assigned to channel \002%s\002."), ci->bi->nick.c_str(), chan.c_str());
 			return MOD_CONT;
 		}
 
@@ -62,24 +62,28 @@ class CommandBSAssign : public Command
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << bi->nick;
 
 		bi->Assign(u, ci);
-		source.Reply(BOT_ASSIGN_ASSIGNED, bi->nick.c_str(), ci->name.c_str());
+		source.Reply(_("Bot \002%s\002 has been assigned to %s."), bi->nick.c_str(), ci->name.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_ASSIGN);
+		source.Reply(_("Syntax: \002ASSIGN \037chan\037 \037nick\037\002\n"
+				" \n"
+				"Assigns a bot pointed out by nick to the channel chan. You\n"
+				"can then configure the bot for the channel so it fits\n"
+				"your needs."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "ASSIGN", BOT_ASSIGN_SYNTAX);
+		SyntaxError(source, "ASSIGN", _("ASSIGN \037chan\037 \037nick\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_ASSIGN);
+		source.Reply(_("    ASSIGN         Assigns a bot to a channel"));
 	}
 };
 
diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp
index a9b0474c8..5c6dc3efd 100644
--- a/modules/core/bs_badwords.cpp
+++ b/modules/core/bs_badwords.cpp
@@ -25,7 +25,7 @@ class BadwordsListCallback : public NumberList
 	~BadwordsListCallback()
 	{
 		if (!SentHeader)
-			source.Reply(BOT_BADWORDS_NO_MATCH, source.ci->name.c_str());
+			source.Reply(_("No matching entries on %s bad words list."), source.ci->name.c_str());
 	}
 
 	void HandleNumber(unsigned Number)
@@ -36,7 +36,8 @@ class BadwordsListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(BOT_BADWORDS_LIST_HEADER, source.ci->name.c_str());
+			source.Reply(_("Bad words list for %s:\n"
+				"  Num   Word                           Type"), source.ci->name.c_str());
 		}
 
 		DoList(source, Number - 1, source.ci->GetBadWord(Number - 1));
@@ -44,7 +45,7 @@ class BadwordsListCallback : public NumberList
 
 	static void DoList(CommandSource &source, unsigned Number, BadWord *bw)
 	{
-		source.Reply(BOT_BADWORDS_LIST_FORMAT, Number + 1, bw->word.c_str(), bw->type == BW_SINGLE ? "(SINGLE)" : (bw->type == BW_START ? "(START)" : (bw->type == BW_END ? "(END)" : "")));
+		source.Reply(_("  %3d   %-30s %s"), Number + 1, bw->word.c_str(), bw->type == BW_SINGLE ? "(SINGLE)" : (bw->type == BW_START ? "(START)" : (bw->type == BW_END ? "(END)" : "")));
 	}
 };
 
@@ -64,11 +65,11 @@ class BadwordsDelCallback : public NumberList
 	~BadwordsDelCallback()
 	{
 		if (!Deleted)
-			source.Reply(BOT_BADWORDS_NO_MATCH, source.ci->name.c_str());
+			source.Reply(_("No matching entries on %s bad words list."), source.ci->name.c_str());
 		else if (Deleted == 1)
-			source.Reply(BOT_BADWORDS_DELETED_ONE, source.ci->name.c_str());
+			source.Reply(_("Deleted 1 entry from %s bad words list."), source.ci->name.c_str());
 		else
-			source.Reply(BOT_BADWORDS_DELETED_SEVERAL, Deleted, source.ci->name.c_str());
+			source.Reply(_("Deleted %d entries from %s bad words list."), Deleted, source.ci->name.c_str());
 	}
 
 	void HandleNumber(unsigned Number)
@@ -92,7 +93,7 @@ class CommandBSBadwords : public Command
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, this, ci) << "LIST";
 
 		if (!ci->GetBadWordCount())
-			source.Reply(BOT_BADWORDS_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s bad words list is empty."), ci->name.c_str());
 		else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
 			BadwordsListCallback list(source, word);
@@ -112,14 +113,16 @@ class CommandBSBadwords : public Command
 				if (!SentHeader)
 				{
 					SentHeader = true;
-					source.Reply(BOT_BADWORDS_LIST_HEADER, ci->name.c_str());
+					source.Reply(_("Bad words list for %s:\n"
+						"  Num   Word                           Type"), ci->name.c_str());
+
 				}
 
 				BadwordsListCallback::DoList(source, i, bw);
 			}
 
 			if (!SentHeader)
-				source.Reply(BOT_BADWORDS_NO_MATCH, ci->name.c_str());
+				source.Reply(_("No matching entries on %s bad words list."), ci->name.c_str());
 		}
 
 		return MOD_CONT;
@@ -149,7 +152,7 @@ class CommandBSBadwords : public Command
 
 		if (ci->GetBadWordCount() >= Config->BSBadWordsMax)
 		{
-			source.Reply(BOT_BADWORDS_REACHED_LIMIT, Config->BSBadWordsMax);
+			source.Reply(_("Sorry, you can only have %d bad words entries on a channel."), Config->BSBadWordsMax);
 			return MOD_CONT;
 		}
 
@@ -159,7 +162,7 @@ class CommandBSBadwords : public Command
 
 			if (!bw->word.empty() && ((Config->BSCaseSensitive && realword.equals_cs(bw->word)) || (!Config->BSCaseSensitive && realword.equals_ci(bw->word))))
 			{
-				source.Reply(BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 already exists in %s bad words list."), bw->word.c_str(), ci->name.c_str());
 				return MOD_CONT;
 			}
 		}
@@ -168,7 +171,7 @@ class CommandBSBadwords : public Command
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, this, ci) << "ADD " << realword;
 		ci->AddBadWord(realword, type);
 
-		source.Reply(BOT_BADWORDS_ADDED, realword.c_str(), ci->name.c_str());
+		source.Reply(_("\002%s\002 added to %s bad words list."), realword.c_str(), ci->name.c_str());
 
 		return MOD_CONT;
 	}
@@ -197,7 +200,7 @@ class CommandBSBadwords : public Command
 
 			if (i == end)
 			{
-				source.Reply(BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 not found on %s bad words list."), word.c_str(), ci->name.c_str());
 				return MOD_CONT;
 			}
 
@@ -205,7 +208,7 @@ class CommandBSBadwords : public Command
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, this, ci) << "DEL " << badword->word;
 			ci->EraseBadWord(i);
 
-			source.Reply(BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name.c_str());
+			source.Reply(_("\002%s\002 deleted from %s bad words list."), badword->word.c_str(), ci->name.c_str());
 		}
 
 		return MOD_CONT;
@@ -218,7 +221,7 @@ class CommandBSBadwords : public Command
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, this, ci) << "CLEAR";
 
 		ci->ClearBadWords();
-		source.Reply(BOT_BADWORDS_CLEAR);
+		source.Reply(_("Bad words list is now empty."));
 		return MOD_CONT;
 	}
  public:
@@ -242,13 +245,13 @@ class CommandBSBadwords : public Command
 
 		if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->Account()->HasPriv("botserv/administration")))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (readonly)
 		{
-			source.Reply(BOT_BADWORDS_DISABLED);
+			source.Reply(_("Sorry, channel bad words list modification is temporarily disabled."));
 			return MOD_CONT;
 		}
 
@@ -268,18 +271,50 @@ class CommandBSBadwords : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_BADWORDS);
+		source.Reply(_("Syntax: \002BADWORDS \037channel\037 ADD \037word\037 [\037SINGLE\037 | \037START\037 | \037END\037]\002\n"
+				"        \002BADWORDS \037channel\037 DEL {\037word\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002BADWORDS \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002BADWORDS \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002bad words list\002 for a channel. The bad\n"
+				"words list determines which words are to be kicked\n"
+				"when the bad words kicker is enabled. For more information,\n"
+				"type \002%R%S HELP KICK BADWORDS\002.\n"
+				" \n"
+				"The \002BADWORDS ADD\002 command adds the given word to the\n"
+				"badword list. If SINGLE is specified, a kick will be\n"
+				"done only if a user says the entire word. If START is \n"
+				"specified, a kick will be done if a user says a word\n"
+				"that starts with \037word\037. If END is specified, a kick\n"
+				"will be done if a user says a word that ends with\n"
+				"\037word\037. If you don't specify anything, a kick will\n"
+				"be issued every time \037word\037 is said by a user.\n"
+				" \n"
+				"The \002BADWORDS DEL\002 command removes the given word from the\n"
+				"bad words list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				" \n"
+				"The \002BADWORDS LIST\002 command displays the bad words list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002BADWORDS #channel LIST 2-5,7-9\002\n"
+				"      Lists bad words entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				" \n"
+				"The \002BADWORDS CLEAR\002 command clears all entries of the\n"
+				"bad words list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "BADWORDS", BOT_BADWORDS_SYNTAX);
+		SyntaxError(source, "BADWORDS", _("BADWORDS \037channel\037 {ADD|DEL|LIST|CLEAR} [\037word\037 | \037entry-list\037] [SINGLE|START|END]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_BADWORDS);
+		source.Reply(_("    BADWORDS       Maintains bad words list"));
 	}
 };
 
diff --git a/modules/core/bs_bot.cpp b/modules/core/bs_bot.cpp
index 47db2c4ed..a2fa32f0b 100644
--- a/modules/core/bs_bot.cpp
+++ b/modules/core/bs_bot.cpp
@@ -26,60 +26,60 @@ class CommandBSBot : public Command
 
 		if (findbot(nick))
 		{
-			source.Reply(BOT_BOT_ALREADY_EXISTS, nick.c_str());
+			source.Reply(_("Bot \002%s\002 already exists."), nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nick.length() > Config->NickLen)
 		{
-			source.Reply(BOT_BAD_NICK);
+			source.Reply(_("Bot Nicks may only contain valid nick characters."));
 			return MOD_CONT;
 		}
 
 		if (user.length() > Config->UserLen)
 		{
-			source.Reply(BOT_LONG_IDENT, Config->UserLen);
+			source.Reply(_("Bot Idents may only contain %d characters."), Config->UserLen);
 			return MOD_CONT;
 		}
 
 		if (host.length() > Config->HostLen)
 		{
-			source.Reply(BOT_LONG_HOST, Config->HostLen);
+			source.Reply(_("Bot Hosts may only contain %d characters."), Config->HostLen);
 			return MOD_CONT;
 		}
 
 		/* Check the nick is valid re RFC 2812 */
 		if (isdigit(nick[0]) || nick[0] == '-')
 		{
-			source.Reply(BOT_BAD_NICK);
+			source.Reply(_("Bot Nicks may only contain valid nick characters."));
 			return MOD_CONT;
 		}
 
 		for (unsigned i = 0, end = nick.length(); i < end && i < Config->NickLen; ++i)
 			if (!isvalidnick(nick[i]))
 			{
-				source.Reply(BOT_BAD_NICK);
+				source.Reply(_("Bot Nicks may only contain valid nick characters."));
 				return MOD_CONT;
 			}
 
 		/* check for hardcored ircd forbidden nicks */
 		if (!ircdproto->IsNickValid(nick))
 		{
-			source.Reply(BOT_BAD_NICK);
+			source.Reply(_("Bot Nicks may only contain valid nick characters."));
 			return MOD_CONT;
 		}
 
 		/* Check the host is valid re RFC 2812 */
 		if (!isValidHost(host, 3))
 		{
-			source.Reply(BOT_BAD_HOST);
+			source.Reply(_("Bot Hosts may only contain valid host characters."));
 			return MOD_CONT;
 		}
 
 		for (unsigned i = 0, end = user.length(); i < end && i < Config->UserLen; ++i)
 			if (!isalnum(user[i]))
 			{
-				source.Reply(BOT_BAD_IDENT, Config->UserLen);
+				source.Reply(_("Bot Idents may only contain valid characters."), Config->UserLen);
 				return MOD_CONT;
 			}
 
@@ -89,20 +89,20 @@ class CommandBSBot : public Command
 		*/
 		if (findnick(nick))
 		{
-			source.Reply(NICK_ALREADY_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_ALREADY_REGISTERED, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (!(bi = new BotInfo(nick, user, host, real)))
 		{
 			// XXX this cant happen?
-			source.Reply(BOT_BOT_CREATION_FAILED);
+			source.Reply(_("Sorry, bot creation failed."));
 			return MOD_CONT;
 		}
 
 		Log(LOG_ADMIN, source.u, this) << "ADD " << bi->GetMask() << " " << bi->realname;
 
-		source.Reply(BOT_BOT_ADDED, bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
+		source.Reply(_("%s!%s@%s (%s) added to the bot list."), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
 
 		FOREACH_MOD(I_OnBotCreate, OnBotCreate(bi));
 		return MOD_CONT;
@@ -125,37 +125,37 @@ class CommandBSBot : public Command
 
 		if (!(bi = findbot(oldnick)))
 		{
-			source.Reply(BOT_DOES_NOT_EXIST, oldnick.c_str());
+			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, oldnick.c_str());
 			return MOD_CONT;
 		}
 
 		if (!oldnick.equals_ci(nick) && nickIsServices(oldnick, false))
 		{
-			source.Reply(BOT_DOES_NOT_EXIST, oldnick.c_str());
+			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, oldnick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nick.length() > Config->NickLen)
 		{
-			source.Reply(BOT_BAD_NICK);
+			source.Reply(_("Bot Nicks may only contain valid nick characters."));
 			return MOD_CONT;
 		}
 
 		if (!user.empty() && user.length() > Config->UserLen)
 		{
-			source.Reply(BOT_LONG_IDENT, Config->UserLen);
+			source.Reply(_("Bot Idents may only contain %d characters."), Config->UserLen);
 			return MOD_CONT;
 		}
 
 		if (!host.empty() && host.length() > Config->HostLen)
 		{
-			source.Reply(BOT_LONG_HOST, Config->HostLen);
+			source.Reply(_("Bot Hosts may only contain %d characters."), Config->HostLen);
 			return MOD_CONT;
 		}
 
 		if (!oldnick.equals_ci(nick) && nickIsServices(nick, false))
 		{
-			source.Reply(BOT_DOES_NOT_EXIST, oldnick.c_str());
+			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, oldnick.c_str());
 			return MOD_CONT;
 		}
 
@@ -166,34 +166,34 @@ class CommandBSBot : public Command
 		*/
 		if (nick.equals_cs(bi->nick) && (!user.empty() ? user.equals_cs(bi->GetIdent()) : 1) && (!host.empty() ? host.equals_cs(bi->host) : 1) && (!real.empty() ? real.equals_cs(bi->realname) : 1))
 		{
-			source.Reply(BOT_BOT_ANY_CHANGES);
+			source.Reply(_("Old info is equal to the new one."));
 			return MOD_CONT;
 		}
 
 		/* Check the nick is valid re RFC 2812 */
 		if (isdigit(nick[0]) || nick[0] == '-')
 		{
-			source.Reply(BOT_BAD_NICK);
+			source.Reply(_("Bot Nicks may only contain valid nick characters."));
 			return MOD_CONT;
 		}
 
 		for (unsigned i = 0, end = nick.length(); i < end && i < Config->NickLen; ++i)
 			if (!isvalidnick(nick[i]))
 			{
-				source.Reply(BOT_BAD_NICK);
+				source.Reply(_("Bot Nicks may only contain valid nick characters."));
 				return MOD_CONT;
 			}
 
 		/* check for hardcored ircd forbidden nicks */
 		if (!ircdproto->IsNickValid(nick))
 		{
-			source.Reply(BOT_BAD_NICK);
+			source.Reply(_("Bot Nicks may only contain valid nick characters."));
 			return MOD_CONT;
 		}
 
 		if (!host.empty() && !isValidHost(host, 3))
 		{
-			source.Reply(BOT_BAD_HOST);
+			source.Reply(_("Bot Hosts may only contain valid host characters."));
 			return MOD_CONT;
 		}
 
@@ -201,13 +201,13 @@ class CommandBSBot : public Command
 			for (unsigned i = 0, end = user.length(); i < end && i < Config->UserLen; ++i)
 				if (!isalnum(user[i]))
 				{
-					source.Reply(BOT_BAD_IDENT, Config->UserLen);
+					source.Reply(_("Bot Idents may only contain valid characters."), Config->UserLen);
 					return MOD_CONT;
 				}
 
 		if (!nick.equals_ci(bi->nick) && findbot(nick))
 		{
-			source.Reply(BOT_BOT_ALREADY_EXISTS, nick.c_str());
+			source.Reply(_("Bot \002%s\002 already exists."), nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -219,7 +219,7 @@ class CommandBSBot : public Command
 			*/
 			if (findnick(nick))
 			{
-				source.Reply(NICK_ALREADY_REGISTERED, nick.c_str());
+				source.Reply(LanguageString::NICK_ALREADY_REGISTERED, nick.c_str());
 				return MOD_CONT;
 			}
 
@@ -262,7 +262,7 @@ class CommandBSBot : public Command
 			bi->RejoinAll();
 		}
 
-		source.Reply(BOT_BOT_CHANGED, oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
+		source.Reply(_("Bot \002%s\002 has been changed to %s!%s@%s (%s)"), oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
 		Log(LOG_ADMIN, source.u, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname;
 
 		FOREACH_MOD(I_OnBotChange, OnBotChange(bi));
@@ -282,13 +282,13 @@ class CommandBSBot : public Command
 
 		if (!(bi = findbot(nick)))
 		{
-			source.Reply(BOT_DOES_NOT_EXIST, nick.c_str());
+			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nickIsServices(nick, false))
 		{
-			source.Reply(BOT_DOES_NOT_EXIST, nick.c_str());
+			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -296,7 +296,7 @@ class CommandBSBot : public Command
 
 		Log(LOG_ADMIN, source.u, this) << "DEL " << bi->nick;
 
-		source.Reply(BOT_BOT_DELETED, nick.c_str());
+		source.Reply(_("Bot \002%s\002 has been deleted."), nick.c_str());
 		delete bi;
 		return MOD_CONT;
 	}
@@ -313,7 +313,7 @@ class CommandBSBot : public Command
 
 		if (readonly)
 		{
-			source.Reply(BOT_BOT_READONLY);
+			source.Reply(_("Sorry, bot modification is temporarily disabled."));
 			return MOD_CONT;
 		}
 
@@ -322,7 +322,7 @@ class CommandBSBot : public Command
 			// ADD nick user host real - 5
 			if (!u->Account()->HasCommand("botserv/bot/add"))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
@@ -345,7 +345,7 @@ class CommandBSBot : public Command
 			// but only oldn and newn are required
 			if (!u->Account()->HasCommand("botserv/bot/change"))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
@@ -362,7 +362,7 @@ class CommandBSBot : public Command
 			// DEL nick
 			if (!u->Account()->HasCommand("botserv/bot/del"))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
@@ -382,18 +382,38 @@ class CommandBSBot : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_SERVADMIN_HELP_BOT);
+		source.Reply(_("Syntax: \002BOT ADD \037nick\037 \037user\037 \037host\037 \037real\037\002\n"
+				"        \002BOT CHANGE \037oldnick\037 \037newnick\037 [\037user\037 [\037host\037 [\037real\037]]]\002\n"
+				"        \002BOT DEL \037nick\037\002\n"
+				" \n"
+				"Allows Services Operators to create, modify, and delete\n"
+				"bots that users will be able to use on their own\n"
+				"channels.\n"
+				" \n"
+				"\002BOT ADD\002 adds a bot with the given nickname, username,\n"
+				"hostname and realname. Since no integrity checks are done \n"
+				"for these settings, be really careful.\n"
+				"\002BOT CHANGE\002 allows to change nickname, username, hostname\n"
+				"or realname of a bot without actually delete it (and all\n"
+				"the data associated with it).\n"
+				"\002BOT DEL\002 removes the given bot from the bot list.  \n"
+				" \n"
+				"\002Note\002: you cannot create a bot that has a nick that is\n"
+				"currently registered. If an unregistered user is currently\n"
+				"using the nick, they will be killed."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "BOT", BOT_BOT_SYNTAX);
+		SyntaxError(source, "BOT", _("BOT ADD \037nick\037 \037user\037 \037host\037 \037real\037\n"
+			"\002BOT CHANGE \037oldnick\037 \037newnick\037 [\037user\037 [\037host\037 [\037real\037]]]\002\n"
+			"\002BOT DEL \037nick\037\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_BOT);
+		source.Reply(_("    BOT            Maintains network bot list"));
 	}
 };
 
diff --git a/modules/core/bs_botlist.cpp b/modules/core/bs_botlist.cpp
index 37901a4a0..5166e4365 100644
--- a/modules/core/bs_botlist.cpp
+++ b/modules/core/bs_botlist.cpp
@@ -25,12 +25,6 @@ class CommandBSBotList : public Command
 		User *u = source.u;
 		unsigned count = 0;
 
-		if (BotListByNick.empty())
-		{
-			source.Reply(BOT_BOTLIST_EMPTY);
-			return MOD_CONT;
-		}
-
 		for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 		{
 			BotInfo *bi = *it;
@@ -38,7 +32,7 @@ class CommandBSBotList : public Command
 			if (!bi->HasFlag(BI_PRIVATE))
 			{
 				if (!count)
-					source.Reply(BOT_BOTLIST_HEADER);
+					source.Reply(_("Bot list:"));
 				++count;
 				source.Reply("   %-15s  (%s@%s)", bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str());
 			}
@@ -46,7 +40,7 @@ class CommandBSBotList : public Command
 
 		if (u->Account()->HasCommand("botserv/botlist") && count < BotListByNick.size())
 		{
-			source.Reply(BOT_BOTLIST_PRIVATE_HEADER);
+			source.Reply(_("Bots reserved to IRC operators:"));
 
 			for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 			{
@@ -61,22 +55,25 @@ class CommandBSBotList : public Command
 		}
 
 		if (!count)
-			source.Reply(BOT_BOTLIST_EMPTY);
+			source.Reply(_("There are no bots available at this time.\n"
+					"Ask a Services Operator to create one!"));
 		else
-			source.Reply(BOT_BOTLIST_FOOTER, count);
+			source.Reply(_("%d bots available."), count);
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_BOTLIST);
+		source.Reply(_("Syntax: \002BOTLIST\002\n"
+				" \n"
+				"Lists all available bots on this network."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_BOTLIST);
+		source.Reply(_("    BOTLIST        Lists available bots"));
 	}
 };
 
diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp
index 9c2998342..ff669e82a 100644
--- a/modules/core/bs_help.cpp
+++ b/modules/core/bs_help.cpp
@@ -32,11 +32,20 @@ class CommandBSHelp : public Command
 	{
 		// Abuse syntax error to display general list help.
 		User *u = source.u;
-		source.Reply(BOT_HELP);
+		source.Reply(_("\002%S\002 allows you to have a bot on your own channel.\n"
+				"It has been created for users that can't host or\n"
+				"configure a bot, or for use on networks that don't\n"
+				"allow user bots. Available commands are listed \n"
+				"below; to use them, type \002%R%S \037command\037\002.  For \n"
+				"more information on a specific command, type \002%R\n"
+				"%S HELP \037command\037\002."));
 		for (CommandMap::const_iterator it = BotServ->Commands.begin(), it_end = BotServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
-		source.Reply(BOT_HELP_FOOTER, Config->BSMinUsers, Config->s_ChanServ.c_str(), Config->BSFantasyCharacter[0]);
+		source.Reply(_("Bot will join a channel whenever there is at least\n"
+				"\002%d\002 user(s) on it. Additionally, all %s commands\n"
+				"can be used if fantasy is enabled by prefixing the command\n"
+				"name with a %c."), Config->BSMinUsers, Config->s_ChanServ.c_str(), Config->BSFantasyCharacter[0]);
 	}
 };
 
diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp
index f9dc499ed..123083f41 100644
--- a/modules/core/bs_info.cpp
+++ b/modules/core/bs_info.cpp
@@ -57,12 +57,12 @@ class CommandBSInfo : public Command
 		ChannelInfo *ci;
 		if (bi)
 		{
-			source.Reply(BOT_INFO_BOT_HEADER, bi->nick.c_str());
-			source.Reply(BOT_INFO_BOT_MASK, bi->GetIdent().c_str(), bi->host.c_str());
-			source.Reply(BOT_INFO_BOT_REALNAME, bi->realname.c_str());
-			source.Reply(BOT_INFO_BOT_CREATED, do_strftime(bi->created).c_str());
-			source.Reply(BOT_INFO_BOT_OPTIONS, GetString(u, (bi->HasFlag(BI_PRIVATE) ? NICK_INFO_OPT_PRIVATE : NICK_INFO_OPT_NONE)).c_str());
-			source.Reply(BOT_INFO_BOT_USAGE, bi->chancount);
+			source.Reply(_("Information for bot \002%s\002:"), bi->nick.c_str());
+			source.Reply(_("       Mask : %s@%s"), bi->GetIdent().c_str(), bi->host.c_str());
+			source.Reply(_("  Real name : %s"), bi->realname.c_str());
+			source.Reply(_("    Created : %s"), do_strftime(bi->created).c_str());
+			source.Reply(_("    Options : %s"), bi->HasFlag(BI_PRIVATE) ? _("Private") : _("None"));
+			source.Reply(_("    Used on : %d channel(s)"), bi->chancount);
 
 			if (u->Account()->HasPriv("botserv/administration"))
 				this->send_bot_channels(source, bi);
@@ -71,167 +71,173 @@ class CommandBSInfo : public Command
 		{
 			if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("botserv/administration"))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
-			source.Reply(CHAN_INFO_HEADER, ci->name.c_str());
+			source.Reply(LanguageString::CHAN_INFO_HEADER, ci->name.c_str());
 			if (ci->bi)
-				source.Reply(BOT_INFO_CHAN_BOT, ci->bi->nick.c_str());
+				source.Reply(_("           Bot nick : %s"), ci->bi->nick.c_str());
 			else
-				source.Reply(BOT_INFO_CHAN_BOT_NONE);
+				source.Reply(_("           Bot nick : not assigned yet."));
 
 			if (ci->botflags.HasFlag(BS_KICK_BADWORDS))
 			{
 				if (ci->ttb[TTB_BADWORDS])
-					source.Reply(BOT_INFO_CHAN_KICK_BADWORDS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_BADWORDS]);
+					source.Reply(_("   Bad words kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_BADWORDS]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_BADWORDS, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("   Bad words kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_BADWORDS, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("   Bad words kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_BOLDS))
 			{
 				if (ci->ttb[TTB_BOLDS])
-					source.Reply(BOT_INFO_CHAN_KICK_BOLDS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_BOLDS]);
+					source.Reply(_("       Bolds kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_BOLDS]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_BOLDS, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("       Bolds kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_BOLDS, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("       Bolds kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_CAPS))
 			{
 				if (ci->ttb[TTB_CAPS])
-					source.Reply(BOT_INFO_CHAN_KICK_CAPS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent);
+					source.Reply(_("        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_CAPS_ON, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->capsmin, ci->capspercent);
+					source.Reply(_("        Caps kicker : %s (minimum %d/%d%%)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->capsmin, ci->capspercent);
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_CAPS_OFF, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("        Caps kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_COLORS))
 			{
 				if (ci->ttb[TTB_COLORS])
-					source.Reply(BOT_INFO_CHAN_KICK_COLORS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_COLORS]);
+					source.Reply(_("      Colors kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_COLORS]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_COLORS, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("      Colors kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_COLORS, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("      Colors kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_FLOOD))
 			{
 				if (ci->ttb[TTB_FLOOD])
-					source.Reply(BOT_INFO_CHAN_KICK_FLOOD_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs);
+					source.Reply(_("       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_FLOOD_ON, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->floodlines, ci->floodsecs);
+					source.Reply(_("       Flood kicker : %s (%d lines in %ds)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->floodlines, ci->floodsecs);
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_FLOOD_OFF, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("       Flood kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_REPEAT))
 			{
 				if (ci->ttb[TTB_REPEAT])
-					source.Reply(BOT_INFO_CHAN_KICK_REPEAT_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_REPEAT], ci->repeattimes);
+					source.Reply(_("      Repeat kicker : %s (%d kick(s) to ban; %d times)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_REPEAT], ci->repeattimes);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_REPEAT_ON, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->repeattimes);
+					source.Reply(_("      Repeat kicker : %s (%d times)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->repeattimes);
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_REPEAT_OFF, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("      Repeat kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_REVERSES))
 			{
 				if (ci->ttb[TTB_REVERSES])
-					source.Reply(BOT_INFO_CHAN_KICK_REVERSES_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_REVERSES]);
+					source.Reply(_("    Reverses kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_REVERSES]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_REVERSES, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("    Reverses kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_REVERSES, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("    Reverses kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_UNDERLINES))
 			{
 				if (ci->ttb[TTB_UNDERLINES])
-					source.Reply(BOT_INFO_CHAN_KICK_UNDERLINES_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_UNDERLINES]);
+					source.Reply(_("  Underlines kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_UNDERLINES]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_UNDERLINES, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("  Underlines kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_UNDERLINES, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("  Underlines kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
                         if (ci->botflags.HasFlag(BS_KICK_ITALICS))
 			{
 				if (ci->ttb[TTB_ITALICS])
-					source.Reply(BOT_INFO_CHAN_KICK_ITALICS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_ITALICS]);
+					source.Reply(_("     Italics kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_ITALICS]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_ITALICS, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("     Italics kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_ITALICS, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("     Italics kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 			if (ci->botflags.HasFlag(BS_KICK_AMSGS))
 			{
 				if (ci->ttb[TTB_AMSGS])
-					source.Reply(BOT_INFO_CHAN_KICK_AMSGS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_AMSGS]);
+					source.Reply(_("     AMSG kicker    : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_AMSGS]);
 				else
-					source.Reply(BOT_INFO_CHAN_KICK_AMSGS, GetString(u, BOT_INFO_ACTIVE).c_str());
+					source.Reply(_("     AMSG kicker    : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
 			}
 			else
-				source.Reply(BOT_INFO_CHAN_KICK_AMSGS, GetString(u, BOT_INFO_INACTIVE).c_str());
+				source.Reply(_("     AMSG kicker    : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
 
 			if (ci->botflags.HasFlag(BS_MSG_PRIVMSG))
-				source.Reply(BOT_INFO_CHAN_MSG, "PRIVMSG");
+				source.Reply(_("      Fantasy reply : %s"), "PRIVMSG");
 			else if (ci->botflags.HasFlag(BS_MSG_NOTICE))
-				source.Reply(BOT_INFO_CHAN_MSG, "NOTICE");
+				source.Reply(_("      Fantasy reply : %s"), "NOTICE");
 			else if (ci->botflags.HasFlag(BS_MSG_NOTICEOPS))
-				source.Reply(BOT_INFO_CHAN_MSG, "NOTICEOPS");
+				source.Reply(_("      Fantasy reply : %s"), "NOTICEOPS");
 			
 			end = buf;
 			*end = 0;
 			if (ci->botflags.HasFlag(BS_DONTKICKOPS))
 			{
-				end += snprintf(end, sizeof(buf) - (end - buf), "%s", GetString(u, BOT_INFO_OPT_DONTKICKOPS).c_str());
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s", GetString(u->Account(), _("Ops protection")).c_str());
 				need_comma = true;
 			}
 			if (ci->botflags.HasFlag(BS_DONTKICKVOICES))
 			{
-				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_DONTKICKVOICES).c_str());
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u->Account(), _("Voices protection")).c_str());
 				need_comma = true;
 			}
 			if (ci->botflags.HasFlag(BS_FANTASY))
 			{
-				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_FANTASY).c_str());
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u->Account(), _("Fantasy")).c_str());
 				need_comma = true;
 			}
 			if (ci->botflags.HasFlag(BS_GREET))
 			{
-				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_GREET).c_str());
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u->Account(), _("Greet")).c_str());
 				need_comma = true;
 			}
 			if (ci->botflags.HasFlag(BS_NOBOT))
 			{
-				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_NOBOT).c_str());
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u->Account(), _("No bot")).c_str());
 				need_comma = true;
 			}
 			if (ci->botflags.HasFlag(BS_SYMBIOSIS))
 			{
-				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_SYMBIOSIS).c_str());
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u->Account(), _("Symbiosis")).c_str());
 				need_comma = true;
 			}
-			source.Reply(BOT_INFO_CHAN_OPTIONS, *buf ? buf : GetString(u, BOT_INFO_OPT_NONE).c_str());
+			source.Reply(_("            Options : %s"), *buf ? buf : GetString(u->Account(), _("None")).c_str());
 		}
 		else
-			source.Reply(BOT_INFO_NOT_FOUND, query.c_str());
+			source.Reply(_("\002%s\002 is not a valid bot or registered channel."), query.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_INFO);
+		source.Reply(_("Syntax: \002INFO {\037chan\037 | \037nick\037}\002\n"
+				" \n"
+				"Allows you to see %S information about a channel or a bot.\n"
+				"If the parameter is a channel, then you'll get information\n"
+				"such as enabled kickers. If the parameter is a nick,\n"
+				"you'll get information about a bot, such as creation\n"
+				"time or number of channels it is on."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "INFO", BOT_INFO_SYNTAX);
+		SyntaxError(source, "INFO", _("INFO {\037chan\037 | \037nick\037}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_INFO);
+		source.Reply(_("    INFO           Allows you to see BotServ information about a channel or a bot"));
 	}
 };
 
diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp
index eba5de508..67bd2ca05 100644
--- a/modules/core/bs_kick.cpp
+++ b/modules/core/bs_kick.cpp
@@ -32,15 +32,15 @@ class CommandBSKick : public Command
 		ChannelInfo *ci = source.ci;
 
 		if (readonly)
-			source.Reply(BOT_KICK_DISABLED);
+			source.Reply(_("Sorry, kicker configuration is temporarily disabled."));
 		else if (chan.empty() || option.empty() || value.empty())
-			SyntaxError(source, "KICK", BOT_KICK_SYNTAX);
+			SyntaxError(source, "KICK", _("KICK \037channel\037 \037option\037 {\037ON|\037} [\037settings\037]"));
 		else if (!value.equals_ci("ON") && !value.equals_ci("OFF"))
-			SyntaxError(source, "KICK", BOT_KICK_SYNTAX);
+			SyntaxError(source, "KICK", _("KICK \037channel\037 \037option\037 {\037ON|\037} [\037settings\037]"));
 		else if (!check_access(u, ci, CA_SET) && !u->Account()->HasPriv("botserv/administration"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!ci->bi)
-			source.Reply(BOT_NOT_ASSIGNED);
+			source.Reply(LanguageString::BOT_NOT_ASSIGNED);
 		else
 		{
 			bool override = !check_access(u, ci, CA_SET);
@@ -61,7 +61,7 @@ class CommandBSKick : public Command
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BADWORDS];
 							/* reset the value back to 0 - TSL */
 							ci->ttb[TTB_BADWORDS] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -69,14 +69,17 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_BADWORDS] = 0;
 					ci->botflags.SetFlag(BS_KICK_BADWORDS);
 					if (ci->ttb[TTB_BADWORDS])
-						source.Reply(BOT_KICK_BADWORDS_ON_BAN, ci->ttb[TTB_BADWORDS]);
+						source.Reply(_("Bot will now kick \002bad words\002, and will place a ban after \n"
+											"%d kicks for the same user. Use the BADWORDS command\n"
+											"to add or remove a bad word."), ci->ttb[TTB_BADWORDS]);
 					else
-						source.Reply(BOT_KICK_BADWORDS_ON);
+						source.Reply(_("Bot will now kick \002bad words\002. Use the BADWORDS command\n"
+								"to add or remove a bad word."));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_BADWORDS);
-					source.Reply(BOT_KICK_BADWORDS_OFF);
+					source.Reply(_("Bot won't kick \002bad words\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("BOLDS"))
@@ -91,7 +94,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BOLDS];
 							ci->ttb[TTB_BOLDS] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -99,14 +102,14 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_BOLDS] = 0;
 					ci->botflags.SetFlag(BS_KICK_BOLDS);
 					if (ci->ttb[TTB_BOLDS])
-						source.Reply(BOT_KICK_BOLDS_ON_BAN, ci->ttb[TTB_BOLDS]);
+						source.Reply(_("Bot will now kick \002bolds\002, and will place a ban after\n%d kicks to the same user."), ci->ttb[TTB_BOLDS]);
 					else
-						source.Reply(BOT_KICK_BOLDS_ON);
+						source.Reply(_("Bot will now kick \002bolds\002."));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_BOLDS);
-					source.Reply(BOT_KICK_BOLDS_OFF);
+					source.Reply(_("Bot won't kick \002bolds\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("CAPS"))
@@ -124,7 +127,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_CAPS];
 							ci->ttb[TTB_CAPS] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -147,14 +150,17 @@ class CommandBSKick : public Command
 
 					ci->botflags.SetFlag(BS_KICK_CAPS);
 					if (ci->ttb[TTB_CAPS])
-						source.Reply(BOT_KICK_CAPS_ON_BAN, ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]);
+						source.Reply(_("Bot will now kick \002caps\002 (they must constitute at least\n"
+								"%d characters and %d%% of the entire message), and will \n"
+								"place a ban after %d kicks for the same user."), ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]);
 					else
-						source.Reply(BOT_KICK_CAPS_ON, ci->capsmin, ci->capspercent);
+						source.Reply(_("Bot will now kick \002caps\002 (they must constitute at least\n"
+								"%d characters and %d%% of the entire message)."), ci->capsmin, ci->capspercent);
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_CAPS);
-					source.Reply(BOT_KICK_CAPS_OFF);
+					source.Reply(_("Bot won't kick \002caps\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("COLORS"))
@@ -169,7 +175,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_COLORS];
 							ci->ttb[TTB_COLORS] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -177,14 +183,14 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_COLORS] = 0;
 					ci->botflags.SetFlag(BS_KICK_COLORS);
 					if (ci->ttb[TTB_COLORS])
-						source.Reply(BOT_KICK_COLORS_ON_BAN, ci->ttb[TTB_COLORS]);
+						source.Reply(_("Bot will now kick \002colors\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_COLORS]);
 					else
-						source.Reply(BOT_KICK_COLORS_ON);
+						source.Reply(_("Bot will now kick \002colors\002."));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_COLORS);
-					source.Reply(BOT_KICK_COLORS_OFF);
+					source.Reply(_("Bot won't kick \002colors\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("FLOOD"))
@@ -202,7 +208,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_FLOOD];
 							ci->ttb[TTB_FLOOD] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -225,14 +231,14 @@ class CommandBSKick : public Command
 
 					ci->botflags.SetFlag(BS_KICK_FLOOD);
 					if (ci->ttb[TTB_FLOOD])
-						source.Reply(BOT_KICK_FLOOD_ON_BAN, ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]);
+						source.Reply(_("Bot will now kick \002flood\002 (%d lines in %d seconds and\nwill place a ban after %d kicks for the same user."), ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]);
 					else
-						source.Reply(BOT_KICK_FLOOD_ON, ci->floodlines, ci->floodsecs);
+						source.Reply(_("Bot will now kick \002flood\002 (%d lines in %d seconds)."), ci->floodlines, ci->floodsecs);
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_FLOOD);
-					source.Reply(BOT_KICK_FLOOD_OFF);
+					source.Reply(_("Bot won't kick \002flood\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("REPEAT"))
@@ -249,7 +255,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REPEAT];
 							ci->ttb[TTB_REPEAT] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -265,14 +271,17 @@ class CommandBSKick : public Command
 
 					ci->botflags.SetFlag(BS_KICK_REPEAT);
 					if (ci->ttb[TTB_REPEAT])
-						source.Reply(BOT_KICK_REPEAT_ON_BAN, ci->repeattimes, ci->ttb[TTB_REPEAT]);
+						source.Reply(_("Bot will now kick \002repeats\002 (users that say %d times\n"
+								"the same thing), and will place a ban after %d \n"
+								"kicks for the same user."), ci->repeattimes, ci->ttb[TTB_REPEAT]);
 					else
-						source.Reply(BOT_KICK_REPEAT_ON, ci->repeattimes);
+						source.Reply(_("Bot will now kick \002repeats\002 (users that say %d times\n"
+							"the same thing)."), ci->repeattimes);
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_REPEAT);
-					source.Reply(BOT_KICK_REPEAT_OFF);
+					source.Reply(_("Bot won't kick \002repeats\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("REVERSES"))
@@ -287,7 +296,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REVERSES];
 							ci->ttb[TTB_REVERSES] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -295,14 +304,14 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_REVERSES] = 0;
 					ci->botflags.SetFlag(BS_KICK_REVERSES);
 					if (ci->ttb[TTB_REVERSES])
-						source.Reply(BOT_KICK_REVERSES_ON_BAN, ci->ttb[TTB_REVERSES]);
+						source.Reply(_("Bot will now kick \002reverses\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_REVERSES]);
 					else
-						source.Reply(BOT_KICK_REVERSES_ON);
+						source.Reply(_("Bot will now kick \002reverses\002."));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_REVERSES);
-					source.Reply(BOT_KICK_REVERSES_OFF);
+					source.Reply(_("Bot won't kick \002reverses\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("UNDERLINES"))
@@ -317,7 +326,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_UNDERLINES];
 							ci->ttb[TTB_UNDERLINES] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -325,14 +334,14 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_UNDERLINES] = 0;
 					ci->botflags.SetFlag(BS_KICK_UNDERLINES);
 					if (ci->ttb[TTB_UNDERLINES])
-						source.Reply(BOT_KICK_UNDERLINES_ON_BAN, ci->ttb[TTB_UNDERLINES]);
+						source.Reply(_("Bot will now kick \002underlines\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_UNDERLINES]);
 					else
-						source.Reply(BOT_KICK_UNDERLINES_ON);
+						source.Reply(_("Bot will now kick \002underlines\002."));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_UNDERLINES);
-					source.Reply(BOT_KICK_UNDERLINES_OFF);
+					source.Reply(_("Bot won't kick \002underlines\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("ITALICS"))
@@ -347,7 +356,7 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_ITALICS];
 							ci->ttb[TTB_ITALICS] = 0;
-							source.Reply(BOT_KICK_BAD_TTB, ttb.c_str());
+							source.Reply(_("\002%s\002 cannot be taken as times to ban."), ttb.c_str());
 							return MOD_CONT;
 						}
 					}
@@ -355,14 +364,14 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_ITALICS] = 0;
 					ci->botflags.SetFlag(BS_KICK_ITALICS);
 					if (ci->ttb[TTB_ITALICS])
-						source.Reply(BOT_KICK_ITALICS_ON_BAN, ci->ttb[TTB_ITALICS]);
+						source.Reply(_("Bot will now kick \002italics\002, and will place a ban after\n%d kicks for the same user."), ci->ttb[TTB_ITALICS]);
 					else
-						source.Reply(BOT_KICK_ITALICS_ON);
+						source.Reply(_("Bot will now kick \002italics\002."));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_ITALICS);
-					source.Reply(BOT_KICK_ITALICS_OFF);
+					source.Reply(_("Bot won't kick \002italics\002 anymore."));
 				}
 			}
 			else if (option.equals_ci("AMSGS"))
@@ -377,7 +386,6 @@ class CommandBSKick : public Command
 						{
 							Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_ITALICS];
 							ci->ttb[TTB_AMSGS] = 0;
-							source.Reply(BOT_KICK_AMSGS_ON_BAN, ci->ttb[TTB_AMSGS]);
 							return MOD_CONT;
 						}
 					}
@@ -385,18 +393,18 @@ class CommandBSKick : public Command
 						ci->ttb[TTB_AMSGS] = 0;
 					ci->botflags.SetFlag(BS_KICK_AMSGS);
 					if (ci->ttb[TTB_AMSGS])
-						source.Reply(BOT_KICK_AMSGS_ON_BAN, ci->ttb[TTB_AMSGS]);
+						source.Reply(_("Bot will now kick for \002amsgs\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_AMSGS]);
 					else
-						source.Reply(BOT_KICK_AMSGS_ON);
+						source.Reply(_("Bot will now kick for \002amsgs\002"));
 				}
 				else
 				{
 					ci->botflags.UnsetFlag(BS_KICK_AMSGS);
-					source.Reply(BOT_KICK_AMSGS_OFF);
+					source.Reply(_("Bot won't kick for \002amsgs\002 anymore."));
 				}
 			}
 			else
-				source.Reply(BOT_KICK_UNKNOWN, option.c_str());
+				source.Reply(LanguageString::UNKNOWN_OPTION, option.c_str(), this->name.c_str());
 		}
 		return MOD_CONT;
 	}
@@ -404,27 +412,112 @@ class CommandBSKick : public Command
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
 		if (subcommand.empty())
-			source.Reply(BOT_HELP_KICK);
+			source.Reply(_("Syntax: \002KICK \037channel\037 \037option\037 \037parameters\037\002\n"
+					" \n"
+					"Configures bot kickers.  \037option\037 can be one of:\n"
+					" \n"
+					"    AMSGS         Sets if the bot kicks for amsgs\n"
+					"    BOLDS         Sets if the bot kicks bolds\n"
+					"    BADWORDS      Sets if the bot kicks bad words\n"
+					"    CAPS          Sets if the bot kicks caps\n"
+					"    COLORS        Sets if the bot kicks colors\n"
+					"    FLOOD         Sets if the bot kicks flooding users\n"
+					"    REPEAT        Sets if the bot kicks users who repeat\n"
+					"                       themselves\n"
+					"    REVERSES      Sets if the bot kicks reverses\n"
+					"    UNDERLINES    Sets if the bot kicks underlines\n"
+					"    ITALICS       Sets if the bot kicks italics\n"
+					" \n"
+					"Type \002%R%S HELP KICK \037option\037\002 for more information\n"
+					"on a specific option.\n"
+					" \n"
+					"Note: access to this command is controlled by the\n"
+					"level SET."));
 		else if (subcommand.equals_ci("BADWORDS"))
-			source.Reply(BOT_HELP_KICK_BADWORDS);
+			source.Reply(_("Syntax: \002KICK \037#channel\037 BADWORDS {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the bad words kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who say certain words\n"
+					"on the channels.\n"
+					"You can define bad words for your channel using the\n"
+					"\002BADWORDS\002 command. Type \002%R%S HELP BADWORDS\002 for\n"
+					"more information.\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("BOLDS"))
-			source.Reply(BOT_HELP_KICK_BOLDS);
+			source.Reply(_("Syntax: \002KICK \037channel\037 BOLDS {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the bolds kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who use bolds.\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("CAPS"))
-			source.Reply(BOT_HELP_KICK_CAPS);
+			source.Reply(_("Syntax: \002KICK \037channel\037 CAPS {\037ON|OFF\037} [\037ttb\037 [\037min\037 [\037percent\037]]]\002\n"
+					"Sets the caps kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who are talking in\n"
+					"CAPS.\n"
+					"The bot kicks only if there are at least \002min\002 caps\n"
+					"and they constitute at least \002percent\002%% of the total \n"
+					"text line (if not given, it defaults to 10 characters\n"
+					"and 25%%).\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("COLORS"))
-			source.Reply(BOT_HELP_KICK_COLORS);
+			source.Reply(_("Syntax: \002KICK \037channel\037 COLORS {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the colors kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who use colors.\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("FLOOD"))
-			source.Reply(BOT_HELP_KICK_FLOOD);
+			source.Reply(_("Syntax: \002KICK \037channel\037 FLOOD {\037ON|OFF\037} [\037ttb\037 [\037ln\037 [\037secs\037]]]\002\n"
+					"Sets the flood kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who are flooding\n"
+					"the channel using at least \002ln\002 lines in \002secs\002 seconds\n"
+					"(if not given, it defaults to 6 lines in 10 seconds).\n"
+					" \n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("REPEAT"))
-			source.Reply(BOT_HELP_KICK_REPEAT);
+			source.Reply(_("Syntax: \002KICK \037#channel\037 REPEAT {\037ON|OFF\037} [\037ttb\037 [\037num\037]]\002\n"
+					"Sets the repeat kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who are repeating\n"
+					"themselves \002num\002 times (if num is not given, it\n"
+					"defaults to 3).\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("REVERSES"))
-			source.Reply(BOT_HELP_KICK_REVERSES);
+			source.Reply(_("Syntax: \002KICK \037channel\037 REVERSES {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the reverses kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who use reverses.\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("UNDERLINES"))
-			source.Reply(BOT_HELP_KICK_UNDERLINES);
+			source.Reply(_("Syntax: \002KICK \037channel\037 UNDERLINES {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the underlines kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who use underlines.\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("ITALICS"))
-			source.Reply(BOT_HELP_KICK_ITALICS);
+			source.Reply(_("Syntax: \002KICK \037channel\037 ITALICS {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the italics kicker on or off. When enabled, this\n"
+					"option tells the bot to kick users who use italics.\n"
+					"ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else if (subcommand.equals_ci("AMSGS"))
-			source.Reply(BOT_HELP_KICK_AMSGS);
+			source.Reply(_("Syntax: \002KICK \037channel\037 AMSGS {\037ON|OFF\037} [\037ttb\037]\002\n"
+					"Sets the amsg kicker on or off. When enabled, the bot will\n"
+					"kick users who send the same message to multiple channels\n"
+					"where BotServ bots are.\n"
+					"Ttb is the number of times a user can be kicked\n"
+					"before it get banned. Don't give ttb to disable\n"
+					"the ban system once activated."));
 		else
 			return false;
 
@@ -433,12 +526,12 @@ class CommandBSKick : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "KICK", BOT_KICK_SYNTAX);
+		SyntaxError(source, "KICK", _("KICK \037channel\037 \037option\037 {\037ON|\037} [\037settings\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_KICK);
+		source.Reply(_("    KICK           Configures kickers"));
 	}
 };
 
@@ -474,7 +567,7 @@ class BSKick : public Module
 					if (c->ci != NULL && c->ci->botflags.HasFlag(BS_KICK_AMSGS))
 					{
 						check_ban(c->ci, u, TTB_AMSGS);
-						bot_kick(c->ci, u, BOT_REASON_AMSGS);
+						bot_kick(c->ci, u, _("Don't use AMSGs!"));
 					}
 				}
 
diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp
index 6da763f1a..015ac036e 100644
--- a/modules/core/bs_say.cpp
+++ b/modules/core/bs_say.cpp
@@ -29,19 +29,19 @@ class CommandBSSay : public Command
 
 		if (!check_access(u, ci, CA_SAY))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (!ci->bi)
 		{
-			source.Reply(BOT_NOT_ASSIGNED);
+			source.Reply(LanguageString::BOT_NOT_ASSIGNED);
 			return MOD_CONT;
 		}
 
 		if (!ci->c || !ci->c->FindUser(ci->bi))
 		{
-			source.Reply(BOT_NOT_ON_CHANNEL, ci->name.c_str());
+			source.Reply(LanguageString::BOT_NOT_ON_CHANNEL, ci->name.c_str());
 			return MOD_CONT;
 		}
 
@@ -62,18 +62,20 @@ class CommandBSSay : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_SAY);
+		source.Reply(_("Syntax: \002SAY \037channel\037 \037text\037\002\n"
+				" \n"
+				"Makes the bot say the given text on the given channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SAY", BOT_SAY_SYNTAX);
+		SyntaxError(source, "SAY", _("SAY \037channel\037 \037text\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_SAY);
+		source.Reply(_("    SAY            Makes the bot say the given text on the given channel"));
 	}
 };
 
diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp
index 49acae06b..ce5377878 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/core/bs_set.cpp
@@ -31,35 +31,35 @@ class CommandBSSet : public Command
 		ChannelInfo *ci;
 
 		if (readonly)
-			source.Reply(BOT_SET_DISABLED);
+			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
 		else if (u->Account()->HasCommand("botserv/set/private") && option.equals_ci("PRIVATE"))
 		{
 			BotInfo *bi;
 
 			if (!(bi = findbot(chan)))
 			{
-				source.Reply(BOT_DOES_NOT_EXIST, chan.c_str());
+				source.Reply(LanguageString::BOT_DOES_NOT_EXIST, chan.c_str());
 				return MOD_CONT;
 			}
 
 			if (value.equals_ci("ON"))
 			{
 				bi->SetFlag(BI_PRIVATE);
-				source.Reply(BOT_SET_PRIVATE_ON, bi->nick.c_str());
+				source.Reply(_("Private mode of bot %s is now \002\002."), bi->nick.c_str());
 			}
 			else if (value.equals_ci("OFF"))
 			{
 				bi->UnsetFlag(BI_PRIVATE);
-				source.Reply(BOT_SET_PRIVATE_OFF, bi->nick.c_str());
+				source.Reply(_("Private mode of bot %s is now \002\002."), bi->nick.c_str());
 			}
 			else
-				SyntaxError(source, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
+				SyntaxError(source, "SET PRIVATE", _("SET \037botname\037 PRIVATE {\037ON|\037}"));
 			return MOD_CONT;
 		}
 		else if (!(ci = cs_findchan(chan)))
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, chan.c_str());
 		else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else
 		{
 			bool override = !check_access(u, ci, CA_SET);
@@ -70,60 +70,60 @@ class CommandBSSet : public Command
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_DONTKICKOPS);
-					source.Reply(BOT_SET_DONTKICKOPS_ON, ci->name.c_str());
+					source.Reply(_("Bot \002won't kick ops\002 on channel %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_DONTKICKOPS);
-					source.Reply(BOT_SET_DONTKICKOPS_OFF, ci->name.c_str());
+					source.Reply(_("Bot \002will kick ops\002 on channel %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX);
+					SyntaxError(source, "SET DONTKICKOPS", _("SET \037channel\037 DONTKICKOPS {\037ON|\037}"));
 			}
 			else if (option.equals_ci("DONTKICKVOICES"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_DONTKICKVOICES);
-					source.Reply(BOT_SET_DONTKICKVOICES_ON, ci->name.c_str());
+					source.Reply(_("Bot \002won't kick voices\002 on channel %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_DONTKICKVOICES);
-					source.Reply(BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str());
+					source.Reply(_("Bot \002will kick voices\002 on channel %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX);
+					SyntaxError(source, "SET DONTKICKVOICES", _("SET \037channel\037 DONTKICKVOICES {\037ON|\037}"));
 			}
 			else if (option.equals_ci("FANTASY"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_FANTASY);
-					source.Reply(BOT_SET_FANTASY_ON, ci->name.c_str());
+					source.Reply(_("Fantasy mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_FANTASY);
-					source.Reply(BOT_SET_FANTASY_OFF, ci->name.c_str());
+					source.Reply(_("Fantasy mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET FANTASY", BOT_SET_FANTASY_SYNTAX);
+					SyntaxError(source, "SET FANTASY", _("SET \037channel\037 FANTASY {\037ON|\037}"));
 			}
 			else if (option.equals_ci("GREET"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_GREET);
-					source.Reply(BOT_SET_GREET_ON, ci->name.c_str());
+					source.Reply(_("Greet mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_GREET);
-					source.Reply(BOT_SET_GREET_OFF, ci->name.c_str());
+					source.Reply(_("Greet mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET GREET", BOT_SET_GREET_SYNTAX);
+					SyntaxError(source, "SET GREET", _("SET \037channel\037 GREET {\037ON|\037}"));
 			}
 			else if (u->Account()->HasCommand("botserv/set/nobot") && option.equals_ci("NOBOT"))
 			{
@@ -132,30 +132,30 @@ class CommandBSSet : public Command
 					ci->botflags.SetFlag(BS_NOBOT);
 					if (ci->bi)
 						ci->bi->UnAssign(u, ci);
-					source.Reply(BOT_SET_NOBOT_ON, ci->name.c_str());
+					source.Reply(_("No Bot mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_NOBOT);
-					source.Reply(BOT_SET_NOBOT_OFF, ci->name.c_str());
+					source.Reply(_("No Bot mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET NOBOT", BOT_SET_NOBOT_SYNTAX);
+					SyntaxError(source, "SET NOBOT", _("SET \037botname\037 NOBOT {\037ON|\037}"));
 			}
 			else if (option.equals_ci("SYMBIOSIS"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_SYMBIOSIS);
-					source.Reply(BOT_SET_SYMBIOSIS_ON, ci->name.c_str());
+					source.Reply(_("Symbiosis mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_SYMBIOSIS);
-					source.Reply(BOT_SET_SYMBIOSIS_OFF, ci->name.c_str());
+					source.Reply(_("Symbiosis mode is now \002\002 on channel %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX);
+					SyntaxError(source, "SET SYMBIOSIS", _("SET \037channel\037 SYMBIOSIS {\037ON|\037}"));
 			}
 			else if (option.equals_ci("MSG"))
 			{
@@ -164,34 +164,34 @@ class CommandBSSet : public Command
 					ci->botflags.UnsetFlag(BS_MSG_PRIVMSG);
 					ci->botflags.UnsetFlag(BS_MSG_NOTICE);
 					ci->botflags.UnsetFlag(BS_MSG_NOTICEOPS);
-					source.Reply(BOT_SET_MSG_OFF, ci->name.c_str());
+					source.Reply(_("Fantasy replies will no longer be sent to %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("PRIVMSG"))
 				{
 					ci->botflags.SetFlag(BS_MSG_PRIVMSG);
 					ci->botflags.UnsetFlag(BS_MSG_NOTICE);
 					ci->botflags.UnsetFlag(BS_MSG_NOTICEOPS);
-					source.Reply(BOT_SET_MSG_PRIVMSG, ci->name.c_str());
+					source.Reply(_("Fantasy replies will be sent via PRIVMSG to %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("NOTICE"))
 				{
 					ci->botflags.UnsetFlag(BS_MSG_PRIVMSG);
 					ci->botflags.SetFlag(BS_MSG_NOTICE);
 					ci->botflags.UnsetFlag(BS_MSG_NOTICEOPS);
-					source.Reply(BOT_SET_MSG_NOTICE, ci->name.c_str());
+					source.Reply(_("Fantasy replies will be sent via NOTICE to %s."), ci->name.c_str());
 				}
 				else if (value.equals_ci("NOTICEOPS"))
 				{
 					ci->botflags.UnsetFlag(BS_MSG_PRIVMSG);
 					ci->botflags.UnsetFlag(BS_MSG_NOTICE);
 					ci->botflags.SetFlag(BS_MSG_NOTICEOPS);
-					source.Reply(BOT_SET_MSG_NOTICEOPS, ci->name.c_str());
+					source.Reply(_("Fantasy replies will be sent via NOTICE to channel ops on %s."), ci->name.c_str());
 				}
 				else
-					SyntaxError(source, "SET MSG", BOT_SET_MSG_SYNTAX);
+					SyntaxError(source, "SET MSG", _("SET \037channel\037 MSG {\037OFF|PRIVMSG|NOTICE|\037}"));
 			}
 			else
-				source.Reply(BOT_SET_UNKNOWN, option.c_str());
+				source.Reply(LanguageString::UNKNOWN_OPTION, option.c_str(), this->name.c_str());
 		}
 
 		return MOD_CONT;
@@ -201,27 +201,90 @@ class CommandBSSet : public Command
 	{
 		if (subcommand.empty())
 		{
-			source.Reply(BOT_HELP_SET);
+			source.Reply(_("Syntax: \002SET \037(channel | bot)\037 \037option\037 \037parameters\037\002\n"
+					" \n"
+					"Configures bot options.  \037option\037 can be one of:\n"
+					" \n"
+					"    DONTKICKOPS      To protect ops against bot kicks\n"
+					"    DONTKICKVOICES   To protect voices against bot kicks\n"
+					"    GREET            Enable greet messages\n"
+					"    FANTASY          Enable fantaisist commands\n"
+					"    SYMBIOSIS        Allow the bot to act as a real bot\n"
+					"    MSG              Configure how fantasy commands should be replied to\n"
+					" \n"
+					"Type \002%R%S HELP SET \037option\037\002 for more information\n"
+					"on a specific option.\n"
+					"Note: access to this command is controlled by the\n"
+					"level SET."));
 			User *u = source.u;
 			if (u->Account() && u->Account()->IsServicesOper())
-				source.Reply(BOT_SERVADMIN_HELP_SET);
+				source.Reply(_("These options are reserved to Services Operators:\n"
+						" \n"
+						"    NOBOT            Prevent a bot from being assigned to \n"
+						"                        a channel\n"
+						"    PRIVATE          Prevent a bot from being assigned by\n"
+						"                        non IRC operators"));
 		}
 		else if (subcommand.equals_ci("DONTKICKOPS"))
-			source.Reply(BOT_HELP_SET_DONTKICKOPS);
+			source.Reply(_("Syntax: \002SET \037channel\037 DONTKICKOPS {\037ON|OFF\037}\n"
+					" \n"
+					"Enables or disables \002ops protection\002 mode on a channel.\n"
+					"When it is enabled, ops won't be kicked by the bot\n"
+					"even if they don't match the NOKICK level."));
 		else if (subcommand.equals_ci("DONTKICKVOICES"))
-			source.Reply(BOT_HELP_SET_DONTKICKVOICES);
+			source.Reply(_("Syntax: \002SET \037channel\037 DONTKICKVOICES {\037ON|OFF\037}\n"
+					" \n"
+					"Enables or disables \002voices protection\002 mode on a channel.\n"
+					"When it is enabled, voices won't be kicked by the bot\n"
+					"even if they don't match the NOKICK level."));
 		else if (subcommand.equals_ci("FANTASY"))
-			source.Reply(BOT_HELP_SET_FANTASY);
+			source.Reply(_("Syntax: \002SET \037channel\037 FANTASY {\037ON|OFF\037}\n"
+					"Enables or disables \002fantasy\002 mode on a channel.\n"
+					"When it is enabled, users will be able to use\n"
+					"commands !op, !deop, !voice, !devoice,\n"
+					"!kick, !kb, !unban, !seen on a channel (find how \n"
+					"to use them; try with or without nick for each, \n"
+					"and with a reason for some?).\n"
+					" \n"
+					"Note that users wanting to use fantaisist\n"
+					"commands MUST have enough level for both\n"
+					"the FANTASIA and another level depending\n"
+					"of the command if required (for example, to use \n"
+					"!op, user must have enough access for the OPDEOP\n"
+					"level)."));
 		else if (subcommand.equals_ci("GREET"))
-			source.Reply(BOT_HELP_SET_GREET);
+			source.Reply(_("Syntax: \002SET \037channel\037 GREET {\037ON|OFF\037}\n"
+					" \n"
+					"Enables or disables \002greet\002 mode on a channel.\n"
+					"When it is enabled, the bot will display greet\n"
+					"messages of users joining the channel, provided\n"
+					"they have enough access to the channel."));
 		else if (subcommand.equals_ci("SYMBIOSIS"))
-			source.Reply(BOT_HELP_SET_SYMBIOSIS, Config->s_ChanServ.c_str());
+			source.Reply(_("Syntax: \002SET \037channel\037 SYMBIOSIS {\037ON|OFF\037}\n"
+					" \n"
+					"Enables or disables \002symbiosis\002 mode on a channel.\n"
+					"When it is enabled, the bot will do everything\n"
+					"normally done by %s on channels, such as MODEs,\n"
+					"KICKs, and even the entry message."), Config->s_ChanServ.c_str());
 		else if (subcommand.equals_ci("NOBOT"))
-			source.Reply(BOT_SERVADMIN_HELP_SET_NOBOT);
+			source.Reply(_("Syntax: \002SET \037channel\037 NOBOT {\037ON|OFF\037}\002\n"
+					" \n"
+					"This option makes a channel be unassignable. If a bot \n"
+					"is already assigned to the channel, it is unassigned\n"
+					"automatically when you enable the option."));
 		else if (subcommand.equals_ci("PRIVATE"))
-			source.Reply(BOT_SERVADMIN_HELP_SET_PRIVATE);
+			source.Reply(_("Syntax: \002SET \037bot-nick\037 PRIVATE {\037ON|OFF\037}\002\n"
+					"This option prevents a bot from being assigned to a\n"
+					"channel by users that aren't IRC operators."));
 		else if (subcommand.equals_ci("MSG"))
-			source.Reply(BOT_HELP_SET_MSG);
+			source.Reply(_("Syntax: \002SET \037channel\037 MSG {\037OFF|PRIVMSG|NOTICE|NOTICEOPS\037}\002\n"
+					" \n"
+					"Configures how fantasy commands should be returned to the channel. Off disables\n"
+					"fantasy from replying to the channel. Privmsg, notice, and noticeops message the\n"
+					"channel, notice the channel, and notice the channel ops respectively.\n"
+					" \n"
+					"Note that replies over one line will not use this setting to prevent spam, and will\n"
+					"go directly to the user who executed it."));
 		else
 			return false;
 
@@ -230,12 +293,12 @@ class CommandBSSet : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SET", BOT_SET_SYNTAX);
+		SyntaxError(source, "SET", _("SET \037(channel | bot)\037 \037option\037 \037settings\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_SET);
+		source.Reply(_("    SET            Configures bot options"));
 	}
 };
 
diff --git a/modules/core/bs_unassign.cpp b/modules/core/bs_unassign.cpp
index 41479f0a3..40a67d9a9 100644
--- a/modules/core/bs_unassign.cpp
+++ b/modules/core/bs_unassign.cpp
@@ -28,38 +28,44 @@ class CommandBSUnassign : public Command
 		ChannelInfo *ci = source.ci;
 
 		if (readonly)
-			source.Reply(BOT_ASSIGN_READONLY);
+			source.Reply(LanguageString::BOT_ASSIGN_READONLY);
 		else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_ASSIGN))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!ci->bi)
-			source.Reply(BOT_NOT_ASSIGNED);
+			source.Reply(LanguageString::BOT_NOT_ASSIGNED);
 		else if (ci->HasFlag(CI_PERSIST) && !cm)
-			source.Reply(BOT_UNASSIGN_PERSISTANT_CHAN);
+			source.Reply(_("You can not unassign bots while persist is set on the channel."));
 		else
 		{
 			bool override = !check_access(u, ci, CA_ASSIGN);
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << ci->bi->nick;
 
 			ci->bi->UnAssign(u, ci);
-			source.Reply(BOT_UNASSIGN_UNASSIGNED, ci->name.c_str());
+			source.Reply(_("There is no bot assigned to %s anymore."), ci->name.c_str());
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(BOT_HELP_UNASSIGN);
+		source.Reply(_("Syntax: \002UNASSIGN \037chan\037\002\n"
+				" \n"
+				"Unassigns a bot from a channel. When you use this command,\n"
+				"the bot won't join the channel anymore. However, bot\n"
+				"configuration for the channel is kept, so you will always\n"
+				"be able to reassign a bot later without have to reconfigure\n"
+				"it entirely."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "UNASSIGN", BOT_UNASSIGN_SYNTAX);
+		SyntaxError(source, "UNASSIGN", _("UNASSIGN \037chan\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(BOT_HELP_CMD_UNASSIGN);
+		source.Reply(_("    UNASSIGN       Unassigns a bot from a channel"));
 	}
 };
 
diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp
index a13d1d488..4eb4974fe 100644
--- a/modules/core/cs_access.cpp
+++ b/modules/core/cs_access.cpp
@@ -26,9 +26,9 @@ class AccessListCallback : public NumberList
 	~AccessListCallback()
 	{
 		if (SentHeader)
-			source.Reply(CHAN_ACCESS_LIST_FOOTER, source.ci->name.c_str());
+			source.Reply(_("End of access list."), source.ci->name.c_str());
 		else
-			source.Reply(CHAN_ACCESS_NO_MATCH, source.ci->name.c_str());
+			source.Reply(_("No matching entries on %s access list."), source.ci->name.c_str());
 	}
 
 	virtual void HandleNumber(unsigned Number)
@@ -39,7 +39,7 @@ class AccessListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(CHAN_ACCESS_LIST_HEADER, source.ci->name.c_str());
+			source.Reply(LanguageString::CHAN_ACCESS_LIST_HEADER, source.ci->name.c_str());
 		}
 
 		DoList(source, Number - 1, source.ci->GetAccess(Number - 1));
@@ -50,10 +50,10 @@ class AccessListCallback : public NumberList
 		if (source.ci->HasFlag(CI_XOP))
 		{
 			Anope::string xop = get_xop_level(access->level);
-			source.Reply(CHAN_ACCESS_LIST_XOP_FORMAT, Number + 1, xop.c_str(), access->mask.c_str());
+			source.Reply(_("  %3d   %s  %s"), Number + 1, xop.c_str(), access->mask.c_str());
 		}
 		else
-			source.Reply(CHAN_ACCESS_LIST_AXS_FORMAT, Number + 1, access->level, access->mask.c_str());
+			source.Reply(_("  %3d  %4d  %s"), Number + 1, access->level, access->mask.c_str());
 	}
 };
 
@@ -72,7 +72,7 @@ class AccessViewCallback : public AccessListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(CHAN_ACCESS_LIST_HEADER, source.ci->name.c_str());
+			source.Reply(LanguageString::CHAN_ACCESS_LIST_HEADER, source.ci->name.c_str());
 		}
 
 		DoList(source, Number - 1, source.ci->GetAccess(Number - 1));
@@ -92,10 +92,10 @@ class AccessViewCallback : public AccessListCallback
 		if (ci->HasFlag(CI_XOP))
 		{
 			Anope::string xop = get_xop_level(access->level);
-			source.Reply(CHAN_ACCESS_VIEW_XOP_FORMAT, Number + 1, xop.c_str(), access->mask.c_str(), access->creator.c_str(), timebuf.c_str());
+			source.Reply(LanguageString::CHAN_ACCESS_VIEW_XOP_FORMAT, Number + 1, xop.c_str(), access->mask.c_str(), access->creator.c_str(), timebuf.c_str());
 		}
 		else
-			source.Reply(CHAN_ACCESS_VIEW_AXS_FORMAT, Number + 1, access->level, access->mask.c_str(), access->creator.c_str(), timebuf.c_str());
+			source.Reply(LanguageString::CHAN_ACCESS_VIEW_AXS_FORMAT, Number + 1, access->level, access->mask.c_str(), access->creator.c_str(), timebuf.c_str());
 	}
 };
 
@@ -117,17 +117,17 @@ class AccessDelCallback : public NumberList
 	~AccessDelCallback()
 	{
 		if (Denied && !Deleted)
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!Deleted)
-			source.Reply(CHAN_ACCESS_NO_MATCH, source.ci->name.c_str());
+			source.Reply(_("No matching entries on %s access list."), source.ci->name.c_str());
 		else
 		{
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, c, source.ci) << "for user" << (Deleted == 1 ? " " : "s ") << Nicks;
 
 			if (Deleted == 1)
-				source.Reply(CHAN_ACCESS_DELETED_ONE, source.ci->name.c_str());
+				source.Reply(_("Deleted 1 entry from %s access list."), source.ci->name.c_str());
 			else
-				source.Reply(CHAN_ACCESS_DELETED_SEVERAL, Deleted, source.ci->name.c_str());
+				source.Reply(_("Deleted %d entries from %s access list."), Deleted, source.ci->name.c_str());
 		}
 	}
 
@@ -175,18 +175,18 @@ class CommandCSAccess : public Command
 		int16 u_level = u_access ? u_access->level : 0;
 		if (level >= u_level && !u->Account()->HasPriv("chanserv/access/modify"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (!level)
 		{
-			source.Reply(CHAN_ACCESS_LEVEL_NONZERO);
+			source.Reply(_("Access level must be non-zero."));
 			return MOD_CONT;
 		}
 		else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER)
 		{
-			source.Reply(CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
+			source.Reply(LanguageString::CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
 			return MOD_CONT;
 		}
 
@@ -197,7 +197,7 @@ class CommandCSAccess : public Command
 			mask += "!*@*";
 		else if (na && na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, mask.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, mask.c_str());
 			return MOD_CONT;
 		}
 
@@ -207,12 +207,12 @@ class CommandCSAccess : public Command
 			/* Don't allow lowering from a level >= u_level */
 			if (access->level >= u_level && !u->Account()->HasPriv("chanserv/access/modify"))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			if (access->level == level)
 			{
-				source.Reply(CHAN_ACCESS_LEVEL_UNCHANGED, access->mask.c_str(), ci->name.c_str(), level);
+				source.Reply(_("Access level for \002%s\002 on %s unchanged from \002%d\002."), access->mask.c_str(), ci->name.c_str(), level);
 				return MOD_CONT;
 			}
 			access->level = level;
@@ -220,13 +220,13 @@ class CommandCSAccess : public Command
 			FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, access));
 
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << mask << " (level: " << level << ") as level " << u_level;
-			source.Reply(CHAN_ACCESS_LEVEL_CHANGED, access->mask.c_str(), ci->name.c_str(), level);
+			source.Reply(_("Access level for \002%s\002 on %s changed to \002%d\002."), access->mask.c_str(), ci->name.c_str(), level);
 			return MOD_CONT;
 		}
 
 		if (ci->GetAccessCount() >= Config->CSAccessMax)
 		{
-			source.Reply(CHAN_ACCESS_REACHED_LIMIT, Config->CSAccessMax);
+			source.Reply(_("Sorry, you can only have %d access entries on a channel."), Config->CSAccessMax);
 			return MOD_CONT;
 		}
 
@@ -235,7 +235,7 @@ class CommandCSAccess : public Command
 		FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, access));
 
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << mask << " (level: " << level << ") as level " << u_level;
-		source.Reply(CHAN_ACCESS_ADDED, access->mask.c_str(), ci->name.c_str(), level);
+		source.Reply(_("\002%s\002 added to %s access list at level \002%d\002."), access->mask.c_str(), ci->name.c_str(), level);
 
 		return MOD_CONT;
 	}
@@ -248,7 +248,7 @@ class CommandCSAccess : public Command
 		const Anope::string &mask = params[2];
 
 		if (!ci->GetAccessCount())
-			source.Reply(CHAN_ACCESS_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s access list is empty."), ci->name.c_str());
 		else if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
 			AccessDelCallback list(source, this, mask);
@@ -260,12 +260,12 @@ class CommandCSAccess : public Command
 			ChanAccess *u_access = ci->GetAccess(u);
 			int16 u_level = u_access ? u_access->level : 0;
 			if (!access)
-				source.Reply(CHAN_ACCESS_NOT_FOUND, mask.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 not found on %s access list."), mask.c_str(), ci->name.c_str());
 			else if (access->nc != u->Account() && check_access(u, ci, CA_NOJOIN) && u_level <= access->level && !u->Account()->HasPriv("chanserv/access/modify"))
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 			else
 			{
-				source.Reply(CHAN_ACCESS_DELETED, access->mask.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 deleted from %s access list."), access->mask.c_str(), ci->name.c_str());
 				bool override = !check_access(u, ci, CA_ACCESS_CHANGE) && access->nc != u->Account();
 				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << access->mask << " from level " << access->level;
 
@@ -285,7 +285,7 @@ class CommandCSAccess : public Command
 		const Anope::string &nick = params.size() > 2 ? params[2] : "";
 
 		if (!ci->GetAccessCount())
-			source.Reply(CHAN_ACCESS_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s access list is empty."), ci->name.c_str());
 		else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
 			AccessListCallback list(source, nick);
@@ -305,16 +305,16 @@ class CommandCSAccess : public Command
 				if (!SentHeader)
 				{
 					SentHeader = true;
-					source.Reply(CHAN_ACCESS_LIST_HEADER, ci->name.c_str());
+					source.Reply(LanguageString::CHAN_ACCESS_LIST_HEADER, ci->name.c_str());
 				}
 
 				AccessListCallback::DoList(source, i, access);
 			}
 
 			if (SentHeader)
-				source.Reply(CHAN_ACCESS_LIST_FOOTER, ci->name.c_str());
+				source.Reply(_("End of access list."), ci->name.c_str());
 			else
-				source.Reply(CHAN_ACCESS_NO_MATCH, ci->name.c_str());
+				source.Reply(_("No matching entries on %s access list."), ci->name.c_str());
 		}
 
 		return MOD_CONT;
@@ -327,7 +327,7 @@ class CommandCSAccess : public Command
 		const Anope::string &nick = params.size() > 2 ? params[2] : "";
 
 		if (!ci->GetAccessCount())
-			source.Reply(CHAN_ACCESS_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s access list is empty."), ci->name.c_str());
 		else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
 			AccessViewCallback list(source, nick);
@@ -347,16 +347,16 @@ class CommandCSAccess : public Command
 				if (!SentHeader)
 				{
 					SentHeader = true;
-					source.Reply(CHAN_ACCESS_LIST_HEADER, ci->name.c_str());
+					source.Reply(LanguageString::CHAN_ACCESS_LIST_HEADER, ci->name.c_str());
 				}
 
 				AccessViewCallback::DoList(source, i, access);
 			}
 
 			if (SentHeader)
-				source.Reply(CHAN_ACCESS_LIST_FOOTER, ci->name.c_str());
+				source.Reply(_("End of access list."), ci->name.c_str());
 			else
-				source.Reply(CHAN_ACCESS_NO_MATCH, ci->name.c_str());
+				source.Reply(_("No matching entries on %s access list."), ci->name.c_str());
 		}
 
 		return MOD_CONT;
@@ -368,14 +368,14 @@ class CommandCSAccess : public Command
 		ChannelInfo *ci = source.ci;
 
 		if (!IsFounder(u, ci) && !u->Account()->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else
 		{
 			ci->ClearAccess();
 
 			FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u));
 
-			source.Reply(CHAN_ACCESS_CLEAR, ci->name.c_str());
+			source.Reply(_("Channel %s access list has been cleared."), ci->name.c_str());
 
 			bool override = !IsFounder(u, ci);
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR";
@@ -420,17 +420,21 @@ class CommandCSAccess : public Command
 		if (is_list || is_clear ? 0 : (cmd.equals_ci("DEL") ? (nick.empty() || !s.empty()) : s.empty()))
 			this->OnSyntaxError(source, cmd);
 		else if (!has_access)
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		/* We still allow LIST and CLEAR in xOP mode, but not others */
 		else if (ci->HasFlag(CI_XOP) && !is_list && !is_clear)
 		{
 			if (ModeManager::FindChannelModeByName(CMODE_HALFOP))
-				source.Reply(CHAN_ACCESS_XOP_HOP, Config->s_ChanServ.c_str());
+				source.Reply(_("You can't use this command. \n"
+						"Use the AOP, SOP, HOP and VOP commands instead.\n"
+						"Type \002%R%s HELP \037command\037\002 for more information."), Config->s_ChanServ.c_str());
 			else
-				source.Reply(CHAN_ACCESS_XOP, Config->s_ChanServ.c_str());
+				source.Reply(_("You can't use this command. \n"
+						"Use the AOP, SOP and VOP commands instead.\n"
+						"Type \002%R%s HELP \037command\037\002 for more information."), Config->s_ChanServ.c_str());
 		}
 		else if (readonly && !is_list)
-			source.Reply(CHAN_ACCESS_DISABLED);
+			source.Reply(_("Sorry, channel access list modification is temporarily disabled."));
 		else if (cmd.equals_ci("ADD"))
 			this->DoAdd(source, params);
 		else if (cmd.equals_ci("DEL"))
@@ -449,14 +453,75 @@ class CommandCSAccess : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_ACCESS);
-		source.Reply(CHAN_HELP_ACCESS_LEVELS);
+		source.Reply(_("Syntax: \002ACCESS \037channel\037 ADD \037mask\037 \037level\037\002\n"
+				"        \002ACCESS \037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002ACCESS \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002ACCESS \037channel\037 VIEW [\037mask\037 | \037list\037]\002\n"
+				"        \002ACCESS \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002access list\002 for a channel.  The access\n"
+				"list specifies which users are allowed chanop status or\n"
+				"access to %S commands on the channel.  Different\n"
+				"user levels allow for access to different subsets of\n"
+				"privileges; \002%R%S HELP ACCESS LEVELS\002 for more\n"
+				"specific information.  Any nick not on the access list has\n"
+				"a user level of 0.\n"
+				" \n"
+				"The \002ACCESS ADD\002 command adds the given mask to the\n"
+				"access list with the given user level; if the mask is\n"
+				"already present on the list, its access level is changed to\n"
+				"the level specified in the command.  The \037level\037 specified\n"
+				"must be less than that of the user giving the command, and\n"
+				"if the \037mask\037 is already on the access list, the current\n"
+				"access level of that nick must be less than the access level\n"
+				"of the user giving the command. When a user joins the channel\n"
+				"the access they receive is from the highest level entry in the\n"
+				"access list.\n"
+				" \n"
+				"The \002ACCESS DEL\002 command removes the given nick from the\n"
+				"access list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				"You may remove yourself from an access list, even if you\n"
+				"do not have access to modify that list otherwise.\n"
+				" \n"
+				"The \002ACCESS LIST\002 command displays the access list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002ACCESS #channel LIST 2-5,7-9\002\n"
+				"      Lists access entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				" \n"
+				"The \002ACCESS VIEW\002 command displays the access list similar\n"
+				"to \002ACCESS LIST\002 but shows the creator and last used time.\n"
+				" \n"
+				"The \002ACCESS CLEAR\002 command clears all entries of the\n"
+				"access list."));
+		source.Reply(_("\002User access levels\002\n"
+				" \n"
+				"By default, the following access levels are defined:\n"
+				" \n"
+				"   \002Founder\002   Full access to %S functions; automatic\n"
+				"                     opping upon entering channel.  Note\n"
+				"                     that only one person may have founder\n"
+				"                     status (it cannot be given using the\n"
+				"                     \002ACCESS\002 command).\n"
+				"   \002     10\002   Access to AKICK command; automatic opping.\n"
+				"   \002      5\002   Automatic opping.\n"
+				"   \002      3\002   Automatic voicing.\n"
+				"   \002      0\002   No special privileges; can be opped by other\n"
+				"                     ops (unless \002secure-ops\002 is set).\n"
+				"   \002     <0\002   May not be opped.\n"
+				" \n"
+				"These levels may be changed, or new ones added, using the\n"
+				"\002LEVELS\002 command; type \002%R%S HELP LEVELS\002 for\n"
+				"information."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "ACCESS", CHAN_ACCESS_SYNTAX);
+		SyntaxError(source, "ACCESS", _("ACCESS \037channel\037 {ADD|DEL|LIST|VIEW|CLEAR} [\037mask\037 [\037level\037] | \037entry-list\037]"));
 	}
 };
 
@@ -484,7 +549,7 @@ class CommandCSLevels : public Command
 		if (!error.empty())
 			this->OnSyntaxError(source, "SET");
 		else if (level <= ACCESS_INVALID || level > ACCESS_FOUNDER)
-			source.Reply(CHAN_LEVELS_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
+			source.Reply(_("Level must be between %d and %d inclusive."), ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
 		else
 		{
 			for (int i = 0; levelinfo[i].what >= 0; ++i)
@@ -498,14 +563,14 @@ class CommandCSLevels : public Command
 					Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "SET " << levelinfo[i].name << " to " << level;
 
 					if (level == ACCESS_FOUNDER)
-						source.Reply(CHAN_LEVELS_CHANGED_FOUNDER, levelinfo[i].name.c_str(), ci->name.c_str());
+						source.Reply(_("Level for %s on channel %s changed to founder only."), levelinfo[i].name.c_str(), ci->name.c_str());
 					else
-						source.Reply(CHAN_LEVELS_CHANGED, levelinfo[i].name.c_str(), ci->name.c_str(), level);
+						source.Reply(_("Level for \002%s\002 on channel %s changed to \002%d\002."), levelinfo[i].name.c_str(), ci->name.c_str(), level);
 					return MOD_CONT;
 				}
 			}
 
-			source.Reply(CHAN_LEVELS_UNKNOWN, what.c_str(), Config->s_ChanServ.c_str());
+			source.Reply(_("Setting \002%s\002 not known.  Type \002%R%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->s_ChanServ.c_str());
 		}
 
 		return MOD_CONT;
@@ -530,12 +595,12 @@ class CommandCSLevels : public Command
 					bool override = !check_access(u, ci, CA_FOUNDER);
 					Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DISABLE " << levelinfo[i].name;
 
-					source.Reply(CHAN_LEVELS_DISABLED, levelinfo[i].name.c_str(), ci->name.c_str());
+					source.Reply(_("\002%s\002 disabled on channel %s."), levelinfo[i].name.c_str(), ci->name.c_str());
 					return MOD_CONT;
 				}
 			}
 
-		source.Reply(CHAN_LEVELS_UNKNOWN, what.c_str(), Config->s_ChanServ.c_str());
+		source.Reply(_("Setting \002%s\002 not known.  Type \002%R%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->s_ChanServ.c_str());
 
 		return MOD_CONT;
 	}
@@ -544,7 +609,7 @@ class CommandCSLevels : public Command
 	{
 		ChannelInfo *ci = source.ci;
 
-		source.Reply(CHAN_LEVELS_LIST_HEADER, ci->name.c_str());
+		source.Reply(_("Access level settings for channel %s:"), ci->name.c_str());
 
 		if (!levelinfo_maxwidth)
 			for (int i = 0; levelinfo[i].what >= 0; ++i)
@@ -562,12 +627,12 @@ class CommandCSLevels : public Command
 			{
 				j = levelinfo[i].what;
 
-				source.Reply(CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str());
+				source.Reply(_("    %-*s  (disabled)"), levelinfo_maxwidth, levelinfo[i].name.c_str());
 			}
 			else if (j == ACCESS_FOUNDER)
-				source.Reply(CHAN_LEVELS_LIST_FOUNDER, levelinfo_maxwidth, levelinfo[i].name.c_str());
+				source.Reply(_("    %-*s  (founder only)"), levelinfo_maxwidth, levelinfo[i].name.c_str());
 			else
-				source.Reply(CHAN_LEVELS_LIST_NORMAL, levelinfo_maxwidth, levelinfo[i].name.c_str(), j);
+				source.Reply(_("    %-*s  %d"), levelinfo_maxwidth, levelinfo[i].name.c_str(), j);
 		}
 
 		return MOD_CONT;
@@ -584,7 +649,7 @@ class CommandCSLevels : public Command
 		bool override = !check_access(u, ci, CA_FOUNDER);
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "RESET";
 
-		source.Reply(CHAN_LEVELS_RESET, ci->name.c_str());
+		source.Reply(_("Access levels for \002%s\002 reset to defaults."), ci->name.c_str());
 		return MOD_CONT;
 	}
 
@@ -608,9 +673,9 @@ class CommandCSLevels : public Command
 		if (cmd.equals_ci("SET") ? s.empty() : (cmd.substr(0, 3).equals_ci("DIS") ? (what.empty() || !s.empty()) : !what.empty()))
 			this->OnSyntaxError(source, cmd);
 		else if (ci->HasFlag(CI_XOP))
-			source.Reply(CHAN_LEVELS_XOP);
+			source.Reply(_("Levels are not available as xOP is enabled on this channel."));
 		else if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (cmd.equals_ci("SET"))
 			this->DoSet(source, params);
 		else if (cmd.equals_ci("DIS") || cmd.equals_ci("DISABLE"))
@@ -630,7 +695,9 @@ class CommandCSLevels : public Command
 		if (subcommand.equals_ci("DESC"))
 		{
 			int i;
-			source.Reply(CHAN_HELP_LEVELS_DESC);
+			source.Reply(_("The following feature/function names are understood. Note\n"
+					"that the leves for NOJOIN is the maximum level,\n"
+					"while all others are minimum levels."));
 			if (!levelinfo_maxwidth)
 				for (i = 0; levelinfo[i].what >= 0; ++i)
 				{
@@ -639,22 +706,45 @@ class CommandCSLevels : public Command
 						levelinfo_maxwidth = len;
 				}
 			for (i = 0; levelinfo[i].what >= 0; ++i)
-				source.Reply(CHAN_HELP_LEVELS_DESC_FORMAT, levelinfo_maxwidth, levelinfo[i].name.c_str(), GetString(source.u, levelinfo[i].desc).c_str());
+				source.Reply(_("    %-*s  %s"), levelinfo_maxwidth, levelinfo[i].name.c_str(), GetString(source.u->Account(), levelinfo[i].desc).c_str());
 		}
 		else
-			source.Reply(CHAN_HELP_LEVELS);
+			source.Reply(_("Syntax: \002LEVELS \037channel\037 SET \037type\037 \037level\037\002\n"
+					"        \002LEVELS \037channel\037 {DIS | DISABLE} \037type\037\002\n"
+					"        \002LEVELS \037channel\037 LIST\002\n"
+					"        \002LEVELS \037channel\037 RESET\002\n"
+					" \n"
+					"The \002LEVELS\002 command allows fine control over the meaning of\n"
+					"the numeric access levels used for channels.  With this\n"
+					"command, you can define the access level required for most\n"
+					"of %S's functions. (The \002SET FOUNDER\002 and this command\n"
+					"are always restricted to the channel founder.)\n"
+					" \n"
+					"\002LEVELS SET\002 allows the access level for a function or group of\n"
+					"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).\n"
+					" \n"
+					"\002LEVELS LIST\002 shows the current levels for each function or\n"
+					"group of functions. \002LEVELS RESET\002 resets the levels to the\n"
+					"default levels of a newly-created channel (see\n"
+					"\002HELP ACCESS LEVELS\002).\n"
+					" \n"
+					"For a list of the features and functions whose levels can be\n"
+					"set, see \002HELP LEVELS DESC\002."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "LEVELS", CHAN_LEVELS_SYNTAX);
+		SyntaxError(source, "LEVELS", _("LEVELS \037channel\037 {SET | DIS[ABLE] | LIST | RESET} [\037item\037 [\037level\037]]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_ACCESS);
-		source.Reply(CHAN_HELP_CMD_LEVELS);
+		source.Reply(_("    ACCESS     Modify the list of privileged users"));
+		source.Reply(_("    LEVELS     Redefine the meanings of access levels"));
 	}
 };
 
diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp
index 34d3c8369..11b5485ff 100644
--- a/modules/core/cs_akick.cpp
+++ b/modules/core/cs_akick.cpp
@@ -64,7 +64,7 @@ class AkickListCallback : public NumberList
 	~AkickListCallback()
 	{
 		if (!SentHeader)
-			source.Reply(CHAN_AKICK_NO_MATCH, source.ci->name.c_str());
+			source.Reply(_("No matching entries on %s autokick list."), source.ci->name.c_str());
 	}
 
 	virtual void HandleNumber(unsigned Number)
@@ -75,7 +75,7 @@ class AkickListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(CHAN_AKICK_LIST_HEADER, source.ci->name.c_str());
+			source.Reply(_("Autokick list for %s:"), source.ci->name.c_str());
 		}
 
 		DoList(source, Number - 1, source.ci->GetAkick(Number - 1));
@@ -83,7 +83,7 @@ class AkickListCallback : public NumberList
 
 	static void DoList(CommandSource &source, unsigned index, AutoKick *akick)
 	{
-		source.Reply(CHAN_AKICK_LIST_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), !akick->reason.empty() ? akick->reason.c_str() : GetString(source.u, NO_REASON).c_str());
+		source.Reply(_("  %3d %s (%s)"), index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), !akick->reason.empty() ? akick->reason.c_str() : GetString(source.u->Account(), LanguageString::NO_REASON).c_str());
 	}
 };
 
@@ -102,7 +102,7 @@ class AkickViewCallback : public AkickListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(CHAN_AKICK_LIST_HEADER, source.ci->name.c_str());
+			source.Reply(_("Autokick list for %s:"), source.ci->name.c_str());
 		}
 
 		DoList(source, Number - 1, source.ci->GetAkick(Number - 1));
@@ -116,12 +116,12 @@ class AkickViewCallback : public AkickListCallback
 		if (akick->addtime)
 			timebuf = do_strftime(akick->addtime);
 		else
-			timebuf = GetString(u, UNKNOWN);
+			timebuf = GetString(u->Account(), LanguageString::UNKNOWN);
 
-		source.Reply(CHAN_AKICK_VIEW_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), !akick->creator.empty() ? akick->creator.c_str() : GetString(u, UNKNOWN).c_str(), timebuf.c_str(), !akick->reason.empty() ? akick->reason.c_str() : GetString(u, NO_REASON).c_str());
+		source.Reply(LanguageString::CHAN_AKICK_VIEW_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), !akick->creator.empty() ? akick->creator.c_str() : GetString(u->Account(), LanguageString::UNKNOWN).c_str(), timebuf.c_str(), !akick->reason.empty() ? akick->reason.c_str() : GetString(u->Account(), LanguageString::NO_REASON).c_str());
 
 		if (akick->last_used)
-			source.Reply(CHAN_AKICK_LAST_USED, do_strftime(akick->last_used).c_str());
+			source.Reply(_("    Last used %s"), do_strftime(akick->last_used).c_str());
 	}
 };
 
@@ -143,11 +143,11 @@ class AkickDelCallback : public NumberList
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "DEL on " << Deleted << " users";
 
 		if (!Deleted)
-			source.Reply(CHAN_AKICK_NO_MATCH, ci->name.c_str());
+			source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
 		else if (Deleted == 1)
-			source.Reply(CHAN_AKICK_DELETED_ONE, ci->name.c_str());
+			source.Reply(_("Deleted 1 entry from %s autokick list."), ci->name.c_str());
 		else
-			source.Reply(CHAN_AKICK_DELETED_SEVERAL, Deleted, ci->name.c_str());
+			source.Reply(_("Deleted %d entries from %s autokick list."), Deleted, ci->name.c_str());
 	}
 
 	void HandleNumber(unsigned Number)
@@ -184,7 +184,7 @@ class CommandCSAKick : public Command
 		{
 			if (na->HasFlag(NS_FORBIDDEN))
 			{
-				source.Reply(NICK_X_FORBIDDEN, mask.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, mask.c_str());
 				return;
 			}
 
@@ -194,7 +194,7 @@ class CommandCSAKick : public Command
 		/* Check excepts BEFORE we get this far */
 		if (ModeManager::FindChannelModeByName(CMODE_EXCEPT) && is_excepted_mask(ci, mask))
 		{
-			source.Reply(CHAN_EXCEPTED, mask.c_str(), ci->name.c_str());
+			source.Reply(LanguageString::CHAN_EXCEPTED, mask.c_str(), ci->name.c_str());
 			return;
 		}
 
@@ -206,7 +206,7 @@ class CommandCSAKick : public Command
 			int16 nc_level = nc_access ? nc_access->level : 0, u_level = u_access ? u_access->level : 0;
 			if (nc == ci->founder || nc_level >= u_level)
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return;
 			}
 		}
@@ -224,7 +224,7 @@ class CommandCSAKick : public Command
 
 				if ((check_access(u2, ci, CA_FOUNDER) || u2_level >= u_level) && entry_mask.Matches(u2))
 				{
-					source.Reply(ACCESS_DENIED);
+					source.Reply(LanguageString::ACCESS_DENIED);
 					return;
 				}
 			}
@@ -245,7 +245,7 @@ class CommandCSAKick : public Command
 					Anope::string buf = na2->nick + "!" + na2->last_usermask;
 					if (Anope::Match(buf, mask))
 					{
-						source.Reply(ACCESS_DENIED);
+						source.Reply(LanguageString::ACCESS_DENIED);
 						return;
 					}
 				}
@@ -257,14 +257,14 @@ class CommandCSAKick : public Command
 			akick = ci->GetAkick(j);
 			if (akick->HasFlag(AK_ISNICK) ? akick->nc == nc : mask.equals_ci(akick->mask))
 			{
-				source.Reply(CHAN_AKICK_ALREADY_EXISTS, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 already exists on %s autokick list."), akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), ci->name.c_str());
 				return;
 			}
 		}
 
 		if (ci->GetAkickCount() >= Config->CSAutokickMax)
 		{
-			source.Reply(CHAN_AKICK_REACHED_LIMIT, Config->CSAutokickMax);
+			source.Reply(_("Sorry, you can only have %d autokick masks on a channel."), Config->CSAutokickMax);
 			return;
 		}
 
@@ -278,7 +278,7 @@ class CommandCSAKick : public Command
 
 		FOREACH_MOD(I_OnAkickAdd, OnAkickAdd(u, ci, akick));
 
-		source.Reply(CHAN_AKICK_ADDED, mask.c_str(), ci->name.c_str());
+		source.Reply(_("\002%s\002 added to %s autokick list."), mask.c_str(), ci->name.c_str());
 
 		this->DoEnforce(source);
 	}
@@ -294,7 +294,7 @@ class CommandCSAKick : public Command
 
 		if (!ci->GetAkickCount())
 		{
-			source.Reply(CHAN_AKICK_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s autokick list is empty."), ci->name.c_str());
 			return;
 		}
 
@@ -319,7 +319,7 @@ class CommandCSAKick : public Command
 
 			if (i == ci->GetAkickCount())
 			{
-				source.Reply(CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 not found on %s autokick list."), mask.c_str(), ci->name.c_str());
 				return;
 			}
 
@@ -328,7 +328,7 @@ class CommandCSAKick : public Command
 
 			ci->EraseAkick(i);
 
-			source.Reply(CHAN_AKICK_DELETED, mask.c_str(), ci->name.c_str());
+			source.Reply(_("\002%s\002 deleted from %s autokick list."), mask.c_str(), ci->name.c_str());
 		}
 	}
 
@@ -344,7 +344,7 @@ class CommandCSAKick : public Command
 
 		if (!ci->GetAkickCount())
 		{
-			source.Reply(CHAN_AKICK_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s autokick list is empty."), ci->name.c_str());
 			return;
 		}
 
@@ -372,14 +372,14 @@ class CommandCSAKick : public Command
 				if (!SentHeader)
 				{
 					SentHeader = true;
-					source.Reply(CHAN_AKICK_LIST_HEADER, ci->name.c_str());
+					source.Reply(_("Autokick list for %s:"), ci->name.c_str());
 				}
 
 				AkickListCallback::DoList(source, i, akick);
 			}
 
 			if (!SentHeader)
-				source.Reply(CHAN_AKICK_NO_MATCH, ci->name.c_str());
+				source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
 		}
 	}
 
@@ -395,7 +395,7 @@ class CommandCSAKick : public Command
 
 		if (!ci->GetAkickCount())
 		{
-			source.Reply(CHAN_AKICK_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("%s autokick list is empty."), ci->name.c_str());
 			return;
 		}
 
@@ -423,14 +423,14 @@ class CommandCSAKick : public Command
 				if (!SentHeader)
 				{
 					SentHeader = true;
-					source.Reply(CHAN_AKICK_LIST_HEADER, ci->name.c_str());
+					source.Reply(_("Autokick list for %s:"), ci->name.c_str());
 				}
 
 				AkickViewCallback::DoList(source, i, akick);
 			}
 
 			if (!SentHeader)
-				source.Reply(CHAN_AKICK_NO_MATCH, ci->name.c_str());
+				source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
 		}
 	}
 
@@ -443,7 +443,7 @@ class CommandCSAKick : public Command
 
 		if (!c)
 		{
-			source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, ci->name.c_str());
 			return;
 		}
 
@@ -458,7 +458,7 @@ class CommandCSAKick : public Command
 		bool override = !check_access(u, ci, CA_AKICK);
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ENFORCE, affects " << count << " users";
 
-		source.Reply(CHAN_AKICK_ENFORCE_DONE, ci->name.c_str(), count);
+		source.Reply(_("AKICK ENFORCE for \002%s\002 complete; \002%d\002 users were affected."), ci->name.c_str(), count);
 	}
 
 	void DoClear(CommandSource &source)
@@ -469,7 +469,7 @@ class CommandCSAKick : public Command
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR";
 
 		ci->ClearAkick();
-		source.Reply(CHAN_AKICK_CLEAR, ci->name.c_str());
+		source.Reply(_("Channel %s akick list has been cleared."), ci->name.c_str());
 	}
 
  public:
@@ -489,9 +489,9 @@ class CommandCSAKick : public Command
 		if (mask.empty() && (cmd.equals_ci("ADD") || cmd.equals_ci("DEL")))
 			this->OnSyntaxError(source, cmd);
 		else if (!check_access(u, ci, CA_AKICK) && !u->Account()->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!cmd.equals_ci("LIST") && !cmd.equals_ci("VIEW") && !cmd.equals_ci("ENFORCE") && readonly)
-			source.Reply(CHAN_AKICK_DISABLED);
+			source.Reply(_("Sorry, channel autokick list modification is temporarily disabled."));
 		else if (cmd.equals_ci("ADD"))
 			this->DoAdd(source, params);
 		else if (cmd.equals_ci("DEL"))
@@ -512,18 +512,56 @@ class CommandCSAKick : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_AKICK);
+		source.Reply(_("Syntax: \002AKICK \037channel\037 ADD {\037nick\037 | \037mask\037} [\037reason\037]\002\n"
+				"        \002AKICK \037channel\037 DEL {\037nick\037 | \037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002AKICK \037channel\037 LIST [\037mask\037 | \037entry-num\037 | \037list\037]\002\n"
+				"        \002AKICK \037channel\037 VIEW [\037mask\037 | \037entry-num\037 | \037list\037]\002\n"
+				"        \002AKICK \037channel\037 ENFORCE\002\n"
+				"        \002AKICK \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002AutoKick list\002 for a channel.  If a user\n"
+				"on the AutoKick list attempts to join the channel,\n"
+				"%S will ban that user from the channel, then kick\n"
+				"the user.\n"
+				" \n"
+				"The \002AKICK ADD\002 command adds the given nick or usermask\n"
+				"to the AutoKick list.  If a \037reason\037 is given with\n"
+				"the command, that reason will be used when the user is\n"
+				"kicked; if not, the default reason is \"You have been\n"
+				"banned from the channel\".\n"
+				"When akicking a \037registered nick\037 the nickserv account\n"
+				"will be added to the akick list instead of the mask.\n"
+				"All users within that nickgroup will then be akicked.\n"
+				" \n"
+				"The \002AKICK DEL\002 command removes the given nick or mask\n"
+				"from the AutoKick list.  It does not, however, remove any\n"
+				"bans placed by an AutoKick; those must be removed\n"
+				"manually.\n"
+				" \n"
+				"The \002AKICK LIST\002 command displays the AutoKick list, or\n"
+				"optionally only those AutoKick entries which match the\n"
+				"given mask.\n"
+				" \n"
+				"The \002AKICK VIEW\002 command is a more verbose version of\n"
+				"\002AKICK LIST\002 command.\n"
+				" \n"
+				"The \002AKICK ENFORCE\002 command causes %S to enforce the\n"
+				"current AKICK list by removing those users who match an\n"
+				"AKICK mask.\n"
+				" \n"
+				"The \002AKICK CLEAR\002 command clears all entries of the\n"
+				"akick list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "AKICK", CHAN_AKICK_SYNTAX);
+		SyntaxError(source, "AKICK", _("AKICK \037channel\037 {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [\037nick-or-usermask\037] [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_AKICK);
+		source.Reply(_("    AKICK      Maintain the AutoKick list"));
 	}
 };
 
diff --git a/modules/core/cs_ban.cpp b/modules/core/cs_ban.cpp
index 8ff5319fb..9d2291771 100644
--- a/modules/core/cs_ban.cpp
+++ b/modules/core/cs_ban.cpp
@@ -36,21 +36,21 @@ class CommandCSBan : public Command
 		uint16 u_level = u_access ? u_access->level : 0, u2_level = u2_access ? u2_access->level : 0;
 
 		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!u2)
-			source.Reply(NICK_X_NOT_IN_USE, target.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, target.c_str());
 		else if (!is_same ? !check_access(u, ci, CA_BAN) : !check_access(u, ci, CA_BANME))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!is_same && ci->HasFlag(CI_PEACE) && u2_level >= u_level)
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		/*
 		 * Dont ban/kick the user on channels where he is excepted
 		 * to prevent services <-> server wars.
 		 */
 		else if (matches_list(ci->c, u2, CMODE_EXCEPT))
-			source.Reply(CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
+			source.Reply(LanguageString::CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
 		else if (u2->IsProtected())
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else
 		{
 			Anope::string mask;
@@ -76,18 +76,23 @@ class CommandCSBan : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_BAN);
+		source.Reply(_("Syntax: \002BAN \037#channel\037 \037nick\037 [\037reason\037]\002\n"
+				" \n"
+				"Bans a selected nick on a channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 access \n"
+				"and above on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "BAN", CHAN_BAN_SYNTAX);
+		SyntaxError(source, "BAN", _("BAN \037#channel\037 \037nick\037 [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_BAN);
+		source.Reply(_("    BAN        Bans a selected nick on a channel"));
 	}
 };
 
diff --git a/modules/core/cs_clearusers.cpp b/modules/core/cs_clearusers.cpp
index e171814dd..b4786209c 100644
--- a/modules/core/cs_clearusers.cpp
+++ b/modules/core/cs_clearusers.cpp
@@ -31,9 +31,9 @@ class CommandCSClearUsers : public Command
 		Anope::string modebuf;
 
 		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!check_access(u, ci, CA_FOUNDER))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		
 		Anope::string buf = "CLEARUSERS command from " + u->nick + " (" + u->Account()->display + ")";
 
@@ -44,25 +44,30 @@ class CommandCSClearUsers : public Command
 			c->Kick(NULL, uc->user, "%s", buf.c_str());
 		}
 
-		source.Reply(CHAN_CLEARED_USERS, chan.c_str());
+		source.Reply(_("All users have been kicked from \2%s\2."), chan.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_CLEARUSERS);
+		source.Reply(_("Syntax: \002CLEARUSERS \037channel\037\002\n"
+				" \n"
+				"Tells %S to clear (kick) all users certain settings on a channel."
+				" \n"
+				"By default, limited to those with founder access on the\n"
+				"channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "CLEAR", CHAN_CLEARUSERS_SYNTAX);
+		SyntaxError(source, "CLEAR", _("CLEARUSERS \037channel\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_CLEARUSERS);
+		source.Reply(_("    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"));
 	}
 };
 
diff --git a/modules/core/cs_clone.cpp b/modules/core/cs_clone.cpp
index 7f4d3ca89..9222819fe 100644
--- a/modules/core/cs_clone.cpp
+++ b/modules/core/cs_clone.cpp
@@ -31,24 +31,24 @@ public:
 
 		if (!check_access(u, ci, CA_SET))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 		ChannelInfo *target_ci = cs_findchan(target);
 		if (!target_ci)
 		{
-			source.Reply(CHAN_X_NOT_REGISTERED, target.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, target.c_str());
 			return MOD_CONT;
 		}
 		if (!IsFounder(u, ci) || !IsFounder(u, target_ci))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (Config->CSMaxReg && u->Account()->channelcount >= Config->CSMaxReg && !u->Account()->HasPriv("chanserv/no-register-limit"))
 		{
-			source.Reply(u->Account()->channelcount > Config->CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg);
+			source.Reply(u->Account()->channelcount > Config->CSMaxReg ? LanguageString::CHAN_EXCEEDED_CHANNEL_LIMIT : LanguageString::CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg);
 			return MOD_CONT;
 		}
 
@@ -100,7 +100,7 @@ public:
 
 			FOREACH_MOD(I_OnChanRegistered, OnChanRegistered(target_ci));
 
-			source.Reply(CHAN_CLONED, channel.c_str(), target.c_str());
+			source.Reply(_("All settings from \002%s\002 have been transferred to \002%s\002"), channel.c_str(), target.c_str());
 		}
 		else if (what.equals_ci("ACCESS"))
 		{
@@ -111,7 +111,7 @@ public:
 				target_ci->AddAccess(access->mask, access->level, access->creator, access->last_seen);
 			}
 
-			source.Reply(CHAN_CLONED_ACCESS, channel.c_str(), target.c_str());
+			source.Reply(_("All access entries from \002%s\002 have been transferred to \002%s\002"), channel.c_str(), target.c_str());
 		}
 		else if (what.equals_ci("AKICK"))
 		{
@@ -125,7 +125,7 @@ public:
 					target_ci->AddAkick(akick->creator, akick->mask, akick->reason, akick->addtime, akick->last_used);
 			}
 
-			source.Reply(CHAN_CLONED_AKICK, channel.c_str(), target.c_str());
+			source.Reply(_("All akick entries from \002%s\002 have been transferred to \002%s\002"), channel.c_str(), target.c_str());
 		}
 		else if (what.equals_ci("BADWORDS"))
 		{
@@ -136,7 +136,7 @@ public:
 				target_ci->AddBadWord(bw->word, bw->type);
 			}
 
-			source.Reply(CHAN_CLONED_BADWORDS, channel.c_str(), target.c_str());
+			source.Reply(_("All badword entries from \002%s\002 have been transferred to \002%s\002"), channel.c_str(), target.c_str());
 		}
 		else
 		{
@@ -151,18 +151,23 @@ public:
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_CLONE);
+		source.Reply(_("Syntax: \002CLONE \037channel\037 \037target\037 [all | access | akick | badwords]\002\n"
+				" \n"
+				"Copies all settings, access, akicks, etc from channel to the\n"
+				"target channel. If access, akick, or badwords is specified then only\n"
+				"the respective settings are transferred. You must have founder level\n"
+				"access to \037channel\037 and \037target\037."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "CLONE", CHAN_CLONE_SYNTAX);
+		SyntaxError(source, "CLONE", _("CLONE \037channel\037 \037target\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_CLONE);
+		source.Reply(_("    CLONE      Copy all settings from one channel to another"));
 	}
 };
 
diff --git a/modules/core/cs_drop.cpp b/modules/core/cs_drop.cpp
index b5ab4f981..af01b9726 100644
--- a/modules/core/cs_drop.cpp
+++ b/modules/core/cs_drop.cpp
@@ -31,7 +31,7 @@ class CommandCSDrop : public Command
 
 		if (readonly)
 		{
-			source.Reply(CHAN_DROP_DISABLED); // XXX: READ_ONLY_MODE?
+			source.Reply(_("Sorry, channel de-registration is temporarily disabled.")); // XXX: READ_ONLY_MODE?
 			return MOD_CONT;
 		}
 
@@ -39,19 +39,19 @@ class CommandCSDrop : public Command
 
 		if (ci->HasFlag(CI_FORBIDDEN) && !u->Account()->HasCommand("chanserv/drop"))
 		{
-			source.Reply(CHAN_X_FORBIDDEN, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_FORBIDDEN, chan.c_str());
 			return MOD_CONT;
 		}
 
 		if (ci->HasFlag(CI_SUSPENDED) && !u->Account()->HasCommand("chanserv/drop"))
 		{
-			source.Reply(CHAN_X_FORBIDDEN, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_FORBIDDEN, chan.c_str());
 			return MOD_CONT;
 		}
 
 		if ((ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER)) && !u->Account()->HasCommand("chanserv/drop"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -71,7 +71,7 @@ class CommandCSDrop : public Command
 
 		delete ci;
 
-		source.Reply(CHAN_DROPPED, chan.c_str());
+		source.Reply(_("Channel \002%s\002 has been dropped."), chan.c_str());
 
 		FOREACH_MOD(I_OnChanDrop, OnChanDrop(chan));
 
@@ -82,21 +82,27 @@ class CommandCSDrop : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(CHAN_SERVADMIN_HELP_DROP);
+			source.Reply(_("Syntax: \002DROP \037channel\037\002\n"
+					" \n"
+					"Unregisters the named channel.  Only \002Services Operators\002\n"
+					"can drop a channel for which they have not identified."));
 		else
-			source.Reply(CHAN_HELP_DROP);
+			source.Reply(_("Syntax: \002DROP \037channel\037\002\n"
+					" \n"
+					"Unregisters the named channel.  Can only be used by\n"
+					"\002channel founder\002."));
 
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DROP", CHAN_DROP_SYNTAX);
+		SyntaxError(source, "DROP", _("DROP \037channel\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_DROP);
+		source.Reply(_("    DROP       Cancel the registration of a channel"));
 	}
 };
 
diff --git a/modules/core/cs_forbid.cpp b/modules/core/cs_forbid.cpp
index b6246c578..3fc054a73 100644
--- a/modules/core/cs_forbid.cpp
+++ b/modules/core/cs_forbid.cpp
@@ -31,19 +31,19 @@ class CommandCSForbid : public Command
 
 		if (Config->ForceForbidReason && reason.empty())
 		{
-			SyntaxError(source, "FORBID", CHAN_FORBID_SYNTAX_REASON);
+			SyntaxError(source, "FORBID", _("FORBID \037channel\037 \037reason\037"));
 			return MOD_CONT;
 		}
 
 		if (chan[0] != '#')
 		{
-			source.Reply(CHAN_SYMBOL_REQUIRED);
+			source.Reply(LanguageString::CHAN_SYMBOL_REQUIRED);
 			return MOD_CONT;
 		}
 
 		if (readonly)
 		{
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 			return MOD_CONT;
 		}
 
@@ -74,7 +74,7 @@ class CommandCSForbid : public Command
 				if (uc->user->HasMode(UMODE_OPER))
 					continue;
 
-				c->Kick(ChanServ, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user, CHAN_FORBID_REASON).c_str());
+				c->Kick(ChanServ, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user->Account(), _("This channel has been forbidden.")).c_str());
 			}
 		}
 
@@ -88,7 +88,7 @@ class CommandCSForbid : public Command
 			ircdproto->SendGlobops(ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick.c_str(), ci->name.c_str());
 		Log(LOG_ADMIN, u, this, ci) << (!ci->forbidreason.empty() ? ci->forbidreason : "No reason");
 
-		source.Reply(CHAN_FORBID_SUCCEEDED, chan.c_str());
+		source.Reply(_("Channel \002%s\002 is now forbidden."), chan.c_str());
 
 		FOREACH_MOD(I_OnChanForbidden, OnChanForbidden(ci));
 
@@ -97,18 +97,23 @@ class CommandCSForbid : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_SERVADMIN_HELP_FORBID);
+		source.Reply(_("Syntax: \002FORBID \037channel\037 [\037reason\037]\002\n"
+				" \n"
+				"Disallows anyone from registering or using the given\n"
+				"channel.  May be cancelled by dropping the channel.\n"
+				" \n"
+				"Reason may be required on certain networks."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "FORBID", CHAN_FORBID_SYNTAX);
+		SyntaxError(source, "FORBID", _("FORBID \037channel\037 [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_FORBID);
+		source.Reply(_("    FORBID     Prevent a channel from being used"));
 	}
 };
 
diff --git a/modules/core/cs_getkey.cpp b/modules/core/cs_getkey.cpp
index cde4e7bb7..0842d2caf 100644
--- a/modules/core/cs_getkey.cpp
+++ b/modules/core/cs_getkey.cpp
@@ -29,38 +29,40 @@ class CommandCSGetKey : public Command
 
 		if (!check_access(u, ci, CA_GETKEY) && !u->Account()->HasCommand("chanserv/getkey"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		Anope::string key;
 		if (!ci->c || !ci->c->GetParam(CMODE_KEY, key))
 		{
-			source.Reply(CHAN_GETKEY_NOKEY, chan.c_str());
+			source.Reply(_("The channel \002%s\002 has no key."), chan.c_str());
 			return MOD_CONT;
 		}
 
 		bool override = !check_access(u, ci, CA_GETKEY);
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci);
 
-		source.Reply(CHAN_GETKEY_KEY, chan.c_str(), key.c_str());
+		source.Reply(_("Key for channel \002%s\002 is \002%s\002."), chan.c_str(), key.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_GETKEY);
+		source.Reply(_("Syntax: \002GETKEY \037channel\037\002\n"
+				" \n"
+				"Returns the key of the given channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "GETKEY", CHAN_GETKEY_SYNTAX);
+		SyntaxError(source, "GETKEY", _("GETKEY \037channel\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_GETKEY);
+		source.Reply(_("    GETKEY     Returns the key of the given channel"));
 	}
 };
 
diff --git a/modules/core/cs_help.cpp b/modules/core/cs_help.cpp
index d74c7b2d5..b1916bace 100644
--- a/modules/core/cs_help.cpp
+++ b/modules/core/cs_help.cpp
@@ -32,14 +32,25 @@ class CommandCSHelp : public Command
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(CHAN_HELP);
+		source.Reply(_("\002%S\002 allows you to register and control various\n"
+				"aspects of channels. %S can often prevent\n"
+				"malicious users from \"taking over\" channels by limiting\n"
+				"who is allowed channel operator privileges. Available\n"
+				"commands are listed below; to use them, type\n"
+				"\002%R%S \037command\037\002. For more information on a\n"
+				"specific command, type \002%R%S HELP \037command\037\002."));
 		for (CommandMap::const_iterator it = ChanServ->Commands.begin(); it != ChanServ->Commands.end(); ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
 		if (Config->CSExpire >= 86400)
-			source.Reply(CHAN_HELP_EXPIRES, Config->CSExpire / 86400);
+			source.Reply(_("Note that any channel which is not used for %d days\n"
+			"(i.e. which no user on the channel's access list enters\n"
+			"for that period of time) will be automatically dropped."), Config->CSExpire / 86400);
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(CHAN_SERVADMIN_HELP);
+			source.Reply(_(" \n"
+					"Services Operators can also drop any channel without needing\n"
+					"to identify via password, and may view the access, AKICK,\n"
+					"and level setting lists for any channel."));
 	}
 };
 
diff --git a/modules/core/cs_info.cpp b/modules/core/cs_info.cpp
index dade872c0..b7b4ffacd 100644
--- a/modules/core/cs_info.cpp
+++ b/modules/core/cs_info.cpp
@@ -47,9 +47,9 @@ class CommandCSInfo : public Command
 		if (ci->HasFlag(CI_FORBIDDEN))
 		{
 			if (u->HasMode(UMODE_OPER) && !ci->forbidby.empty())
-				source.Reply(CHAN_X_FORBIDDEN_OPER, chan.c_str(), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : GetString(u, NO_REASON).c_str());
+				source.Reply(LanguageString::CHAN_X_FORBIDDEN_OPER, chan.c_str(), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : GetString(u->Account(), LanguageString::NO_REASON).c_str());
 			else
-				source.Reply(CHAN_X_FORBIDDEN, chan.c_str());
+				source.Reply(LanguageString::CHAN_X_FORBIDDEN, chan.c_str());
 
 			return MOD_CONT;
 		}
@@ -58,55 +58,55 @@ class CommandCSInfo : public Command
 		if (has_auspex || check_access(u, ci, CA_INFO))
 			show_all = true;
 
-		source.Reply(CHAN_INFO_HEADER, chan.c_str());
-		source.Reply(CHAN_INFO_NO_FOUNDER, ci->founder->display.c_str());
+		source.Reply(LanguageString::CHAN_INFO_HEADER, chan.c_str());
+		source.Reply(_("        Founder: %s"), ci->founder->display.c_str());
 
 		if (show_all && ci->successor)
-			source.Reply(CHAN_INFO_NO_SUCCESSOR, ci->successor->display.c_str());
+			source.Reply(_("      Successor: %s"), ci->successor->display.c_str());
 
-		source.Reply(CHAN_INFO_DESCRIPTION, ci->desc.c_str());
-		source.Reply(CHAN_INFO_TIME_REGGED, do_strftime(ci->time_registered).c_str());
-		source.Reply(CHAN_INFO_LAST_USED, do_strftime(ci->last_used).c_str());
+		source.Reply(_("    Description: %s"), ci->desc.c_str());
+		source.Reply(_("     Registered: %s"), do_strftime(ci->time_registered).c_str());
+		source.Reply(_("      Last used: %s"), do_strftime(ci->last_used).c_str());
 
 		ModeLock *secret = ci->GetMLock(CMODE_SECRET);
 		if (!ci->last_topic.empty() && (show_all || ((!secret || secret->set == false) && (!ci->c || !ci->c->HasMode(CMODE_SECRET)))))
 		{
-			source.Reply(CHAN_INFO_LAST_TOPIC, ci->last_topic.c_str());
-			source.Reply(CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str());
+			source.Reply(_("     Last topic: %s"), ci->last_topic.c_str());
+			source.Reply(_("   Topic set by: %s"), ci->last_topic_setter.c_str());
 		}
 
 		if (show_all)
 		{
-			source.Reply(CHAN_INFO_BANTYPE, ci->bantype);
+			source.Reply(_("       Ban type: %d"), ci->bantype);
 			Anope::string optbuf;
 
-			CheckOptStr(optbuf, CI_KEEPTOPIC, GetString(u, CHAN_INFO_OPT_KEEPTOPIC), ci, u->Account());
-			CheckOptStr(optbuf, CI_OPNOTICE, GetString(u, CHAN_INFO_OPT_OPNOTICE), ci, u->Account());
-			CheckOptStr(optbuf, CI_PEACE, GetString(u, CHAN_INFO_OPT_PEACE), ci, u->Account());
-			CheckOptStr(optbuf, CI_PRIVATE, GetString(u, NICK_INFO_OPT_PRIVATE), ci, u->Account());
-			CheckOptStr(optbuf, CI_RESTRICTED, GetString(u, CHAN_INFO_OPT_RESTRICTED), ci, u->Account());
-			CheckOptStr(optbuf, CI_SECURE, GetString(u, CHAN_INFO_OPT_SECURE), ci, u->Account());
-			CheckOptStr(optbuf, CI_SECUREFOUNDER, GetString(u, CHAN_INFO_OPT_SECUREFOUNDER), ci, u->Account());
-			CheckOptStr(optbuf, CI_SECUREOPS, GetString(u, CHAN_INFO_OPT_SECUREOPS), ci, u->Account());
+			CheckOptStr(optbuf, CI_KEEPTOPIC, GetString(u->Account(), _("Topic Retention")), ci, u->Account());
+			CheckOptStr(optbuf, CI_OPNOTICE, GetString(u->Account(), _("OP Notice")), ci, u->Account());
+			CheckOptStr(optbuf, CI_PEACE, GetString(u->Account(), _("Peace")), ci, u->Account());
+			CheckOptStr(optbuf, CI_PRIVATE, GetString(u->Account(), _("Private")), ci, u->Account());
+			CheckOptStr(optbuf, CI_RESTRICTED, GetString(u->Account(), _("Restricted Access")), ci, u->Account());
+			CheckOptStr(optbuf, CI_SECURE, GetString(u->Account(), _("Secure")), ci, u->Account());
+			CheckOptStr(optbuf, CI_SECUREFOUNDER, GetString(u->Account(), _("Secure Founder")), ci, u->Account());
+			CheckOptStr(optbuf, CI_SECUREOPS, GetString(u->Account(), _("Secure Ops")), ci, u->Account());
 			if (ci->HasFlag(CI_SIGNKICK))
-				CheckOptStr(optbuf, CI_SIGNKICK, GetString(u, CHAN_INFO_OPT_SIGNKICK), ci, u->Account());
+				CheckOptStr(optbuf, CI_SIGNKICK, GetString(u->Account(), _("Signed kicks")), ci, u->Account());
 			else
-				CheckOptStr(optbuf, CI_SIGNKICK_LEVEL, GetString(u, CHAN_INFO_OPT_SIGNKICK), ci, u->Account());
-			CheckOptStr(optbuf, CI_TOPICLOCK, GetString(u, CHAN_INFO_OPT_TOPICLOCK), ci, u->Account());
-			CheckOptStr(optbuf, CI_XOP, GetString(u, CHAN_INFO_OPT_XOP), ci, u->Account());
-			CheckOptStr(optbuf, CI_PERSIST, GetString(u, CHAN_INFO_OPT_PERSIST), ci, u->Account());
+				CheckOptStr(optbuf, CI_SIGNKICK_LEVEL, GetString(u->Account(), _("Signed kicks")), ci, u->Account());
+			CheckOptStr(optbuf, CI_TOPICLOCK, GetString(u->Account(), _("Topic Lock")), ci, u->Account());
+			CheckOptStr(optbuf, CI_XOP, GetString(u->Account(), _("xOP lists system")), ci, u->Account());
+			CheckOptStr(optbuf, CI_PERSIST, GetString(u->Account(), _("Persistant")), ci, u->Account());
 
-			source.Reply(NICK_INFO_OPTIONS, optbuf.empty() ? GetString(u, NICK_INFO_OPT_NONE).c_str() : optbuf.c_str());
-			source.Reply(CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1).c_str());
+			source.Reply(LanguageString::NICK_INFO_OPTIONS, optbuf.empty() ? _("None") : optbuf.c_str());
+			source.Reply(_("      Mode lock: %s"), get_mlock_modes(ci, 1).c_str());
 
 			// XXX: we could just as easily (and tidily) merge this in with the flags display above.
 			if (ci->HasFlag(CI_NO_EXPIRE))
-				source.Reply(CHAN_INFO_NO_EXPIRE);
+				source.Reply(_("This channel will not expire."));
 			else
-				source.Reply(CHAN_INFO_EXPIRE, do_strftime(ci->last_used + Config->CSExpire).c_str());
+				source.Reply(_("      Expires on: %s"), do_strftime(ci->last_used + Config->CSExpire).c_str());
 		}
 		if (ci->HasFlag(CI_SUSPENDED))
-			source.Reply(CHAN_X_SUSPENDED, ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : GetString(u, NO_REASON).c_str());
+			source.Reply(_("      Suspended: [%s] %s"), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : GetString(u->Account(), LanguageString::NO_REASON).c_str());
 
 		FOREACH_MOD(I_OnChanInfo, OnChanInfo(u, ci, show_all));
 
@@ -115,19 +115,24 @@ class CommandCSInfo : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_INFO);
-
+		source.Reply(_("Syntax: \002INFO \037channel\037\002\n"
+				" \n"
+				"Lists information about the named registered channel,\n"
+				"including its founder, time of registration, last time\n"
+				"used, description, and mode lock, if any. If \002ALL\002 is \n"
+				"specified, the entry message and successor will also \n"
+				"be displayed."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "INFO", CHAN_INFO_SYNTAX);
+		SyntaxError(source, "INFO", _("INFO \037channel\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_INFO);
+		source.Reply(_("    INFO       Lists information about the named registered channel"));
 	}
 };
 
diff --git a/modules/core/cs_invite.cpp b/modules/core/cs_invite.cpp
index a7a3a6e40..0f55c1e1e 100644
--- a/modules/core/cs_invite.cpp
+++ b/modules/core/cs_invite.cpp
@@ -30,7 +30,7 @@ class CommandCSInvite : public Command
 
 		if (!(c = findchan(chan)))
 		{
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 			return MOD_CONT;
 		}
 
@@ -38,7 +38,7 @@ class CommandCSInvite : public Command
 
 		if (!check_access(u, ci, CA_INVITE))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -49,7 +49,7 @@ class CommandCSInvite : public Command
 		{
 			if (!(u2 = finduser(params[1])))
 			{
-				source.Reply(NICK_X_NOT_IN_USE, params[1].c_str());
+				source.Reply(LanguageString::NICK_X_NOT_IN_USE, params[1].c_str());
 				return MOD_CONT;
 			}
 		}
@@ -58,30 +58,35 @@ class CommandCSInvite : public Command
 		Log(LOG_COMMAND, u, this, ci) << "for " << u2->nick;
 
 		if (c->FindUser(u2))
-			source.Reply(CHAN_INVITE_ALREADY_IN, c->name.c_str());
+			source.Reply(_("You are already in \002%s\002! "), c->name.c_str());
 		else
 		{
 			ircdproto->SendInvite(whosends(ci), chan, u2->nick);
-			source.Reply(CHAN_INVITE_OTHER_SUCCESS, u2->nick.c_str(), c->name.c_str());
-			u2->SendMessage(whosends(ci), CHAN_INVITE_SUCCESS, c->name.c_str());
+			source.Reply(_("\002%s\002 has been invited to \002%s\002."), u2->nick.c_str(), c->name.c_str());
+			u2->SendMessage(whosends(ci), _("You have been invited to \002%s\002."), c->name.c_str());
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_INVITE);
+		source.Reply(_("Syntax: \002INVITE \037channel\037\002\n"
+				" \n"
+				"Tells %S to invite you into the given channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 and above\n"
+				"on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "INVITE", CHAN_INVITE_SYNTAX);
+		SyntaxError(source, "INVITE", _("INVITE \037channel\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_INVITE);
+		source.Reply(_("    INVITE     Tells ChanServ to invite you into a channel"));
 	}
 };
 
diff --git a/modules/core/cs_kick.cpp b/modules/core/cs_kick.cpp
index 1e7b5970d..5f89d6b16 100644
--- a/modules/core/cs_kick.cpp
+++ b/modules/core/cs_kick.cpp
@@ -36,17 +36,17 @@ class CommandCSKick : public Command
 		uint16 u_level = u_access ? u_access->level : 0, u2_level = u2_access ? u2_access->level : 0;
 
 		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!u2)
-			source.Reply(NICK_X_NOT_IN_USE, target.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, target.c_str());
 		else if (!is_same ? !check_access(u, ci, CA_KICK) : !check_access(u, ci, CA_KICKME))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!is_same && (ci->HasFlag(CI_PEACE)) && u2_level >= u_level)
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (u2->IsProtected())
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!c->FindUser(u2))
-			source.Reply(NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
 		else
 		{
 			 // XXX
@@ -62,18 +62,23 @@ class CommandCSKick : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_KICK);
+		source.Reply(_("Syntax: \002KICK \037#channel\037 \037nick\037 [\037reason\037]\002\n"
+				" \n"
+				"Kicks a selected nick on a channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 access \n"
+				"and above on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "KICK", CHAN_KICK_SYNTAX);
+		SyntaxError(source, "KICK", _("KICK \037#channel\037 \037nick\037 [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_KICK);
+		source.Reply(_("    KICK       Kicks a selected nick from a channel"));
 	}
 };
 
diff --git a/modules/core/cs_list.cpp b/modules/core/cs_list.cpp
index f5773a901..b95bc3144 100644
--- a/modules/core/cs_list.cpp
+++ b/modules/core/cs_list.cpp
@@ -35,37 +35,27 @@ public:
 
 		if (Config->CSListOpersOnly && !u->HasMode(UMODE_OPER))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_STOP;
 		}
 
 		if (pattern[0] == '#')
 		{
 			Anope::string tmp = myStrGetToken(pattern.substr(1), '-', 0); /* Read FROM out */
-			if (tmp.empty())
+			if (tmp.empty() || !tmp.is_number_only())
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
-				source.Reply(CS_LIST_INCORRECT_RANGE);
-				return MOD_CONT;
-			}
-			if (!tmp.is_number_only())
-			{
-				source.Reply(LIST_INCORRECT_RANGE);
-				source.Reply(CS_LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
+				source.Reply(_("To search for channels starting with #, search for the channel\n"
+					"name without the #-sign prepended (\002anope\002 instead of \002#anope\002)."));
 				return MOD_CONT;
 			}
 			from = convertTo<int>(tmp);
 			tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
-			if (tmp.empty())
-			{
-				source.Reply(LIST_INCORRECT_RANGE);
-				source.Reply(CS_LIST_INCORRECT_RANGE);
-				return MOD_CONT;
-			}
-			if (!tmp.is_number_only())
+			if (tmp.empty() || !tmp.is_number_only())
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
-				source.Reply(CS_LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
+				source.Reply(_("To search for channels starting with #, search for the channel\n"
+					"name without the #-sign prepended (\002anope\002 instead of \002#anope\002)."));
 				return MOD_CONT;
 			}
 			to = convertTo<int>(tmp);
@@ -91,7 +81,7 @@ public:
 
 		Anope::string spattern = "#" + pattern;
 
-		source.Reply(NICK_LIST_HEADER, pattern.c_str());
+		source.Reply(LanguageString::LIST_HEADER, pattern.c_str());
 
 		for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it)
 		{
@@ -127,24 +117,29 @@ public:
 			}
 		}
 
-		source.Reply(CHAN_LIST_END, nchans > Config->CSListMax ? Config->CSListMax : nchans, nchans);
+		source.Reply(_("End of list - %d/%d matches shown."), nchans > Config->CSListMax ? Config->CSListMax : nchans, nchans);
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_LIST);
+		source.Reply(_("Syntax: \002LIST \037pattern\037\002\n"
+				" \n"
+				"Lists all registered channels matching the given pattern.\n"
+				"(Channels with the \002PRIVATE\002 option set are not listed.)\n"
+				"Note that a preceding '#' specifies a range, channel names\n"
+				"are to be written without '#'."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "LIST", NICK_LIST_SYNTAX);
+		SyntaxError(source, "LIST", LanguageString::NICK_LIST_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_LIST);
+		source.Reply(_("    LIST       Lists all registered channels matching the given pattern"));
 	}
 };
 
diff --git a/modules/core/cs_mode.cpp b/modules/core/cs_mode.cpp
index 7a2005688..dce1d4206 100644
--- a/modules/core/cs_mode.cpp
+++ b/modules/core/cs_mode.cpp
@@ -46,18 +46,18 @@ class CommandCSMode : public Command
 						ChannelMode *cm = ModeManager::FindChannelModeByChar(modes[i]);
 						if (!cm || !cm->CanSet(u))
 						{
-							source.Reply(CHAN_MODE_LOCK_UNKNOWN, modes[i]);
+							source.Reply(_("Unknown mode character %c ignored."), modes[i]);
 							break;
 						}
 						Anope::string mode_param;
 						if (((cm->Type == MODE_STATUS || cm->Type == MODE_LIST) && !sep.GetToken(mode_param)) || (cm->Type == MODE_PARAM && adding && !sep.GetToken(mode_param)))
-							source.Reply(CHAN_MODE_LOCK_MISSING_PARAM, cm->ModeChar);
+							source.Reply(_("Missing parameter for mode %c."), cm->ModeChar);
 						else
 						{
 							ci->SetMLock(cm, adding, mode_param, u->nick); 
 							if (!mode_param.empty())
 								mode_param = " " + mode_param;
-							source.Reply(CHAN_MODE_LOCKED, adding ? '+' : '-', cm->ModeChar, mode_param.c_str(), ci->name.c_str());
+							source.Reply(_("%c%c%s locked on %s"), adding ? '+' : '-', cm->ModeChar, mode_param.c_str(), ci->name.c_str());
 						}
 				}
 			}
@@ -89,22 +89,22 @@ class CommandCSMode : public Command
 						ChannelMode *cm = ModeManager::FindChannelModeByChar(modes[i]);
 						if (!cm || !cm->CanSet(u))
 						{
-							source.Reply(CHAN_MODE_LOCK_UNKNOWN, modes[i]);
+							source.Reply(_("Unknown mode character %c ignored."), modes[i]);
 							break;
 						}
 						Anope::string mode_param;
 						if (!cm->Type == MODE_REGULAR && !sep.GetToken(mode_param))
-							source.Reply(CHAN_MODE_LOCK_MISSING_PARAM, cm->ModeChar);
+							source.Reply(_("Missing parameter for mode %c."), cm->ModeChar);
 						else
 						{
 							if (ci->RemoveMLock(cm, mode_param))
 							{
 								if (!mode_param.empty())
 									mode_param = " " + mode_param;
-								source.Reply(CHAN_MODE_UNLOCKED, adding == 1 ? '+' : '-', cm->ModeChar, mode_param.c_str(), ci->name.c_str());
+								source.Reply(_("%c%c%s has been unlocked from %s."), adding == 1 ? '+' : '-', cm->ModeChar, mode_param.c_str(), ci->name.c_str());
 							}
 							else
-								source.Reply(CHAN_MODE_NOT_LOCKED, cm->ModeChar, ci->name.c_str());
+								source.Reply(_("%c is not locked on %s."), cm->ModeChar, ci->name.c_str());
 						}
 				}
 			}
@@ -114,11 +114,11 @@ class CommandCSMode : public Command
 			const std::multimap<ChannelModeName, ModeLock> &mlocks = ci->GetMLock();
 			if (mlocks.empty())
 			{
-				source.Reply(CHAN_MODE_LOCK_NONE, ci->name.c_str());
+				source.Reply(_("Channel %s has no mode locks."), ci->name.c_str());
 			}
 			else
 			{
-				source.Reply(CHAN_MODE_LOCK_HEADER, ci->name.c_str());
+				source.Reply(_("Mode locks for %s:"), ci->name.c_str());
 				for (std::multimap<ChannelModeName, ModeLock>::const_iterator it = mlocks.begin(), it_end = mlocks.end(); it != it_end; ++it)
 				{
 					const ModeLock &ml = it->second;
@@ -132,7 +132,7 @@ class CommandCSMode : public Command
 					Anope::string setter = ml.setter;
 					if (setter.empty())
 						setter = ci->founder ? ci->founder->display : "Unknown";
-					source.Reply(CHAN_MODE_LIST_FMT, ml.set ? '+' : '-', cm->ModeChar, modeparam.c_str(), setter.c_str(), do_strftime(ml.created).c_str());
+					source.Reply(_("%c%c%s, by %s on %s"), ml.set ? '+' : '-', cm->ModeChar, modeparam.c_str(), setter.c_str(), do_strftime(ml.created).c_str());
 				}
 			}
 		}
@@ -265,9 +265,9 @@ class CommandCSMode : public Command
 		ChannelInfo *ci = source.ci;
 
 		if (!ci || !ci->c)
-			source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, ci->name.c_str());
 		else if (!check_access(u, ci, CA_MODE) && !u->Account()->HasCommand("chanserv/mode"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (subcommand.equals_ci("LOCK"))
 			this->DoLock(source, params);
 		else if (subcommand.equals_ci("SET"))
@@ -280,18 +280,36 @@ class CommandCSMode : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_MODE);
+		source.Reply(_("Syntax: \002MODE \037channel\037 LOCK {ADD|DEL|LIST} [\037what\037]\002\n"
+			"        \002MODE \037channel\037 SET \037modes\037\002\n"
+			" \n"
+			"Mainly controls mode locks and mode access (which is different from channel access)\n"
+			"on a channel.\n"
+			" \n"
+			"The \002MODE LOCK\002 command allows you to add, delete, and view mode locks on a channel.\n"
+			"If a mode is locked on or off, services will not allow that mode to be changed.\n"
+			"Example:\n"
+			"     \002MODE #channel LOCK ADD +bmnt *!*@*aol*\002\n"
+			" \n"
+			"The \002MODE SET\002 command allows you to set modes through services. Wildcards * and ? may\n"
+			"be given as parameters for list and status modes.\n"
+			"Example:\n"
+			"     \002MODE #channel SET +v *\002\n"
+			"       Sets voice status to all users in the channel.\n"
+			" \n"
+			"     \002MODE #channel SET -b ~c:*\n"
+			"       Clears all extended bans that start with ~c:"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "MODE", CHAN_MODE_SYNTAX);
+		SyntaxError(source, "MODE", _("MODE \037channel\037 {LOCK|SET} [\037modes\037 | {ADD|DEL|LIST} [\037what\037]]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_MODE);
+		source.Reply(_("    MODE       Control modes and mode locks on a channel"));
 	}
 };
 
diff --git a/modules/core/cs_modes.cpp b/modules/core/cs_modes.cpp
index 71210bfef..91748b941 100644
--- a/modules/core/cs_modes.cpp
+++ b/modules/core/cs_modes.cpp
@@ -54,19 +54,19 @@ class CommandModeBase : public Command
 		uint16 u_level = u_access ? u_access->level : 0, u2_level = u2_access ? u2_access->level : 0;
 
 		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!ci)
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, chan.c_str());
 		else if (!u2)
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else if (is_same ? !check_access(u, ci, levelself) : !check_access(u, ci, level))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!set && !is_same && ci->HasFlag(CI_PEACE) && u2_level >= u_level)
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!set && u2->IsProtected() && !is_same)
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!c->FindUser(u2))
-			source.Reply(NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
 		else
 		{
 			if (set)
@@ -101,18 +101,25 @@ class CommandCSOp : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_OP);
+		source.Reply(_("Syntax: \002OP [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Ops a selected nick on a channel. If nick is not given,\n"
+				"it will op you. If channel is not given, it will op you\n"
+				"on every channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 access \n"
+				"and above on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "OP", CHAN_OP_SYNTAX);
+		SyntaxError(source, "OP", _("OP [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_OP);
+		source.Reply(_("    OP         Gives Op status to a selected nick on a channel"));
 	}
 };
 
@@ -132,18 +139,25 @@ class CommandCSDeOp : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_DEOP);
+		source.Reply(_("Syntax: \002DEOP [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Deops a selected nick on a channel. If nick is not given,\n"
+				"it will deop you. If channel is not given, it will deop\n"
+				"you on every channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 access \n"
+				"and above on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEOP", CHAN_DEOP_SYNTAX);
+		SyntaxError(source, "DEOP", _("DEOP [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_DEOP);
+		source.Reply(_("    DEOP       Deops a selected nick on a channel"));
 	}
 };
 
@@ -163,18 +177,26 @@ class CommandCSVoice : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_VOICE);
+		source.Reply(_("Syntax: \002VOICE [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Voices a selected nick on a channel. If nick is not given,\n"
+				"it will voice you. If channel is not given, it will voice you\n"
+				"on every channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 access \n"
+				"and above on the channel, or to VOPs or those with level 3 \n"
+				"and above for self voicing."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "VOICE", CHAN_VOICE_SYNTAX);
+		SyntaxError(source, "VOICE", _("VOICE [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_VOICE);
+		source.Reply(_("    VOICE      Voices a selected nick on a channel"));
 	}
 };
 
@@ -194,18 +216,26 @@ class CommandCSDeVoice : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_DEVOICE);
+		source.Reply(_("Syntax: \002DEVOICE [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Devoices a selected nick on a channel. If nick is not given,\n"
+				"it will devoice you. If channel is not given, it will devoice\n"
+				"you on every channel.\n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 access \n"
+				"and above on the channel, or to VOPs or those with level 3 \n"
+				"and above for self devoicing."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEVOICE", CHAN_DEVOICE_SYNTAX);
+		SyntaxError(source, "DEVOICE", _("DEVOICE [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_DEVOICE);
+		source.Reply(_("    DEVOICE    Devoices a selected nick on a channel"));
 	}
 };
 
@@ -228,18 +258,25 @@ class CommandCSHalfOp : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_HALFOP);
+		source.Reply(_("Syntax: \002HALFOP [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Halfops a selected nick on a channel. If nick is not given,\n"
+				"it will halfop you. If channel is not given, it will halfop\n"
+				"you on every channel.\n"
+				" \n"
+				"By default, limited to AOPs and those with level 5 access \n"
+				"and above on the channel, or to HOPs or those with level 4 \n"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "HALFOP", CHAN_HALFOP_SYNTAX);
+		SyntaxError(source, "HALFOP", _("HALFOP [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_HALFOP);
+		source.Reply(_("    HALFOP     Halfops a selected nick on a channel"));
 	}
 };
 
@@ -262,18 +299,26 @@ class CommandCSDeHalfOp : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_DEHALFOP);
+		source.Reply(_("Syntax: \002DEHALFOP [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Dehalfops a selected nick on a channel. If nick is not given,\n"
+				"it will dehalfop you. If channel is not given, it will dehalfop\n"
+				"you on every channel.\n"
+				" \n"
+				"By default, limited to AOPs and those with level 5 access \n"
+				"and above on the channel, or to HOPs or those with level 4 \n"
+				"and above for self dehalfopping."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEHALFOP", CHAN_DEHALFOP_SYNTAX);
+		SyntaxError(source, "DEHALFOP", _("DEHALFOP [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_DEHALFOP);
+		source.Reply(_("    DEHALFOP   Dehalfops a selected nick on a channel"));
 	}
 };
 
@@ -296,18 +341,25 @@ class CommandCSProtect : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_PROTECT);
+		source.Reply(_("Syntax: \002PROTECT [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Protects a selected nick on a channel. If nick is not given,\n"
+				"it will protect you. If channel is not given, it will protect\n"
+				"you on every channel.\n"
+				" \n"
+				"By default, limited to the founder, or to SOPs or those with \n"
+				"level 10 and above on the channel for self protecting."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "PROTECT", CHAN_PROTECT_SYNTAX);
+		SyntaxError(source, "PROTECT", _("PROTECT [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_PROTECT);
+		source.Reply(_("    PROTECT    Protects a selected nick on a channel"));
 	}
 };
 
@@ -330,18 +382,24 @@ class CommandCSDeProtect : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_DEPROTECT);
+		source.Reply(_("Syntax: \002DEPROTECT [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Deprotects a selected nick on a channel. If nick is not given,\n"
+				"it will deprotect you. If channel is not given, it will deprotect\n"
+				"you on every channel.\n"
+				" \n"
+				"By default, limited to the founder, or to SOPs or those with \n"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEPROTECT", CHAN_DEPROTECT_SYNTAX);
+		SyntaxError(source, "DEPROTECT", _("DEROTECT [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_DEPROTECT);
+		source.Reply(_("    DEPROTECT  Deprotects a selected nick on a channel"));
 	}
 };
 
@@ -364,18 +422,24 @@ class CommandCSOwner : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_OWNER);
+		source.Reply(_("Syntax: \002OWNER [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Gives the selected nick owner status on \002channel\002. If nick is not\n"
+				"given, it will give you owner. If channel is not given, it will\n"
+				"give you owner on every channel.\n"
+				" \n"
+				"Limited to those with founder access on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "OWNER", CHAN_OWNER_SYNTAX);
+		SyntaxError(source, "OWNER", _("OWNER [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_OWNER);
+		source.Reply(_("    OWNER      Gives you owner status on channel"));
 	}
 };
 
@@ -398,18 +462,24 @@ class CommandCSDeOwner : public CommandModeBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_DEOWNER);
+		source.Reply(_("Syntax: \002DEOWNER [\037#channel\037] [\037nick\037]\002\n"
+				" \n"
+				"Removes owner status from the selected nick on \002channel\002. If nick\n"
+				"is not given, it will deowner you. If channel is not given, it will\n"
+				"deowner you on every channel.\n"
+				" \n"
+				"Limited to those with founder access on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEOWNER", CHAN_DEOWNER_SYNTAX);
+		SyntaxError(source, "DEOWNER", _("DEOWNER [\037#channel\037] [\037nick\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_DEOWNER);
+		source.Reply(_("    DEOWNER    Removes your owner status on a channel"));
 	}
 };
 
diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp
index 8407986e4..92d1746cb 100644
--- a/modules/core/cs_register.cpp
+++ b/modules/core/cs_register.cpp
@@ -32,22 +32,22 @@ class CommandCSRegister : public Command
 
 		if (readonly)
 		{
-			source.Reply(CHAN_REGISTER_DISABLED);
+			source.Reply(_("Sorry, channel registration is temporarily disabled."));
 			return MOD_CONT;
 		}
 
 		if (chan[0] == '&')
-			source.Reply(CHAN_REGISTER_NOT_LOCAL);
+			source.Reply(_("Local channels cannot be registered."));
 		else if (chan[0] != '#')
-			source.Reply(CHAN_SYMBOL_REQUIRED);
+			source.Reply(LanguageString::CHAN_SYMBOL_REQUIRED);
 		else if (!ircdproto->IsChannelValid(chan))
-			source.Reply(CHAN_X_INVALID, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_INVALID, chan.c_str());
 		else if (ci)
-			source.Reply(CHAN_ALREADY_REGISTERED, chan.c_str());
+			source.Reply(_("Channel \002%s\002 is already registered!"), chan.c_str());
 		else if (c && !c->HasUserStatus(u, CMODE_OP))
-			source.Reply(CHAN_MUST_BE_CHANOP);
+			source.Reply(_("You must be a channel operator to register the channel."));
 		else if (Config->CSMaxReg && u->Account()->channelcount >= Config->CSMaxReg && !u->Account()->HasPriv("chanserv/no-register-limit"))
-			source.Reply(u->Account()->channelcount > Config->CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg);
+			source.Reply(u->Account()->channelcount > Config->CSMaxReg ? LanguageString::CHAN_EXCEEDED_CHANNEL_LIMIT : LanguageString::CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg);
 		else
 		{
 			ci = new ChannelInfo(chan);
@@ -66,7 +66,7 @@ class CommandCSRegister : public Command
 			ci->bi = NULL;
 			++ci->founder->channelcount;
 			Log(LOG_COMMAND, u, this, ci);
-			source.Reply(CHAN_REGISTERED, chan.c_str(), u->nick.c_str());
+			source.Reply(_("Channel \002%s\002 registered under your nickname: %s"), chan.c_str(), u->nick.c_str());
 
 			/* Implement new mode lock */
 			if (c)
@@ -98,18 +98,37 @@ class CommandCSRegister : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_REGISTER, Config->s_ChanServ.c_str());
+		source.Reply(_("Syntax: \002REGISTER \037channel\037 \037description\037\002\n"
+			" \n"
+			"Registers a channel in the %S database.  In order\n"
+			"to use this command, you must first be a channel operator\n"
+			"on the channel you're trying to register.\n"
+			"The description, which \002must\002 be included, is a\n"
+			"general description of the channel's purpose.\n"
+			" \n"
+			"When you register a channel, you are recorded as the\n"
+			"\"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.\n"
+			"See the \002ACCESS\002 command (\002%R%S HELP ACCESS\002) for\n"
+			"information on giving a subset of these privileges to\n"
+			"other channel users.\n"
+			" \n"
+			"NOTICE: In order to register a channel, you must have\n"
+			"first registered your nickname.  If you haven't,\n"
+			"\002%R%s HELP\002 for information on how to do so."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "REGISTER", CHAN_REGISTER_SYNTAX);
+		SyntaxError(source, "REGISTER", _("REGISTER \037channel\037 \037description\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_REGISTER);
+		source.Reply(_("    REGISTER   Register a channel"));
 	}
 };
 
diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp
index 56329b37d..896f23971 100644
--- a/modules/core/cs_saset.cpp
+++ b/modules/core/cs_saset.cpp
@@ -34,14 +34,14 @@ class CommandCSSASet : public Command
 
 		if (readonly)
 		{
-			source.Reply(CHAN_SET_DISABLED);
+			source.Reply(LanguageString::CHAN_SET_DISABLED);
 			return MOD_CONT;
 		}
 
 		// XXX Remove after 1.9.4 release
 		if (params[1].equals_ci("MLOCK"))
 		{
-			source.Reply(CHAN_SET_MLOCK_DEPRECATED);
+			source.Reply(LanguageString::CHAN_SET_MLOCK_DEPRECATED);
 			return MOD_CONT;
 		}
 
@@ -58,8 +58,8 @@ class CommandCSSASet : public Command
 		}
 		else
 		{
-			source.Reply(NICK_SET_UNKNOWN_OPTION, params[1].c_str());
-			source.Reply(MORE_INFO, Config->s_ChanServ.c_str(), "SET");
+			source.Reply(_("Unknown SASET option \002%s\002."), params[1].c_str());
+			source.Reply(LanguageString::MORE_INFO, Config->s_ChanServ.c_str(), "SET");
 		}
 
 		return MOD_CONT;
@@ -69,10 +69,16 @@ class CommandCSSASet : public Command
 	{
 		if (subcommand.empty())
 		{
-			source.Reply(CHAN_HELP_SASET_HEAD);
+			source.Reply(_("Syntax: SASET \002channel\002 \037option\037 \037parameters\037\n"
+					" \n"
+					"Allows Services Operators to forcefully change settings\n"
+					"on channels.\n"
+					" \n"
+					"Available options:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(CHAN_HELP_SASET_TAIL);
+			source.Reply(_("Type \002%R%S HELP SASET \037option\037\002 for more information on a\n"
+				"particular option."));
 			return true;
 		}
 		else
@@ -88,12 +94,12 @@ class CommandCSSASet : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SASET);
+		source.Reply(_("    SASET      Forcefully set channel options and information"));
 	}
 
 	bool AddSubcommand(Module *creator, Command *c)
diff --git a/modules/core/cs_saset_noexpire.cpp b/modules/core/cs_saset_noexpire.cpp
index 53f32210a..0c769ad08 100644
--- a/modules/core/cs_saset_noexpire.cpp
+++ b/modules/core/cs_saset_noexpire.cpp
@@ -29,12 +29,12 @@ class CommandCSSASetNoexpire : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_NO_EXPIRE);
-			source.Reply(CHAN_SET_NOEXPIRE_ON, ci->name.c_str());
+			source.Reply(_("Channel %s \002will not\002 expire."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_NO_EXPIRE);
-			source.Reply(CHAN_SET_NOEXPIRE_OFF, ci->name.c_str());
+			source.Reply(_("Channel %s \002will\002 expire."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "NOEXPIRE");
@@ -44,18 +44,21 @@ class CommandCSSASetNoexpire : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
+		source.Reply(_("Syntax: \002SET \037channel\037 NOEXPIRE {ON | OFF}\002\n"
+				" \n"
+				"Sets whether the given channel will expire.  Setting this\n"
+				"to ON prevents the channel from expiring."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET NOEXPIRE", CHAN_SET_NOEXPIRE_SYNTAX);
+		SyntaxError(source, "SET NOEXPIRE", _("SET \037channel\037 NOEXPIRE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_NOEXPIRE);
+		source.Reply(_("    NOEXPIRE      Prevent the channel from expiring"));
 	}
 };
 
diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp
index a9db50cb2..489314e3c 100644
--- a/modules/core/cs_set.cpp
+++ b/modules/core/cs_set.cpp
@@ -34,19 +34,19 @@ class CommandCSSet : public Command
 
 		if (readonly)
 		{
-			source.Reply(CHAN_SET_DISABLED);
+			source.Reply(LanguageString::CHAN_SET_DISABLED);
 			return MOD_CONT;
 		}
 		if (!check_access(u, cs_findchan(params[0]), CA_SET))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		// XXX Remove after 1.9.4 release
 		if (params[1].equals_ci("MLOCK"))
 		{
-			source.Reply(CHAN_SET_MLOCK_DEPRECATED, Config->s_ChanServ.c_str());
+			source.Reply(LanguageString::CHAN_SET_MLOCK_DEPRECATED, Config->s_ChanServ.c_str());
 			return MOD_CONT;
 		}
 
@@ -62,8 +62,8 @@ class CommandCSSet : public Command
 		}
 		else
 		{
-			source.Reply(NICK_SET_UNKNOWN_OPTION, params[1].c_str());
-			source.Reply(MORE_INFO, Config->s_ChanServ.c_str(), "SET");
+			source.Reply(LanguageString::NICK_SET_UNKNOWN_OPTION, params[1].c_str());
+			source.Reply(LanguageString::MORE_INFO, Config->s_ChanServ.c_str(), "SET");
 		}
 
 		return MOD_CONT;
@@ -73,10 +73,16 @@ class CommandCSSet : public Command
 	{
 		if (subcommand.empty())
 		{
-			source.Reply(CHAN_HELP_SET_HEAD);
+			source.Reply(_("Syntax: \002SET \037channel\037 \037option\037 \037parameters\037\002\n"
+					" \n"
+					"Allows the channel founder to set various channel options\n"
+					"and other information.\n"
+					" \n"
+					"Available options:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(CHAN_HELP_SET_TAIL);
+			source.Reply(_("Type \002%R%S HELP SET \037option\037\002 for more information on a\n"
+					"particular option."));
 			return true;
 		}
 		else
@@ -92,12 +98,12 @@ class CommandCSSet : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET);
+		source.Reply(_("    SET        Set channel options and information"));
 	}
 
 	bool AddSubcommand(Module *creator, Command *c)
diff --git a/modules/core/cs_set_bantype.cpp b/modules/core/cs_set_bantype.cpp
index 6ba41bf15..a3c6decb5 100644
--- a/modules/core/cs_set_bantype.cpp
+++ b/modules/core/cs_set_bantype.cpp
@@ -31,11 +31,11 @@ class CommandCSSetBanType : public Command
 		int16 bantype = convertTo<int16>(params[1], end, false);
 
 		if (!end.empty() || bantype < 0 || bantype > 3)
-			source.Reply(CHAN_SET_BANTYPE_INVALID, params[1].c_str());
+			source.Reply(_("\002%s\002 is not a valid ban type."), params[1].c_str());
 		else
 		{
 			ci->bantype = bantype;
-			source.Reply(CHAN_SET_BANTYPE_CHANGED, ci->name.c_str(), ci->bantype);
+			source.Reply(_("Ban type for channel %s is now #%d."), ci->name.c_str(), ci->bantype);
 		}
 
 		return MOD_CONT;
@@ -43,19 +43,29 @@ class CommandCSSetBanType : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_BANTYPE, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 BANTYPE \037bantype\037\002\n"
+				" \n"
+				"Sets the ban type that will be used by services whenever\n"
+				"they need to ban someone from your channel.\n"
+				" \n"
+				"bantype is a number between 0 and 3 that means:\n"
+				" \n"
+				"0: ban in the form *!user@host\n"
+				"1: ban in the form *!*user@host\n"
+				"2: ban in the form *!*@host\n"
+				"3: ban in the form *!*user@*.domain"), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_BANTYPE);
+		source.Reply(_("    BANTYPE       Set how Services make bans on the channel"));
 	}
 };
 
@@ -66,16 +76,10 @@ class CommandCSSASetBanType : public CommandCSSetBanType
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_BANTYPE, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX);
 	}
 };
 
diff --git a/modules/core/cs_set_description.cpp b/modules/core/cs_set_description.cpp
index a36b1150f..aee4144d9 100644
--- a/modules/core/cs_set_description.cpp
+++ b/modules/core/cs_set_description.cpp
@@ -28,26 +28,29 @@ class CommandCSSetDescription : public Command
 
 		ci->desc = params[1];
 
-		source.Reply(CHAN_DESC_CHANGED, ci->name.c_str(), ci->desc.c_str());
+		source.Reply(_("Description of %s changed to \002%s\002."), ci->name.c_str(), ci->desc.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_DESC, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 DESC \037description\037\002\n"
+				" \n"
+				"Sets the description for the channel, which shows up with\n"
+				"the \002LIST\002 and \002INFO\002 commands."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_DESC);
+		source.Reply(_("    DESC          Set the channel description"));
 	}
 };
 
@@ -58,16 +61,10 @@ class CommandCSSASetDescription : public CommandCSSetDescription
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_DESC, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX);
 	}
 };
 
diff --git a/modules/core/cs_set_founder.cpp b/modules/core/cs_set_founder.cpp
index c36f3c841..130117ff4 100644
--- a/modules/core/cs_set_founder.cpp
+++ b/modules/core/cs_set_founder.cpp
@@ -29,7 +29,7 @@ class CommandCSSetFounder : public Command
 
 		if (this->permission.empty() && (ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER)))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -38,19 +38,19 @@ class CommandCSSetFounder : public Command
 
 		if (!na)
 		{
-			source.Reply(NICK_X_NOT_REGISTERED, params[1].c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, params[1].c_str());
 			return MOD_CONT;
 		}
 		else if (na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 			return MOD_CONT;
 		}
 
 		nc = na->nc;
 		if (Config->CSMaxReg && nc->channelcount >= Config->CSMaxReg && !u->Account()->HasPriv("chanserv/no-register-limit"))
 		{
-			source.Reply(CHAN_SET_FOUNDER_TOO_MANY_CHANS, na->nick.c_str());
+			source.Reply(_("\002%s\002 has too many channels registered."), na->nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -64,26 +64,29 @@ class CommandCSSetFounder : public Command
 		ci->founder = nc;
 		++nc->channelcount;
 
-		source.Reply(CHAN_FOUNDER_CHANGED, ci->name.c_str(), na->nick.c_str());
+		source.Reply(_("Founder of %s changed to \002%s\002."), ci->name.c_str(), na->nick.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_FOUNDER, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 FOUNDER \037nick\037\002\n"
+				" \n"
+				"Changes the founder of a channel. The new nickname must\n"
+				"be a registered one."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_FOUNDER);
+		source.Reply(_("    FOUNDER       Set the founder of a channel"));
 	}
 };
 
@@ -94,16 +97,10 @@ class CommandCSSASetFounder : public CommandCSSetFounder
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_FOUNDER, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX);
 	}
 };
 
diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/core/cs_set_keeptopic.cpp
index 6ea297010..5a7bbd334 100644
--- a/modules/core/cs_set_keeptopic.cpp
+++ b/modules/core/cs_set_keeptopic.cpp
@@ -29,12 +29,12 @@ class CommandCSSetKeepTopic : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_KEEPTOPIC);
-			source.Reply(CHAN_SET_KEEPTOPIC_ON, ci->name.c_str());
+			source.Reply(_("Topic retention option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_KEEPTOPIC);
-			source.Reply(CHAN_SET_KEEPTOPIC_OFF, ci->name.c_str());
+			source.Reply(_("Topic retention option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "KEEPTOPIC");
@@ -44,18 +44,24 @@ class CommandCSSetKeepTopic : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_KEEPTOPIC, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 KEEPTOPIC {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the \002topic retention\002 option for a	\n"
+				"channel. When \002topic retention\002 is set, the topic for the\n"
+				"channel will be remembered by %S even after the\n"
+				"last user leaves the channel, and will be restored the\n"
+				"next time the channel is created."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET KEEPTOPIC", CHAN_SET_KEEPTOPIC_SYNTAX);
+		SyntaxError(source, "SET KEEPTOPIC", _("SET \037channel\037 KEEPTOPIC {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_KEEPTOPIC);
+		source.Reply(_("    KEEPTOPIC     Retain topic when channel is not in use"));
 	}
 };
 
@@ -66,15 +72,9 @@ class CommandCSSASetKeepTopic : public CommandCSSetKeepTopic
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_KEEPTOPIC, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET KEEPTOPIC", CHAN_SASET_KEEPTOPIC_SYNTAX);
+		SyntaxError(source, "SET KEEPTOPIC", _("SASET \002channel\002 KEEPTOPIC {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_opnotice.cpp b/modules/core/cs_set_opnotice.cpp
index 6efe94b83..e55607ca3 100644
--- a/modules/core/cs_set_opnotice.cpp
+++ b/modules/core/cs_set_opnotice.cpp
@@ -29,12 +29,12 @@ class CommandCSSetOpNotice : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_OPNOTICE);
-			source.Reply(CHAN_SET_OPNOTICE_ON, ci->name.c_str());
+			source.Reply(_("Op-notice option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_OPNOTICE);
-			source.Reply(CHAN_SET_OPNOTICE_OFF, ci->name.c_str());
+			source.Reply(_("Op-notice option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "OPNOTICE");
@@ -44,18 +44,23 @@ class CommandCSSetOpNotice : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_OPNOTICE, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 OPNOTICE {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the \002op-notice\002 option for a channel.\n"
+				"When \002op-notice\002 is set, %S will send a notice to the\n"
+				"channel whenever the \002OP\002 or \002DEOP\002 commands are used for a user\n"
+				"in the channel."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET OPNOTICE", CHAN_SET_OPNOTICE_SYNTAX);
+		SyntaxError(source, "SET OPNOTICE", _("SET \037channel\037 OPNOTICE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_OPNOTICE);
+		source.Reply(_("    OPNOTICE      Send a notice when OP/DEOP commands are used"));
 	}
 };
 
@@ -66,15 +71,9 @@ class CommandCSSASetOpNotice : public CommandCSSetOpNotice
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_OPNOTICE, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET OPNOTICE", CHAN_SASET_OPNOTICE_SYNTAX);
+		SyntaxError(source, "SET OPNOTICE", _("SASET \002channel\002 OPNOTICE {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_peace.cpp b/modules/core/cs_set_peace.cpp
index 067152bbe..5daa648f8 100644
--- a/modules/core/cs_set_peace.cpp
+++ b/modules/core/cs_set_peace.cpp
@@ -29,12 +29,12 @@ class CommandCSSetPeace : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_PEACE);
-			source.Reply(CHAN_SET_PEACE_ON, ci->name.c_str());
+			source.Reply(_("Peace option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_PEACE);
-			source.Reply(CHAN_SET_PEACE_OFF, ci->name.c_str());
+			source.Reply(_("Peace option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "PEACE");
@@ -44,18 +44,23 @@ class CommandCSSetPeace : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_PEACE, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 PEACE {ON | OFF}\002\n"
+				" \n"
+				"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."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET PEACE", CHAN_SET_PEACE_SYNTAX);
+		SyntaxError(source, "SET PEACE", _("SET \037channel\037 PEACE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_PEACE, "SET");
+		source.Reply(_("    PEACE         Regulate the use of critical commands"), "SET");
 	}
 };
 
@@ -66,15 +71,9 @@ class CommandCSSASetPeace : public CommandCSSetPeace
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_PEACE, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET PEACE", CHAN_SASET_PEACE_SYNTAX);
+		SyntaxError(source, "SASET PEACE", _("SASET \002channel\002 PEACE {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_persist.cpp b/modules/core/cs_set_persist.cpp
index d659422fc..0c3ef2b97 100644
--- a/modules/core/cs_set_persist.cpp
+++ b/modules/core/cs_set_persist.cpp
@@ -65,7 +65,7 @@ class CommandCSSetPersist : public Command
 				}
 			}
 
-			source.Reply(CHAN_SET_PERSIST_ON, ci->name.c_str());
+			source.Reply(_("Channel \002%s\002 is now persistant."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
@@ -92,7 +92,7 @@ class CommandCSSetPersist : public Command
 					ChanServ->UnAssign(NULL, ci);
 			}
 
-			source.Reply(CHAN_SET_PERSIST_OFF, ci->name.c_str());
+			source.Reply(_("Channel \002%s\002 is no longer persistant."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "PERSIST");
@@ -102,18 +102,37 @@ class CommandCSSetPersist : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_PERSIST, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 PERSIST {ON | OFF}\002\n"
+				"Enables or disables the persistant channel setting.\n"
+				"When persistant is set, the service bot will remain\n"
+				"in the channel when it has emptied of users.\n"
+				" \n"
+				"If your IRCd does not a permanent (persistant) channel\n"
+				"mode you must have a service bot in your channel to\n"
+				"set persist on, and it can not be unassigned while persist\n"
+				"is on.\n"
+				" \n"
+				"If this network does not have BotServ enabled and does\n"
+				"not have a permanent channel mode, ChanServ will\n"
+				"join your channel when you set persist on (and leave when\n"
+				"it has been set off).\n"
+				" \n"
+				"If your IRCd has a permanent (persistant) channel mode\n"
+				"and is is set or unset (for any reason, including MLOCK),\n"
+				"persist is automatically set and unset for the channel aswell.\n"
+				"Additionally, services will set or unset this mode when you\n"
+				"set persist on or off."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET PERSIST", CHAN_SET_PERSIST_SYNTAX);
+		SyntaxError(source, "SET PERSIST", _("SET \037channel\037 PERSIST {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_PERSIST);
+		source.Reply(_("    PERSIST       Set the channel as permanent"));
 	}
 };
 
@@ -124,15 +143,9 @@ class CommandCSSASetPersist : public CommandCSSetPersist
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_PERSIST, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET PERSIST", CHAN_SASET_PERSIST_SYNTAX);
+		SyntaxError(source, "SASET PERSIST", _("SASET \002channel\002 PERSIST {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp
index 28356db70..162da757d 100644
--- a/modules/core/cs_set_private.cpp
+++ b/modules/core/cs_set_private.cpp
@@ -29,12 +29,12 @@ class CommandCSSetPrivate : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_PRIVATE);
-			source.Reply(CHAN_SET_PRIVATE_ON, ci->name.c_str());
+			source.Reply(_("Private option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_PRIVATE);
-			source.Reply(CHAN_SET_PRIVATE_OFF, ci->name.c_str());
+			source.Reply(_("Private option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "PRIVATE");
@@ -44,18 +44,22 @@ class CommandCSSetPrivate : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_PRIVATE, "SASET");
+		source.Reply(_("Syntax: \002%s \037channel\037 PRIVATE {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the \002private\002 option for a channel.\n"
+				"When \002private\002 is set, a \002%R%S LIST\002 will not\n"
+				"include the channel in any lists."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET PRIVATE", CHAN_SET_PRIVATE_SYNTAX);
+		SyntaxError(source, "SET PRIVATE", _("SET \037channel\037 PRIVATE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_PRIVATE);
+		source.Reply(_("    PRIVATE       Hide channel from LIST command"));
 	}
 };
 
@@ -66,15 +70,9 @@ class CommandCSSASetPrivate : public CommandCSSetPrivate
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_PRIVATE, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET PRIVATE", CHAN_SASET_PRIVATE_SYNTAX);
+		SyntaxError(source, "SASET PRIVATE", _("SASET \002channel\002 PRIVATE {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_restricted.cpp b/modules/core/cs_set_restricted.cpp
index c8ee140b0..646a42241 100644
--- a/modules/core/cs_set_restricted.cpp
+++ b/modules/core/cs_set_restricted.cpp
@@ -30,14 +30,14 @@ class CommandCSSetRestricted : public Command
 			ci->SetFlag(CI_RESTRICTED);
 			if (ci->levels[CA_NOJOIN] < 0)
 				ci->levels[CA_NOJOIN] = 0;
-			source.Reply(CHAN_SET_RESTRICTED_ON, ci->name.c_str());
+			source.Reply(_("Restricted access option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_RESTRICTED);
 			if (ci->levels[CA_NOJOIN] >= 0)
 				ci->levels[CA_NOJOIN] = -2;
-			source.Reply(CHAN_SET_RESTRICTED_OFF, ci->name.c_str());
+			source.Reply(_("Restricted access option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "RESTRICTED");
@@ -47,18 +47,22 @@ class CommandCSSetRestricted : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_RESTRICTED, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 RESTRICTED {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the \002restricted access\002 option for a\n"
+				"channel. When \002restricted access\002 is set, users not on the access list will\n"
+				"instead be kicked and banned from the channel."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET RESTRICTED", CHAN_SET_RESTRICTED_SYNTAX);
+		SyntaxError(source, "SET RESTRICTED", _("SET \037channel\037 RESTRICTED {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_RESTRICTED);
+		source.Reply(_("    RESTRICTED    Restrict access to the channel"));
 	}
 };
 
@@ -69,15 +73,9 @@ class CommandCSSASetRestricted : public CommandCSSetRestricted
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_RESTRICTED, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET RESTRICTED", CHAN_SASET_RESTRICTED_SYNTAX);
+		SyntaxError(source, "SASET RESTRICTED", _("SASET \002channel\002 RESTRICTED {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_secure.cpp b/modules/core/cs_set_secure.cpp
index 118214c29..a84e91958 100644
--- a/modules/core/cs_set_secure.cpp
+++ b/modules/core/cs_set_secure.cpp
@@ -29,12 +29,12 @@ class CommandCSSetSecure : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_SECURE);
-			source.Reply(CHAN_SET_SECURE_ON, ci->name.c_str());
+			source.Reply(_("Secure option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_SECURE);
-			source.Reply(CHAN_SET_SECURE_OFF, ci->name.c_str());
+			source.Reply(_("Secure option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "SECURE");
@@ -44,18 +44,24 @@ class CommandCSSetSecure : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_SECURE, "SET", Config->s_NickServ.c_str());
+		source.Reply(_("Syntax: \002%s \037channel\037 SECURE {ON | OFF}\002\n"
+			" \n"
+			"Enables or disables %S's security features for a\n"
+			"channel. When \002SECURE\002 is set, only users who have\n"
+			"registered their nicknames with %s and IDENTIFY'd\n"
+			"with their password will be given access to the channel\n"
+			"as controlled by the access list."), this->name.c_str(), Config->s_NickServ.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET SECURE", CHAN_SET_SECURE_SYNTAX);
+		SyntaxError(source, "SET SECURE", _("SET \037channel\037 SECURE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_SECURE);
+		source.Reply(_("    SECURE        Activate %S security features"));
 	}
 };
 
@@ -66,15 +72,9 @@ class CommandCSSASetSecure : public CommandCSSetSecure
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_SECURE, "SASET", Config->s_NickServ.c_str());
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET SECURE", CHAN_SASET_SECURE_SYNTAX);
+		SyntaxError(source, "SASET SECURE", _("SASET \002channel\002 SECURE {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_securefounder.cpp b/modules/core/cs_set_securefounder.cpp
index 6e076d450..85c587adf 100644
--- a/modules/core/cs_set_securefounder.cpp
+++ b/modules/core/cs_set_securefounder.cpp
@@ -29,19 +29,19 @@ class CommandCSSetSecureFounder : public Command
 
 		if (this->permission.empty() && ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_SECUREFOUNDER);
-			source.Reply(CHAN_SET_SECUREFOUNDER_ON, ci->name.c_str());
+			source.Reply(_("Secure founder option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_SECUREFOUNDER);
-			source.Reply(CHAN_SET_SECUREFOUNDER_OFF, ci->name.c_str());
+			source.Reply(_("Secure founder option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "SECUREFOUNDER");
@@ -51,18 +51,24 @@ class CommandCSSetSecureFounder : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_SECUREFOUNDER, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 SECUREFOUNDER {ON | OFF}\002\n"
+			" \n"
+			"Enables or disables the \002secure founder\002 option for a channel.\n"
+			"When \002secure founder\002 is set, only the real founder will be\n"
+			"able to drop the channel, change its password, its founder and its\n"
+			"successor, and not those who have founder level access through\n"
+			"the access/qop command."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET SECUREFOUNDER", CHAN_SET_SECUREFOUNDER_SYNTAX);
+		SyntaxError(source, "SET SECUREFOUNDER", _("SET \037channel\037 SECUREFOUNDER {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_SECUREFOUNDER);
+		source.Reply(_("    SECUREFOUNDER Stricter control of channel founder status"));
 	}
 };
 
@@ -73,15 +79,9 @@ class CommandCSSASetSecureFounder : public CommandCSSetSecureFounder
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_SECUREFOUNDER, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET SECUREFOUNDER", CHAN_SASET_SECUREFOUNDER_SYNTAX);
+		SyntaxError(source, "SASET SECUREFOUNDER", _("SASET \002channel\002 SECUREFOUNDER {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_secureops.cpp b/modules/core/cs_set_secureops.cpp
index 036e2cd74..d4e8f5e22 100644
--- a/modules/core/cs_set_secureops.cpp
+++ b/modules/core/cs_set_secureops.cpp
@@ -29,12 +29,12 @@ class CommandCSSetSecureOps : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_SECUREOPS);
-			source.Reply(CHAN_SET_SECUREOPS_ON, ci->name.c_str());
+			source.Reply(_("Secure ops option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_SECUREOPS);
-			source.Reply(CHAN_SET_SECUREOPS_OFF, ci->name.c_str());
+			source.Reply(_("Secure ops option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "SECUREOPS");
@@ -44,18 +44,22 @@ class CommandCSSetSecureOps : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_SECUREOPS, "SET");
+		source.Reply(_("Syntax: \002SET \037%s\037 SECUREOPS {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the \002secure ops\002 option for a channel.\n"
+				"When \002secure ops\002 is set, users who are not on the userlist\n"
+				"will not be allowed chanop status."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET SECUREOPS", CHAN_SET_SECUREOPS_SYNTAX);
+		SyntaxError(source, "SET SECUREOPS", _("SET \037channel\037 SECUREOPS {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_SECUREOPS);
+		source.Reply(_("    SECUREOPS     Stricter control of chanop status"));
 	}
 };
 
@@ -66,15 +70,9 @@ class CommandCSSASetSecureOps : public CommandCSSetSecureOps
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_SECUREOPS, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET SECUREOPS", CHAN_SASET_SECUREOPS_SYNTAX);
+		SyntaxError(source, "SASET SECUREOPS", _("SASET \002channel\002 SECUREOPS {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_signkick.cpp b/modules/core/cs_set_signkick.cpp
index c6c399587..c89e4b502 100644
--- a/modules/core/cs_set_signkick.cpp
+++ b/modules/core/cs_set_signkick.cpp
@@ -30,19 +30,20 @@ class CommandCSSetSignKick : public Command
 		{
 			ci->SetFlag(CI_SIGNKICK);
 			ci->UnsetFlag(CI_SIGNKICK_LEVEL);
-			source.Reply(CHAN_SET_SIGNKICK_ON, ci->name.c_str());
+			source.Reply(_("Signed kick option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("LEVEL"))
 		{
 			ci->SetFlag(CI_SIGNKICK_LEVEL);
 			ci->UnsetFlag(CI_SIGNKICK);
-			source.Reply(CHAN_SET_SIGNKICK_LEVEL, ci->name.c_str());
+			source.Reply(_("Signed kick option for %s is now \002ON\002, but depends of the\n"
+				"level of the user that is using the command."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_SIGNKICK);
 			ci->UnsetFlag(CI_SIGNKICK_LEVEL);
-			source.Reply(CHAN_SET_SIGNKICK_OFF, ci->name.c_str());
+			source.Reply(_("Signed kick option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "SIGNKICK");
@@ -52,18 +53,27 @@ class CommandCSSetSignKick : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_SIGNKICK, "SET");
+		source.Reply(_("Syntax: \002SET \037%s\037 SIGNKICK {ON | LEVEL | OFF}\002\n"
+				" \n"
+				"Enables or disables signed kicks for a\n"
+				"channel.  When \002SIGNKICK\002 is set, kicks issued with\n"
+				"%S KICK command will have the nick that used the\n"
+				"command in their reason.\n"
+				" \n"
+				"If you use \002LEVEL\002, those who have a level that is superior \n"
+				"or equal to the SIGNKICK level on the channel won't have their \n"
+				"kicks signed. See \002%R%S HELP LEVELS\002 for more information."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET SIGNKICK", CHAN_SET_SIGNKICK_SYNTAX);
+		SyntaxError(source, "SET SIGNKICK", _("SET \037channel\037 SIGNKICK {ON | LEVEL | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_SIGNKICK);
+		source.Reply(_("    SIGNKICK      Sign kicks that are done with KICK command"));
 	}
 };
 
@@ -74,15 +84,9 @@ class CommandCSSASetSignKick : public CommandCSSetSignKick
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_SIGNKICK, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET SIGNKICK", CHAN_SASET_SIGNKICK_SYNTAX);
+		SyntaxError(source, "SASET SIGNKICK", _("SASET \002channel\002 SIGNKICK {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_successor.cpp b/modules/core/cs_set_successor.cpp
index 7b4c48b3d..38a885830 100644
--- a/modules/core/cs_set_successor.cpp
+++ b/modules/core/cs_set_successor.cpp
@@ -29,7 +29,7 @@ class CommandCSSetSuccessor : public Command
 
 		if (this->permission.empty() && ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -41,17 +41,17 @@ class CommandCSSetSuccessor : public Command
 
 			if (!na)
 			{
-				source.Reply(NICK_X_NOT_REGISTERED, params[1].c_str());
+				source.Reply(LanguageString::NICK_X_NOT_REGISTERED, params[1].c_str());
 				return MOD_CONT;
 			}
 			if (na->HasFlag(NS_FORBIDDEN))
 			{
-				source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 				return MOD_CONT;
 			}
 			if (na->nc == ci->founder)
 			{
-				source.Reply(CHAN_SUCCESSOR_IS_FOUNDER, na->nick.c_str(), ci->name.c_str());
+				source.Reply(_("%s cannot be the successor on channel %s because he is its founder."), na->nick.c_str(), ci->name.c_str());
 				return MOD_CONT;
 			}
 			nc = na->nc;
@@ -64,28 +64,36 @@ class CommandCSSetSuccessor : public Command
 		ci->successor = nc;
 
 		if (nc)
-			source.Reply(CHAN_SUCCESSOR_CHANGED, ci->name.c_str(), nc->display.c_str());
+			source.Reply(_("Successor for %s changed to \002%s\002."), ci->name.c_str(), nc->display.c_str());
 		else
-			source.Reply(CHAN_SUCCESSOR_UNSET, ci->name.c_str());
+			source.Reply(_("Successor for \002%s\002 unset."), ci->name.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_SUCCESSOR, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 SUCCESSOR \037nick\037\002\n"
+				" \n"
+				"Changes the successor of a channel. If the founder's\n"
+				"nickname expires or is dropped while the channel is still\n"
+				"registered, the successor will become the new founder of the\n"
+				"channel.  However, if the successor already has too many\n"
+				"channels registered (%d), the channel will be dropped\n"
+				"instead, just as if no successor had been set.  The new\n"
+				"nickname must be a registered one."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_SUCCESSOR);
+		source.Reply(_("    SUCCESSOR     Set the successor for a channel"));
 	}
 };
 
@@ -96,16 +104,10 @@ class CommandCSSASetSuccessor : public CommandCSSetSuccessor
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_SUCCESSOR, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX);
 	}
 };
 
diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp
index 4d62fd415..cb8faf724 100644
--- a/modules/core/cs_set_topiclock.cpp
+++ b/modules/core/cs_set_topiclock.cpp
@@ -29,12 +29,12 @@ class CommandCSSetTopicLock : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			ci->SetFlag(CI_TOPICLOCK);
-			source.Reply(CHAN_SET_TOPICLOCK_ON, ci->name.c_str());
+			source.Reply(_("Topic lock option for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_TOPICLOCK);
-			source.Reply(CHAN_SET_TOPICLOCK_OFF, ci->name.c_str());
+			source.Reply(_("Topic lock option for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "TOPICLOCK");
@@ -44,18 +44,23 @@ class CommandCSSetTopicLock : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_TOPICLOCK, "SET");
+		source.Reply(_("Syntax: \002SET \037%s\037 TOPICLOCK {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the \002topic lock\002 option for a channel.\n"
+				"When \002topic lock\002 is set, %S will not allow the\n"
+				"channel topic to be changed except via the \002TOPIC\002\n"
+				"command."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET", CHAN_SET_TOPICLOCK_SYNTAX);;
+		SyntaxError(source, "SET", _("SET \037channel\037 TOPICLOCK {ON | OFF}"));;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_TOPICLOCK);
+		source.Reply(_("    TOPICLOCK     Topic can only be changed with TOPIC"));
 	}
 };
 
@@ -66,15 +71,9 @@ class CommandCSSASetTopicLock : public CommandCSSetTopicLock
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_TOPICLOCK, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET", CHAN_SASET_TOPICLOCK_SYNTAX);
+		SyntaxError(source, "SASET", _("SASET \002channel\002 TOPICLOCK {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp
index 27375144e..4829b2e45 100644
--- a/modules/core/cs_set_xop.cpp
+++ b/modules/core/cs_set_xop.cpp
@@ -28,7 +28,7 @@ class CommandCSSetXOP : public Command
 
 		if (!FindModule("cs_xop"))
 		{
-			source.Reply(CHAN_XOP_NOT_AVAILABLE, "XOP");
+			source.Reply(_("xOP system is not available."), "XOP");
 			return MOD_CONT;
 		}
 
@@ -67,14 +67,14 @@ class CommandCSSetXOP : public Command
 			}
 
 			Log(LOG_COMMAND, u, this, ci) << "to enable XOP";
-			source.Reply(CHAN_SET_XOP_ON, ci->name.c_str());
+			source.Reply(_("xOP lists system for %s is now \002\002."), ci->name.c_str());
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
 			ci->UnsetFlag(CI_XOP);
 
 			Log(LOG_COMMAND, u, this, ci) << "to disable XOP";
-			source.Reply(CHAN_SET_XOP_OFF, ci->name.c_str());
+			source.Reply(_("xOP lists system for %s is now \002\002."), ci->name.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "XOP");
@@ -84,18 +84,37 @@ class CommandCSSetXOP : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(CHAN_HELP_SET_XOP, "SET");
+		source.Reply(_("Syntax: \002%s \037channel\037 XOP {ON | OFF}\002\n"
+				" \n"
+				"Enables or disables the xOP lists system for a channel.\n"
+				"When \002XOP\002 is set, you have to use the \002AOP\002/\002SOP\002/\002VOP\002\n"
+				"commands in order to give channel privileges to\n"
+				"users, else you have to use the \002ACCESS\002 command.\n"
+				" \n"
+				"\002Technical Note\002: when you switch from access list to xOP \n"
+				"lists system, your level definitions and user levels will be\n"
+				"changed, so you won't find the same values if you\n"
+				"switch back to access system! \n"
+				" \n"
+				"You should also check that your users are in the good xOP \n"
+				"list after the switch from access to xOP lists, because the \n"
+				"guess is not always perfect... in fact, it is not recommended \n"
+				"to use the xOP lists if you changed level definitions with \n"
+				"the \002LEVELS\002 command.\n"
+				" \n"
+				"Switching from xOP lists system to access list system\n"
+				"causes no problem though."), this->name.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET XOP", CHAN_SET_XOP_SYNTAX);
+		SyntaxError(source, "SET XOP", _("SET \037channel\037 XOP {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SET_XOP);
+		source.Reply(_("    XOP           Toggle the user privilege system"));
 	}
 };
 
@@ -106,15 +125,9 @@ class CommandCSSASetXOP : public CommandCSSetXOP
 	{
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		source.Reply(CHAN_HELP_SET_XOP, "SASET");
-		return true;
-	}
-
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET XOP", CHAN_SASET_XOP_SYNTAX);
+		SyntaxError(source, "SASET XOP", _("SASET \002channel\002 XOP {ON | OFF}"));
 	}
 };
 
diff --git a/modules/core/cs_status.cpp b/modules/core/cs_status.cpp
index 37a568da2..d1c469022 100644
--- a/modules/core/cs_status.cpp
+++ b/modules/core/cs_status.cpp
@@ -28,26 +28,35 @@ class CommandCSStatus : public Command
 		User *u2 = finduser(nick);
 		ChanAccess *u2_access = ci->GetAccess(u2);
 		if (u2)
-			source.Reply(CHAN_STATUS_INFO, ci->name.c_str(), u2->nick.c_str(), u2_access ? u2_access->level : 0);
+			source.Reply(_("STATUS %s %s %d"), ci->name.c_str(), u2->nick.c_str(), u2_access ? u2_access->level : 0);
 		else /* !u2 */
-			source.Reply(CHAN_STATUS_NOTONLINE, nick.c_str());
+			source.Reply(_("STATUS ERROR Nick %s not online"), nick.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_SERVADMIN_HELP_STATUS);
+		source.Reply(_("Syntax: \002STATUS \037channel\037 \037nickname\037\002\n"
+				" \n"
+				"Returns the current access level of the given nick on the\n"
+				"given channel.  The reply is of the form:\n"
+				" \n"
+				"    STATUS \037channel\037 \037nickname\037 \037access-level\037\n"
+				" \n"
+				"If an error occurs, the reply will be in the form:\n"
+				" \n"
+				"    STATUS ERROR \037error-message\037"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "STATUS", CHAN_STATUS_SYNTAX);
+		SyntaxError(source, "STATUS", _("STATUS \037channel\037 \037item\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_STATUS);
+		source.Reply(_("    STATUS     Returns the current access level of a user               on a channel"));
 	}
 };
 
diff --git a/modules/core/cs_suspend.cpp b/modules/core/cs_suspend.cpp
index 0b4fe7b5c..9b4a06272 100644
--- a/modules/core/cs_suspend.cpp
+++ b/modules/core/cs_suspend.cpp
@@ -38,12 +38,12 @@ class CommandCSSuspend : public Command
 		/* You should not SUSPEND a FORBIDEN channel */
 		if (ci->HasFlag(CI_FORBIDDEN))
 		{
-			source.Reply(CHAN_MAY_NOT_BE_REGISTERED, ci->name.c_str());
+			source.Reply(_("Channel \002%s\002 may not be registered."), ci->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		ci->SetFlag(CI_SUSPENDED);
 		ci->forbidby = u->nick;
@@ -59,7 +59,7 @@ class CommandCSSuspend : public Command
 				if (uc->user->HasMode(UMODE_OPER))
 					continue;
 
-				c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user->Account(), CHAN_SUSPEND_REASON).c_str());
+				c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user->Account(), _("This channel has been suspended.")).c_str());
 			}
 		}
 
@@ -67,7 +67,7 @@ class CommandCSSuspend : public Command
 			ircdproto->SendGlobops(ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str());
 
 		Log(LOG_ADMIN, u, this, ci) << (!reason.empty() ? reason : "No reason");
-		source.Reply(CHAN_SUSPEND_SUCCEEDED, ci->name.c_str());
+		source.Reply(_("Channel \002%s\002 is now suspended."), ci->name.c_str());
 
 		FOREACH_MOD(I_OnChanSuspend, OnChanSuspend(ci));
 
@@ -76,18 +76,26 @@ class CommandCSSuspend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_SERVADMIN_HELP_SUSPEND);
+		source.Reply(_("Syntax: \002SUSPEND \037channel\037 [\037reason\037]\002\n"
+				" \n"
+				"Disallows anyone from registering or using the given\n"
+				"channel.  May be cancelled by using the UNSUSPEND\n"
+				"command to preserve all previous channel data/settings.\n"
+				" \n"
+				"Reason may be required on certain networks."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SUSPEND", Config->ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON : CHAN_SUSPEND_SYNTAX);
+		SyntaxError(source, "SUSPEND", Config->ForceForbidReason ? _("SUSPEND \037channel\037 \037reason\037") : _("SUSPEND \037channel\037 \037freason\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SUSPEND);
+		source.Reply(_("    SUSPEND    Prevent a channel from being used preserving\n"
+			"               	channel data and settings"));
+
 	}
 };
 
@@ -105,12 +113,12 @@ class CommandCSUnSuspend : public Command
 		ChannelInfo *ci = source.ci;
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		/* Only UNSUSPEND already suspended channels */
 		if (!ci->HasFlag(CI_SUSPENDED))
 		{
-			source.Reply(CHAN_UNSUSPEND_FAILED, ci->name.c_str());
+			source.Reply(_("Couldn't release channel \002%s\002!"), ci->name.c_str());
 			return MOD_CONT;
 		}
 
@@ -123,7 +131,7 @@ class CommandCSUnSuspend : public Command
 		if (Config->WallForbid)
 			ircdproto->SendGlobops(ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str());
 
-		source.Reply(CHAN_UNSUSPEND_SUCCEEDED, ci->name.c_str());
+		source.Reply(_("Channel \002%s\002 is now released."), ci->name.c_str());
 
 		FOREACH_MOD(I_OnChanUnsuspend, OnChanUnsuspend(ci));
 
@@ -132,18 +140,21 @@ class CommandCSUnSuspend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_SERVADMIN_HELP_UNSUSPEND);
+		source.Reply(_("Syntax: \002UNSUSPEND \037channel\037\002\n"
+				" \n"
+				"Releases a suspended channel. All data and settings\n"
+				"are preserved from before the suspension."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX);
+		SyntaxError(source, "UNSUSPEND", _("UNSUSPEND \037channel\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_UNSUSPEND);
+		source.Reply(_("    UNSUSPEND  Releases a suspended channel"));
 	}
 };
 
diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp
index 46ca69739..20005b07b 100644
--- a/modules/core/cs_topic.cpp
+++ b/modules/core/cs_topic.cpp
@@ -29,9 +29,9 @@ class CommandCSTopic : public Command
 		Channel *c = ci->c;
 
 		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, ci->name.c_str());
 		else if (!check_access(u, ci, CA_TOPIC) && !u->Account()->HasCommand("chanserv/topic"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else
 		{
 			bool has_topiclock = ci->HasFlag(CI_TOPICLOCK);
@@ -48,18 +48,27 @@ class CommandCSTopic : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_TOPIC);
+		source.Reply(_("Syntax: \002TOPIC \037channel\037 [\037topic\037]\002\n"
+				" \n"
+				"Causes %S to set the channel topic to the one\n"
+				"specified. If \002topic\002 is not given, then an empty topic\n"
+				"is set. This command is most useful in conjunction\n"
+				"with \002SET TOPICLOCK\002. See \002%R%S HELP SET TOPICLOCK\002\n"
+				"for more information.\n"
+				" \n"
+				"By default, limited to those with founder access on the\n"
+				"channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "TOPIC", CHAN_TOPIC_SYNTAX);
+		SyntaxError(source, "TOPIC", _("TOPIC \037channel\037 [\037topic\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_TOPIC);
+		source.Reply(_("    TOPIC      Manipulate the topic of the specified channel"));
 	}
 };
 
diff --git a/modules/core/cs_unban.cpp b/modules/core/cs_unban.cpp
index 2beb94534..f4156e02a 100644
--- a/modules/core/cs_unban.cpp
+++ b/modules/core/cs_unban.cpp
@@ -28,13 +28,13 @@ class CommandCSUnban : public Command
 
 		if (!c)
 		{
-			source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, ci->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (!check_access(u, ci, CA_UNBAN))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -44,33 +44,39 @@ class CommandCSUnban : public Command
 
 		if (!u2)
 		{
-			source.Reply(NICK_X_NOT_IN_USE, params[1].c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, params[1].c_str());
 			return MOD_CONT;
 		}
 
 		common_unban(ci, u2, u == u2);
 		if (u2 == u)
-			source.Reply(CHAN_UNBANNED, c->name.c_str());
+			source.Reply(_("You have been unbanned from \002%s\002."), c->name.c_str());
 		else
-			source.Reply(CHAN_UNBANNED_OTHER, u2->nick.c_str(), c->name.c_str());
+			source.Reply(_("\002%s\002 has been unbanned from \002%s\002."), u2->nick.c_str(), c->name.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_UNBAN);
+		source.Reply(_("Syntax: \002UNBAN \037channel\037 [\037nick\037]\002\n"
+				" \n"
+				"Tells %S to remove all bans preventing you or the given\n"
+				"user from entering the given channel.  \n"
+				" \n"
+				"By default, limited to AOPs or those with level 5 and above\n"
+				"on the channel."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "UNBAN", CHAN_UNBAN_SYNTAX);
+		SyntaxError(source, "UNBAN", _("UNBAN \037channel\037 [\037nick\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_UNBAN);
+		source.Reply(_("    UNBAN      Remove all bans preventing a user from entering a channel"));
 	}
 };
 
diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp
index cd4f675ab..9a0e6e16d 100644
--- a/modules/core/cs_xop.cpp
+++ b/modules/core/cs_xop.cpp
@@ -23,94 +23,14 @@ enum
 	XOP_TYPES
 };
 
-enum
-{
-	XOP_DISABLED,
-	XOP_ADDED,
-	XOP_MOVED,
-	XOP_NO_SUCH_ENTRY,
-	XOP_NOT_FOUND,
-	XOP_NO_MATCH,
-	XOP_DELETED,
-	XOP_DELETED_ONE,
-	XOP_DELETED_SEVERAL,
-	XOP_LIST_EMPTY,
-	XOP_LIST_HEADER,
-	XOP_CLEAR,
-	XOP_MESSAGES
-};
-
-LanguageString xop_msgs[XOP_TYPES][XOP_MESSAGES] = {
-	{CHAN_AOP_DISABLED,
-	 CHAN_AOP_ADDED,
-	 CHAN_AOP_MOVED,
-	 CHAN_AOP_NO_SUCH_ENTRY,
-	 CHAN_AOP_NOT_FOUND,
-	 CHAN_AOP_NO_MATCH,
-	 CHAN_AOP_DELETED,
-	 CHAN_AOP_DELETED_ONE,
-	 CHAN_AOP_DELETED_SEVERAL,
-	 CHAN_AOP_LIST_EMPTY,
-	 CHAN_AOP_LIST_HEADER,
-	 CHAN_AOP_CLEAR},
-	{CHAN_SOP_DISABLED,
-	 CHAN_SOP_ADDED,
-	 CHAN_SOP_MOVED,
-	 CHAN_SOP_NO_SUCH_ENTRY,
-	 CHAN_SOP_NOT_FOUND,
-	 CHAN_SOP_NO_MATCH,
-	 CHAN_SOP_DELETED,
-	 CHAN_SOP_DELETED_ONE,
-	 CHAN_SOP_DELETED_SEVERAL,
-	 CHAN_SOP_LIST_EMPTY,
-	 CHAN_SOP_LIST_HEADER,
-	 CHAN_SOP_CLEAR},
-	{CHAN_VOP_DISABLED,
-	 CHAN_VOP_ADDED,
-	 CHAN_VOP_MOVED,
-	 CHAN_VOP_NO_SUCH_ENTRY,
-	 CHAN_VOP_NOT_FOUND,
-	 CHAN_VOP_NO_MATCH,
-	 CHAN_VOP_DELETED,
-	 CHAN_VOP_DELETED_ONE,
-	 CHAN_VOP_DELETED_SEVERAL,
-	 CHAN_VOP_LIST_EMPTY,
-	 CHAN_VOP_LIST_HEADER,
-	 CHAN_VOP_CLEAR},
-	{CHAN_HOP_DISABLED,
-	 CHAN_HOP_ADDED,
-	 CHAN_HOP_MOVED,
-	 CHAN_HOP_NO_SUCH_ENTRY,
-	 CHAN_HOP_NOT_FOUND,
-	 CHAN_HOP_NO_MATCH,
-	 CHAN_HOP_DELETED,
-	 CHAN_HOP_DELETED_ONE,
-	 CHAN_HOP_DELETED_SEVERAL,
-	 CHAN_HOP_LIST_EMPTY,
-	 CHAN_HOP_LIST_HEADER,
-	 CHAN_HOP_CLEAR},
-	 {CHAN_QOP_DISABLED,
-	 CHAN_QOP_ADDED,
-	 CHAN_QOP_MOVED,
-	 CHAN_QOP_NO_SUCH_ENTRY,
-	 CHAN_QOP_NOT_FOUND,
-	 CHAN_QOP_NO_MATCH,
-	 CHAN_QOP_DELETED,
-	 CHAN_QOP_DELETED_ONE,
-	 CHAN_QOP_DELETED_SEVERAL,
-	 CHAN_QOP_LIST_EMPTY,
-	 CHAN_QOP_LIST_HEADER,
-	 CHAN_QOP_CLEAR}
-};
-
 class XOPListCallback : public NumberList
 {
 	CommandSource &source;
 	int level;
-	LanguageString *messages;
+	Command *c;
 	bool SentHeader;
  public:
-	XOPListCallback(CommandSource &_source, const Anope::string &numlist, int _level, LanguageString *_messages) : NumberList(numlist, false), source(_source), level(_level), messages(_messages), SentHeader(false)
+	XOPListCallback(CommandSource &_source, const Anope::string &numlist, int _level, Command *_c) : NumberList(numlist, false), source(_source), level(_level), c(_c), SentHeader(false)
 	{
 	}
 
@@ -127,15 +47,15 @@ class XOPListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(messages[XOP_LIST_HEADER], source.ci->name.c_str());
+			source.Reply(_("%s list for %s:\n  Num  Nick"), this->c->name.c_str(), source.ci->name.c_str());
 		}
 
-		DoList(source, access, Number - 1, level, messages);
+		DoList(source, access, Number - 1, level);
 	}
 
-	static void DoList(CommandSource &source, ChanAccess *access, unsigned index, int level, LanguageString *messages)
+	static void DoList(CommandSource &source, ChanAccess *access, unsigned index, int level)
 	{
-		source.Reply(CHAN_XOP_LIST_FORMAT, index, access->mask.c_str());
+		source.Reply(_("  %3d  %s"), index, access->mask.c_str());
 	}
 };
 
@@ -143,27 +63,26 @@ class XOPDelCallback : public NumberList
 {
 	CommandSource &source;
 	Command *c;
-	LanguageString *messages;
 	unsigned Deleted;
 	Anope::string Nicks;
 	bool override;
  public:
-	XOPDelCallback(CommandSource &_source, Command *_c, LanguageString *_messages, bool _override, const Anope::string &numlist) : NumberList(numlist, true), source(_source), c(_c), messages(_messages), Deleted(0), override(_override)
+	XOPDelCallback(CommandSource &_source, Command *_c, bool _override, const Anope::string &numlist) : NumberList(numlist, true), source(_source), c(_c), Deleted(0), override(_override)
 	{
 	}
 
 	~XOPDelCallback()
 	{
 		if (!Deleted)
-			 source.Reply(messages[XOP_NO_MATCH], source.ci->name.c_str());
+			 source.Reply(_("No matching entries on %s %s list."), source.ci->name.c_str(), this->c->name.c_str());
 		else
 		{
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, c, source.ci) << "deleted access of users " << Nicks;
 
 			if (Deleted == 1)
-				source.Reply(messages[XOP_DELETED_ONE], source.ci->name.c_str());
+				source.Reply(_("Deleted one entry from %s %s list."), source.ci->name.c_str(), this->c->name.c_str());
 			else
-				source.Reply(messages[XOP_DELETED_SEVERAL], Deleted, source.ci->name.c_str());
+				source.Reply(_("Deleted %d entries from %s %s list."), Deleted, source.ci->name.c_str(), this->c->name.c_str());
 		}
 	}
 
@@ -189,7 +108,7 @@ class XOPDelCallback : public NumberList
 class XOPBase : public Command
 {
  private:
-	CommandReturn DoAdd(CommandSource &source, const std::vector<Anope::string> &params, int level, LanguageString *messages)
+	CommandReturn DoAdd(CommandSource &source, const std::vector<Anope::string> &params, int level)
 	{
 		User *u = source.u;
 		ChannelInfo *ci = source.ci;
@@ -205,7 +124,7 @@ class XOPBase : public Command
 
 		if (readonly)
 		{
-			source.Reply(messages[XOP_DISABLED]);
+			source.Reply(_("Sorry, channel %s list modification is temporarily disabled."), this->name.c_str());
 			return MOD_CONT;
 		}
 
@@ -214,7 +133,7 @@ class XOPBase : public Command
 
 		if ((level >= ulev || ulev < ACCESS_AOP) && !u->Account()->HasPriv("chanserv/access/modify"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -223,7 +142,7 @@ class XOPBase : public Command
 			mask += "!*@*";
 		else if (na && na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -235,7 +154,7 @@ class XOPBase : public Command
 			 **/
 			if (access->level >= ulev && !u->Account()->HasPriv("chanserv/access/modify"))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			++change;
@@ -243,7 +162,7 @@ class XOPBase : public Command
 
 		if (!change && ci->GetAccessCount() >= Config->CSAccessMax)
 		{
-			source.Reply(CHAN_XOP_REACHED_LIMIT, Config->CSAccessMax);
+			source.Reply(_("Sorry, you can only have %d %s entries on a channel."), Config->CSAccessMax, this->name.c_str());
 			return MOD_CONT;
 		}
 
@@ -262,18 +181,18 @@ class XOPBase : public Command
 		if (!change)
 		{
 			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, access));
-			source.Reply(messages[XOP_ADDED], access->mask.c_str(), ci->name.c_str());
+			source.Reply(("\002%s\002 added to %s %s list."), access->mask.c_str(), ci->name.c_str(), this->name.c_str());
 		}
 		else
 		{
 			FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, access));
-			source.Reply(messages[XOP_MOVED], access->mask.c_str(), ci->name.c_str());
+			source.Reply(_("\002%s\002 moved to %s %s list."), access->mask.c_str(), ci->name.c_str(), this->name.c_str());
 		}
 
 		return MOD_CONT;
 	}
 
-	CommandReturn DoDel(CommandSource &source, const std::vector<Anope::string> &params, int level, LanguageString *messages)
+	CommandReturn DoDel(CommandSource &source, const std::vector<Anope::string> &params, int level)
 	{
 		User *u = source.u;
 		ChannelInfo *ci = source.ci;
@@ -288,13 +207,13 @@ class XOPBase : public Command
 
 		if (readonly)
 		{
-			source.Reply(messages[XOP_DISABLED]);
+			source.Reply(_("Sorry, channel %s list modification is temporarily disabled."), this->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (!ci->GetAccessCount())
 		{
-			source.Reply(messages[XOP_LIST_EMPTY], ci->name.c_str());
+			source.Reply(_("%s %s list is empty."), ci->name.c_str(), this->name.c_str());
 			return MOD_CONT;
 		}
 
@@ -303,7 +222,7 @@ class XOPBase : public Command
 
 		if ((!access || access->nc != u->Account()) && (level >= ulev || ulev < ACCESS_AOP) && !u->Account()->HasPriv("chanserv/access/modify"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -313,24 +232,24 @@ class XOPBase : public Command
 		if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
 			bool override = level >= ulev || ulev < ACCESS_AOP;
-			XOPDelCallback list(source, this, messages, override, mask);
+			XOPDelCallback list(source, this, override, mask);
 			list.Process();
 		}
 		else if (!access || access->level != level)
 		{
-			source.Reply(messages[XOP_NOT_FOUND], mask.c_str(), ci->name.c_str());
+			source.Reply(_("\002%s\002 not found on %s %s list."), mask.c_str(), ci->name.c_str(), this->name.c_str());
 			return MOD_CONT;
 		}
 		else
 		{
 			if (access->nc != u->Account() && ulev <= access->level && !u->Account()->HasPriv("chanserv/access/modify"))
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 			else
 			{
 				bool override = ulev <= access->level;
 				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << access->mask;
 
-				source.Reply(messages[XOP_DELETED], access->mask.c_str(), ci->name.c_str());
+				source.Reply(_("\002%s\002 deleted from %s %s list."), access->mask.c_str(), ci->name.c_str(), this->name.c_str());
 
 				FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, access));
 
@@ -341,7 +260,7 @@ class XOPBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandReturn DoList(CommandSource &source, const std::vector<Anope::string> &params, int level, LanguageString *messages)
+	CommandReturn DoList(CommandSource &source, const std::vector<Anope::string> &params, int level)
 	{
 		User *u = source.u;
 		ChannelInfo *ci = source.ci;
@@ -353,7 +272,7 @@ class XOPBase : public Command
 
 		if (!ulev && !u->Account()->HasCommand("chanserv/access/list"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -362,13 +281,13 @@ class XOPBase : public Command
 
 		if (!ci->GetAccessCount())
 		{
-			source.Reply(messages[XOP_LIST_EMPTY], ci->name.c_str());
+			source.Reply(_("%s %s list is empty."), ci->name.c_str(), this->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			XOPListCallback list(source, nick, level, messages);
+			XOPListCallback list(source, nick, level, this);
 			list.Process();
 		}
 		else
@@ -387,39 +306,39 @@ class XOPBase : public Command
 				if (!SentHeader)
 				{
 					SentHeader = true;
-					source.Reply(messages[XOP_LIST_HEADER], ci->name.c_str());
+					source.Reply(_("%s list for %s:\n  Num  Nick"), ci->name.c_str());
 				}
 
-				XOPListCallback::DoList(source, access, i + 1, level, messages);
+				XOPListCallback::DoList(source, access, i + 1, level);
 			}
 
 			if (!SentHeader)
-				source.Reply(messages[XOP_NO_MATCH], ci->name.c_str());
+				source.Reply(_("No matching entries on %s %s list."), ci->name.c_str(), this->name.c_str());
 		}
 
 		return MOD_CONT;
 	}
 
-	CommandReturn DoClear(CommandSource &source, int level, LanguageString *messages)
+	CommandReturn DoClear(CommandSource &source, int level)
 	{
 		User *u = source.u;
 		ChannelInfo *ci = source.ci;
 
 		if (readonly)
 		{
-			source.Reply(messages[XOP_DISABLED]);
+			source.Reply(_("Sorry, channel %s list modification is temporarily disabled."), this->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (!ci->GetAccessCount())
 		{
-			source.Reply(messages[XOP_LIST_EMPTY], ci->name.c_str());
+			source.Reply(_("%s %s list is empty."), ci->name.c_str(), this->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("chanserv/access/modify"))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -435,27 +354,29 @@ class XOPBase : public Command
 
 		FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u));
 
-		source.Reply(messages[XOP_CLEAR], ci->name.c_str());
+		source.Reply(_("Channel %s %s list has been cleared."), ci->name.c_str(), this->name.c_str());
 
 		return MOD_CONT;
 	}
+
  protected:
-	CommandReturn DoXop(CommandSource &source, const std::vector<Anope::string> &params, int level, LanguageString *messages)
+	CommandReturn DoXop(CommandSource &source, const std::vector<Anope::string> &params, int level)
 	{
 		ChannelInfo *ci = source.ci;
 
 		const Anope::string &cmd = params[1];
 
 		if (!ci->HasFlag(CI_XOP))
-			source.Reply(CHAN_XOP_ACCESS, Config->s_ChanServ.c_str());
+			source.Reply(_("You can't use this command. Use the ACCESS command instead.\n"
+					"Type \002%R%s HELP ACCESS\002 for more information."), Config->s_ChanServ.c_str());
 		else if (cmd.equals_ci("ADD"))
-			return this->DoAdd(source, params, level, messages);
+			return this->DoAdd(source, params, level);
 		else if (cmd.equals_ci("DEL"))
-			return this->DoDel(source, params, level, messages);
+			return this->DoDel(source, params, level);
 		else if (cmd.equals_ci("LIST"))
-			return this->DoList(source, params, level, messages);
+			return this->DoList(source, params, level);
 		else if (cmd.equals_ci("CLEAR"))
-			return this->DoClear(source, level, messages);
+			return this->DoClear(source, level);
 		else
 			this->OnSyntaxError(source, "");
 
@@ -488,23 +409,58 @@ class CommandCSQOP : public XOPBase
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		return this->DoXop(source, params, ACCESS_QOP, xop_msgs[XOP_QOP]);
+		return this->DoXop(source, params, ACCESS_QOP);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_QOP);
+		source.Reply(_("Syntax: \002QOP \037channel\037 ADD \037mask\037\002\n"
+				"        \002QOP \037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002QOP \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002QOP \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002QOP\002 (AutoOwner) \002list\002 for a channel. The QOP \n"
+				"list gives users the right to be auto-owner on your channel,\n"
+				"which gives them almost (or potentially, total) access.\n"
+				" \n"
+				"The \002QOP ADD\002 command adds the given nickname to the\n"
+				"QOP list.\n"
+				" \n"
+				"The \002QOP DEL\002 command removes the given nick from the\n"
+				"QOP list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				" \n"
+				"The \002QOP LIST\002 command displays the QOP list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002QOP #channel LIST 2-5,7-9\002\n"
+				"      Lists QOP entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				"      \n"
+				"The \002QOP CLEAR\002 command clears all entries of the\n"
+				"QOP list.\n"
+				" \n"
+				"The \002QOP\002 commands are limited to\n"
+				"founders (unless SECUREOPS is off). However, any user on the\n"
+				"QOP list may use the \002QOP LIST\002 command.\n"
+				" \n"
+				"This command may have been disabled for your channel, and\n"
+				"in that case you need to use the access list. See \n"
+				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "QOP", CHAN_QOP_SYNTAX);
+		SyntaxError(source, "QOP", _("QOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_QOP);
+		source.Reply(_("    QOP        Modify the list of QOP users"));
 	}
 };
 
@@ -517,23 +473,61 @@ class CommandCSAOP : public XOPBase
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		return this->DoXop(source, params, ACCESS_AOP, xop_msgs[XOP_AOP]);
+		return this->DoXop(source, params, ACCESS_AOP);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_AOP);
+		source.Reply(_("Syntax: \002AOP \037channel\037 ADD \037mask\037\002\n"
+				"        \002AOP \037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002AOP \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002AOP \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002AOP\002 (AutoOP) \002list\002 for a channel. The AOP \n"
+				"list gives users the right to be auto-opped on your channel,\n"
+				"to unban or invite themselves if needed, to have their\n"
+				"greet message showed on join, and so on.\n"
+				" \n"
+				"The \002AOP ADD\002 command adds the given nickname to the\n"
+				"AOP list.\n"
+				" \n"
+				"The \002AOP DEL\002 command removes the given nick from the\n"
+				"AOP list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				" \n"
+				"The \002AOP LIST\002 command displays the AOP list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002AOP #channel LIST 2-5,7-9\002\n"
+				"      Lists AOP entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				"      \n"
+				"The \002AOP CLEAR\002 command clears all entries of the\n"
+				"AOP list.\n"
+				" \n"
+				"The \002AOP ADD\002 and \002AOP DEL\002 commands are limited to\n"
+				"SOPs or above, while the \002AOP CLEAR\002 command can only\n"
+				"be used by the channel founder. However, any user on the\n"
+				"AOP list may use the \002AOP LIST\002 command.\n"
+				" \n"
+				"This command may have been disabled for your channel, and\n"
+				"in that case you need to use the access list. See \n"
+				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."));
+	/* CHAN_HELP_HOP */
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "AOP", CHAN_AOP_SYNTAX);
+		SyntaxError(source, "AOP", _("AOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_AOP);
+		source.Reply(_("    AOP        Modify the list of AOP users"));
 	}
 };
 
@@ -546,23 +540,58 @@ class CommandCSHOP : public XOPBase
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		return this->DoXop(source, params, ACCESS_HOP, xop_msgs[XOP_HOP]);
+		return this->DoXop(source, params, ACCESS_HOP);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_HOP);
+		source.Reply(_("Syntax: \002HOP \037channel\037 ADD \037mask\037\002\n"
+				"        \002HOP \037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002HOP \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002HOP \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002HOP\002 (HalfOP) \002list\002 for a channel. The HOP \n"
+				"list gives users the right to be auto-halfopped on your \n"
+				"channel.\n"
+				" \n"
+				"The \002HOP ADD\002 command adds the given nickname to the\n"
+				"HOP list.\n"
+				" \n"
+				"The \002HOP DEL\002 command removes the given nick from the\n"
+				"HOP list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				" \n"
+				"The \002HOP LIST\002 command displays the HOP list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002HOP #channel LIST 2-5,7-9\002\n"
+				"      Lists HOP entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				"      \n"
+				"The \002HOP CLEAR\002 command clears all entries of the\n"
+				"HOP list.\n"
+				" \n"
+				"The \002HOP ADD\002, \002HOP DEL\002 and \002HOP LIST\002 commands are \n"
+				"limited to AOPs or above, while the \002HOP CLEAR\002 command \n"
+				"can only be used by the channel founder.\n"
+				" \n"
+				"This command may have been disabled for your channel, and\n"
+				"in that case you need to use the access list. See \n"
+				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "HOP", CHAN_HOP_SYNTAX);
+		SyntaxError(source, "HOP", _("HOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_HOP);
+		source.Reply(_("    HOP        Maintains the HOP (HalfOP) list for a channel"));
 	}
 };
 
@@ -575,23 +604,59 @@ class CommandCSSOP : public XOPBase
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		return this->DoXop(source, params, ACCESS_SOP, xop_msgs[XOP_SOP]);
+		return this->DoXop(source, params, ACCESS_SOP);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_SOP);
+		source.Reply(_("Syntax: \002SOP \037channel\037 ADD \037mask\037\002\n"
+				"        \002SOP \037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002SOP \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002SOP \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002SOP\002 (SuperOP) \002list\002 for a channel. The SOP \n"
+				"list gives users all rights given by the AOP list, and adds\n"
+				"those needed to use the AutoKick and the BadWords lists, \n"
+				"to send and read channel memos, and so on.\n"
+				" \n"
+				"The \002SOP ADD\002 command adds the given nickname to the\n"
+				"SOP list.\n"
+				" \n"
+				"The \002SOP DEL\002 command removes the given nick from the\n"
+				"SOP list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				" \n"
+				"The \002SOP LIST\002 command displays the SOP list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002SOP #channel LIST 2-5,7-9\002\n"
+				"      Lists AOP entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				"      \n"
+				"The \002SOP CLEAR\002 command clears all entries of the\n"
+				"SOP list.\n"
+				" \n"
+				"The \002SOP ADD\002, \002SOP DEL\002 and \002SOP CLEAR\002 commands are \n"
+				"limited to the channel founder. However, any user on the\n"
+				"AOP list may use the \002SOP LIST\002 command.\n"
+				" \n"
+				"This command may have been disabled for your channel, and\n"
+				"in that case you need to use the access list. See \n"
+				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SOP", CHAN_SOP_SYNTAX);
+		SyntaxError(source, "SOP", _("SOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_SOP);
+		source.Reply(_("    SOP        Modify the list of SOP users"));
 	}
 };
 
@@ -604,23 +669,58 @@ class CommandCSVOP : public XOPBase
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		return this->DoXop(source, params, ACCESS_VOP, xop_msgs[XOP_VOP]);
+		return this->DoXop(source, params, ACCESS_VOP);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_VOP);
+		source.Reply(_("Syntax: \002VOP \037channel\037 ADD \037mask\037\002\n"
+				"        \002VOP \037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002VOP \037channel\037 LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002VOP \037channel\037 CLEAR\002\n"
+				" \n"
+				"Maintains the \002VOP\002 (VOicePeople) \002list\002 for a channel.  \n"
+				"The VOP list allows users to be auto-voiced and to voice \n"
+				"themselves if they aren't.\n"
+				" \n"
+				"The \002VOP ADD\002 command adds the given nickname to the\n"
+				"VOP list.\n"
+				" \n"
+				"The \002VOP DEL\002 command removes the given nick from the\n"
+				"VOP list.  If a list of entry numbers is given, those\n"
+				"entries are deleted.  (See the example for LIST below.)\n"
+				" \n"
+				"The \002VOP LIST\002 command displays the VOP list.  If\n"
+				"a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002VOP #channel LIST 2-5,7-9\002\n"
+				"      Lists VOP entries numbered 2 through 5 and\n"
+				"      7 through 9.\n"
+				"      \n"
+				"The \002VOP CLEAR\002 command clears all entries of the\n"
+				"VOP list.\n"
+				" \n"
+				"The \002VOP ADD\002, \002VOP DEL\002 and \002VOP LIST\002 commands are \n"
+				"limited to AOPs or above, while the \002VOP CLEAR\002 command \n"
+				"can only be used by the channel founder.\n"
+				" \n"
+				"This command may have been disabled for your channel, and\n"
+				"in that case you need to use the access list. See \n"
+				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "VOP", CHAN_VOP_SYNTAX);
+		SyntaxError(source, "VOP", _("VOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_VOP);
+		source.Reply(_("    VOP        Maintains the VOP (VOicePeople) list for a channel"));
 	}
 };
 
diff --git a/modules/core/hs_del.cpp b/modules/core/hs_del.cpp
index f119fcaae..627680119 100644
--- a/modules/core/hs_del.cpp
+++ b/modules/core/hs_del.cpp
@@ -29,34 +29,36 @@ class CommandHSDel : public Command
 		{
 			if (na->HasFlag(NS_FORBIDDEN))
 			{
-				source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 				return MOD_CONT;
 			}
 			Log(LOG_ADMIN, u, this) << "for user " << na->nick;
 			FOREACH_MOD(I_OnDeleteVhost, OnDeleteVhost(na));
 			na->hostinfo.RemoveVhost();
-			source.Reply(HOST_DEL, nick.c_str());
+			source.Reply(_("vhost for \002%s\002 removed."), nick.c_str());
 		}
 		else
-			source.Reply(HOST_NOREG, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_DEL);
+		source.Reply(_("Syntax: \002DEL\002 \002<nick>\002\n"
+				"Deletes the vhost assigned to the given nick from the\n"
+				"database."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEL", HOST_DEL_SYNTAX);
+		SyntaxError(source, "DEL", _("DEL \002<nick>\002."));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_DEL);
+		source.Reply(_("    DEL         Delete the vhost of another user"));
 	}
 };
 
diff --git a/modules/core/hs_delall.cpp b/modules/core/hs_delall.cpp
index 4e88051d0..03455a146 100644
--- a/modules/core/hs_delall.cpp
+++ b/modules/core/hs_delall.cpp
@@ -29,7 +29,7 @@ class CommandHSDelAll : public Command
 		{
 			if (na->HasFlag(NS_FORBIDDEN))
 			{
-				source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 				return MOD_CONT;
 			}
 			FOREACH_MOD(I_OnDeleteVhost, OnDeleteVhost(na));
@@ -40,28 +40,30 @@ class CommandHSDelAll : public Command
 				na->hostinfo.RemoveVhost();
 			}
 			Log(LOG_ADMIN, u, this) << "for all nicks in group " << nc->display;
-			source.Reply(HOST_DELALL, nc->display.c_str());
+			source.Reply(_("vhosts for group \002%s\002 have been removed."), nc->display.c_str());
 		}
 		else
-			source.Reply(HOST_NOREG, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_DELALL);
+		source.Reply(_("Syntax: \002DELALL\002 \002<nick>\002.\n"
+				"Deletes the vhost for all nicks in the same group as\n"
+				"that of the given nick."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DELALL", HOST_DELALL_SYNTAX);
+		SyntaxError(source, "DELALL", _("DELALL <nick>\002."));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_DELALL);
+		source.Reply(_("    DELALL      Delete the vhost for all nicks in a group"));
 	}
 };
 
diff --git a/modules/core/hs_group.cpp b/modules/core/hs_group.cpp
index 0eec94113..abcb82e72 100644
--- a/modules/core/hs_group.cpp
+++ b/modules/core/hs_group.cpp
@@ -28,25 +28,29 @@ class CommandHSGroup : public Command
 		{
 			HostServSyncVhosts(na);
 			if (!na->hostinfo.GetIdent().empty())
-				source.Reply(HOST_IDENT_GROUP, u->Account()->display.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
+				source.Reply(_("All vhost's in the group \002%s\002 have been set to \002%s\002@\002%s\002"), u->Account()->display.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
 			else
-				source.Reply(HOST_GROUP, u->Account()->display.c_str(), na->hostinfo.GetHost().c_str());
+				source.Reply(_("All vhost's in the group \002%s\002 have been set to \002%s\002"), u->Account()->display.c_str(), na->hostinfo.GetHost().c_str());
 		}
 		else
-			source.Reply(HOST_NOT_ASSIGNED);
+			source.Reply(LanguageString::HOST_NOT_ASSIGNED);
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_GROUP);
+		source.Reply(_("Syntax: \002GROUP\002\n"
+				" \n"
+				"This command allows users to set the vhost of their\n"
+				"CURRENT nick to be the vhost for all nicks in the same\n"
+				"group."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_GROUP);
+		source.Reply(_("    GROUP       Syncs the vhost for all nicks in a group"));
 	}
 };
 
diff --git a/modules/core/hs_help.cpp b/modules/core/hs_help.cpp
index f94ec9d53..35d2b99cb 100644
--- a/modules/core/hs_help.cpp
+++ b/modules/core/hs_help.cpp
@@ -30,7 +30,7 @@ class CommandHSHelp : public Command
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(OPER_HELP, Config->s_HostServ.c_str());
+		source.Reply(_("%s commands"), Config->s_HostServ.c_str());
 		for (CommandMap::const_iterator it = HostServ->Commands.begin(), it_end = HostServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
diff --git a/modules/core/hs_list.cpp b/modules/core/hs_list.cpp
index 0f27e51aa..31a201611 100644
--- a/modules/core/hs_list.cpp
+++ b/modules/core/hs_list.cpp
@@ -35,14 +35,14 @@ class CommandHSList : public Command
 			size_t tmp = key.find('-');
 			if (tmp == Anope::string::npos || tmp == key.length() || tmp == 1)
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
 				return MOD_CONT;
 			}
 			for (unsigned i = 1, end = key.length(); i < end; ++i)
 			{
 				if (!isdigit(key[i]) && i != tmp)
 				{
-					source.Reply(LIST_INCORRECT_RANGE);
+					source.Reply(LanguageString::LIST_INCORRECT_RANGE);
 					return MOD_CONT;
 				}
 				from = convertTo<int>(key.substr(1, tmp - 1));
@@ -63,9 +63,9 @@ class CommandHSList : public Command
 				{
 					++display_counter;
 					if (!na->hostinfo.GetIdent().empty())
-						source.Reply(HOST_IDENT_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
+						source.Reply(_("#%d Nick:\002%s\002, vhost:\002%s\002@\002%s\002 (%s - %s)"), counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
 					else
-						source.Reply(HOST_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
+						source.Reply(_("#%d Nick:\002%s\002, vhost:\002%s\002 (%s - %s)"), counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
 				}
 			}
 			else
@@ -78,34 +78,43 @@ class CommandHSList : public Command
 				{
 					++display_counter;
 					if (!na->hostinfo.GetIdent().empty())
-						source.Reply(HOST_IDENT_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
+						source.Reply(_("#%d Nick:\002%s\002, vhost:\002%s\002@\002%s\002 (%s - %s)"), counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
 					else
-						source.Reply(HOST_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
+						source.Reply(_("#%d Nick:\002%s\002, vhost:\002%s\002 (%s - %s)"), counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str());
 				}
 			}
 			++counter;
 		}
 		if (!key.empty())
-			source.Reply(HOST_LIST_KEY_FOOTER, key.c_str(), display_counter);
+			source.Reply(_("Displayed records matching key \002%s\002 (Count: \002%d\002)"), key.c_str(), display_counter);
 		else
 		{
 			if (from)
-				source.Reply(HOST_LIST_RANGE_FOOTER, from, to);
+				source.Reply(_("Displayed records from \002%d\002 to \002%d\002"), from, to);
 			else
-				source.Reply(HOST_LIST_FOOTER, display_counter);
+				source.Reply(_("Displayed all records (Count: \002%d\002)"), display_counter);
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_LIST);
+		source.Reply(_("Syntax: \002LIST\002 \002[<key>|<#X-Y>]\002\n"
+				"This command lists registered vhosts to the operator\n"
+				"if a Key is specified, only entries whos nick or vhost match\n"
+				"the pattern given in <key> are displayed e.g. Rob* for all\n"
+				"entries beginning with \"Rob\"\n"
+				"If a #X-Y style is used, only entries between the range of X\n"
+				"and Y will be displayed, e.g. #1-3 will display the first 3\n"
+				"nick/vhost entries.\n"
+				"The list uses the value of NSListMax as a hard limit for the\n"
+				"number of items to display to a operator at any 1 time."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_LIST);
+		source.Reply(_("    LIST        Displays one or more vhost entries."));
 	}
 };
 
diff --git a/modules/core/hs_off.cpp b/modules/core/hs_off.cpp
index b38164bb0..d61beca1f 100644
--- a/modules/core/hs_off.cpp
+++ b/modules/core/hs_off.cpp
@@ -26,12 +26,12 @@ class CommandHSOff : public Command
 		NickAlias *na = findnick(u->nick);
 
 		if (!na || !na->hostinfo.HasVhost())
-			source.Reply(HOST_NOT_ASSIGNED);
+			source.Reply(LanguageString::HOST_NOT_ASSIGNED);
 		else
 		{
 			ircdproto->SendVhostDel(u);
 			Log(LOG_COMMAND, u, this) << "to disable their vhost";
-			source.Reply(HOST_OFF);
+			source.Reply(_("Your vhost was removed and the normal cloaking restored."));
 		}
 
 		return MOD_CONT;
@@ -39,13 +39,16 @@ class CommandHSOff : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_OFF);
+		source.Reply(_("Syntax: \002OFF\002\n"
+				"Deactivates the vhost currently assigned to the nick in use.\n"
+				"When you use this command any user who performs a /whois\n"
+				"on you will see your real IP address."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_OFF);
+		source.Reply(_("    OFF         Deactivates your assigned vhost"));
 	}
 };
 
diff --git a/modules/core/hs_on.cpp b/modules/core/hs_on.cpp
index 1834578ad..72bdfa45b 100644
--- a/modules/core/hs_on.cpp
+++ b/modules/core/hs_on.cpp
@@ -27,9 +27,9 @@ class CommandHSOn : public Command
 		if (na && u->Account() == na->nc && na->hostinfo.HasVhost())
 		{
 			if (!na->hostinfo.GetIdent().empty())
-				source.Reply(HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
+				source.Reply(_("Your vhost of \002%s\002@\002%s\002 is now activated."), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
 			else
-				source.Reply(HOST_ACTIVATED, na->hostinfo.GetHost().c_str());
+				source.Reply(_("Your vhost of \002%s\002 is now activated."), na->hostinfo.GetHost().c_str());
 			Log(LOG_COMMAND, u, this) << "to enable their vhost of " << (!na->hostinfo.GetIdent().empty() ? na->hostinfo.GetIdent() + "@" : "") << na->hostinfo.GetHost();
 			ircdproto->SendVhost(u, na->hostinfo.GetIdent(), na->hostinfo.GetHost());
 			if (ircd->vhost)
@@ -42,20 +42,23 @@ class CommandHSOn : public Command
 			u->UpdateHost();
 		}
 		else
-			source.Reply(HOST_NOT_ASSIGNED);
+			source.Reply(LanguageString::HOST_NOT_ASSIGNED);
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_ON);
+		source.Reply(_("Syntax: \002ON\002\n"
+				"Activates the vhost currently assigned to the nick in use.\n"
+				"When you use this command any user who performs a /whois\n"
+				"on you will see the vhost instead of your real IP address."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_ON);
+		source.Reply(_("    ON          Activates your assigned vhost"));
 	}
 };
 
diff --git a/modules/core/hs_set.cpp b/modules/core/hs_set.cpp
index 0e11ad3e8..f4fcfb58a 100644
--- a/modules/core/hs_set.cpp
+++ b/modules/core/hs_set.cpp
@@ -34,12 +34,12 @@ class CommandHSSet : public Command
 			rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */
 			if (rawhostmask.empty())
 			{
-				source.Reply(HOST_SET_SYNTAX, Config->s_HostServ.c_str());
+				source.Reply(_("SET \002<nick>\002 \002<hostmask>\002."), Config->s_HostServ.c_str());
 				return MOD_CONT;
 			}
 			if (vIdent.length() > Config->UserLen)
 			{
-				source.Reply(HOST_SET_IDENTTOOLONG, Config->UserLen);
+				source.Reply(LanguageString::HOST_SET_IDENTTOOLONG, Config->UserLen);
 				return MOD_CONT;
 			}
 			else
@@ -47,13 +47,13 @@ class CommandHSSet : public Command
 				for (Anope::string::iterator s = vIdent.begin(), s_end = vIdent.end(); s != s_end; ++s)
 					if (!isvalidchar(*s))
 					{
-						source.Reply(HOST_SET_IDENT_ERROR);
+						source.Reply(LanguageString::HOST_SET_IDENT_ERROR);
 						return MOD_CONT;
 					}
 			}
 			if (!ircd->vident)
 			{
-				source.Reply(HOST_NO_VIDENT);
+				source.Reply(LanguageString::HOST_NO_VIDENT);
 				return MOD_CONT;
 			}
 		}
@@ -61,13 +61,13 @@ class CommandHSSet : public Command
 			hostmask = rawhostmask;
 		else
 		{
-			source.Reply(HOST_SET_TOOLONG, Config->HostLen);
+			source.Reply(LanguageString::HOST_SET_TOOLONG, Config->HostLen);
 			return MOD_CONT;
 		}
 
 		if (!isValidHost(hostmask, 3))
 		{
-			source.Reply(HOST_SET_ERROR);
+			source.Reply(LanguageString::HOST_SET_ERROR);
 			return MOD_CONT;
 		}
 
@@ -76,7 +76,7 @@ class CommandHSSet : public Command
 		{
 			if (na->HasFlag(NS_FORBIDDEN))
 			{
-				source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 				return MOD_CONT;
 			}
 
@@ -85,29 +85,34 @@ class CommandHSSet : public Command
 			na->hostinfo.SetVhost(vIdent, hostmask, u->nick);
 			FOREACH_MOD(I_OnSetVhost, OnSetVhost(na));
 			if (!vIdent.empty())
-				source.Reply(HOST_IDENT_SET, nick.c_str(), vIdent.c_str(), hostmask.c_str());
+				source.Reply(_("vhost for \002%s\002 set to \002%s\002@\002%s\002."), nick.c_str(), vIdent.c_str(), hostmask.c_str());
 			else
-				source.Reply(HOST_SET, nick.c_str(), hostmask.c_str());
+				source.Reply(_("vhost for \002%s\002 set to \002%s\002."), nick.c_str(), hostmask.c_str());
 		}
 		else
-			source.Reply(HOST_NOREG, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
+
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_SET);
+		source.Reply(_("Syntax: \002SET\002 \002<nick>\002 \002<hostmask>\002.\n"
+				"Sets the vhost for the given nick to that of the given\n"
+				"hostmask.  If your IRCD supports vIdents, then using\n"
+				"SET <nick> <ident>@<hostmask> set idents for users as \n"
+				"well as vhosts."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SET", HOST_SET_SYNTAX);
+		SyntaxError(source, "SET", _("SET \002<nick>\002 \002<hostmask>\002."));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_SET);
+		source.Reply(_("    SET         Set the vhost of another user"));
 	}
 };
 
diff --git a/modules/core/hs_setall.cpp b/modules/core/hs_setall.cpp
index 3aac924e4..c5c2d777d 100644
--- a/modules/core/hs_setall.cpp
+++ b/modules/core/hs_setall.cpp
@@ -32,12 +32,12 @@ class CommandHSSetAll : public Command
 		NickAlias *na = findnick(nick);
 		if (!na)
 		{
-			source.Reply(HOST_NOREG, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 			return MOD_CONT;
 		}
 		else if (na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -47,12 +47,12 @@ class CommandHSSetAll : public Command
 			rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */
 			if (rawhostmask.empty())
 			{
-				source.Reply(HOST_SETALL_SYNTAX, Config->s_HostServ.c_str());
+				source.Reply(_("vhost for group \002%s\002 set to \002%s\002."), Config->s_HostServ.c_str());
 				return MOD_CONT;
 			}
 			if (vIdent.length() > Config->UserLen)
 			{
-				source.Reply(HOST_SET_IDENTTOOLONG, Config->UserLen);
+				source.Reply(LanguageString::HOST_SET_IDENTTOOLONG, Config->UserLen);
 				return MOD_CONT;
 			}
 			else
@@ -60,13 +60,13 @@ class CommandHSSetAll : public Command
 				for (Anope::string::iterator s = vIdent.begin(), s_end = vIdent.end(); s != s_end; ++s)
 					if (!isvalidchar(*s))
 					{
-						source.Reply(HOST_SET_IDENT_ERROR);
+						source.Reply(LanguageString::HOST_SET_IDENT_ERROR);
 						return MOD_CONT;
 					}
 			}
 			if (!ircd->vident)
 			{
-				source.Reply(HOST_NO_VIDENT);
+				source.Reply(LanguageString::HOST_NO_VIDENT);
 				return MOD_CONT;
 			}
 		}
@@ -76,13 +76,13 @@ class CommandHSSetAll : public Command
 			hostmask = rawhostmask;
 		else
 		{
-			source.Reply(HOST_SET_TOOLONG, Config->HostLen);
+			source.Reply(LanguageString::HOST_SET_TOOLONG, Config->HostLen);
 			return MOD_CONT;
 		}
 
 		if (!isValidHost(hostmask, 3))
 		{
-			source.Reply(HOST_SET_ERROR);
+			source.Reply(LanguageString::HOST_SET_ERROR);
 			return MOD_CONT;
 		}
 
@@ -94,26 +94,32 @@ class CommandHSSetAll : public Command
 		HostServSyncVhosts(na);
 		FOREACH_MOD(I_OnSetVhost, OnSetVhost(na));
 		if (!vIdent.empty())
-			source.Reply(HOST_IDENT_SETALL, nick.c_str(), vIdent.c_str(), hostmask.c_str());
+			source.Reply(_("vhost for group \002%s\002 set to \002%s\002@\002%s\002."), nick.c_str(), vIdent.c_str(), hostmask.c_str());
 		else
-			source.Reply(HOST_SETALL, nick.c_str(), hostmask.c_str());
+			source.Reply(_("vhost for group \002%s\002 set to \002%s\002."), nick.c_str(), hostmask.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(HOST_HELP_SETALL);
+		source.Reply(_("Syntax: \002SETALL\002 \002<nick>\002 \002<hostmask>\002.\n"
+				"Sets the vhost for all nicks in the same group as that\n"
+				"of the given nick.  If your IRCD supports vIdents, then\n"
+				"using SETALL <nick> <ident>@<hostmask> will set idents\n"
+				"for users as well as vhosts.\n"
+				"* NOTE, this will not update the vhost for any nicks\n"
+				"added to the group after this command was used."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SETALL", HOST_SETALL_SYNTAX);
+		SyntaxError(source, "SETALL", _("SETALL \002<nick>\002 \002<hostmask>\002."));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(HOST_HELP_CMD_SETALL);
+		source.Reply(_("    SETALL      Set the vhost for all nicks in a group"));
 	}
 };
 
diff --git a/modules/core/ms_cancel.cpp b/modules/core/ms_cancel.cpp
index fb9e77c26..dc32624a5 100644
--- a/modules/core/ms_cancel.cpp
+++ b/modules/core/ms_cancel.cpp
@@ -34,9 +34,9 @@ class CommandMSCancel : public Command
 		if (!(mi = getmemoinfo(nname, ischan, isforbid)))
 		{
 			if (isforbid)
-				source.Reply(ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, nname.c_str());
+				source.Reply(ischan ? LanguageString::CHAN_X_FORBIDDEN : LanguageString::NICK_X_FORBIDDEN, nname.c_str());
 			else
-				source.Reply(ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nname.c_str());
+				source.Reply(ischan ? LanguageString::CHAN_X_NOT_REGISTERED : LanguageString::NICK_X_NOT_REGISTERED, nname.c_str());
 		}
 		else
 		{
@@ -45,29 +45,32 @@ class CommandMSCancel : public Command
 				{
 					FOREACH_MOD(I_OnMemoDel, OnMemoDel(findnick(nname)->nc, mi, mi->memos[i]));
 					mi->Del(mi->memos[i]);
-					source.Reply(MEMO_CANCELLED, nname.c_str());
+					source.Reply(_("Last memo to \002%s\002 has been cancelled."), nname.c_str());
 					return MOD_CONT;
 				}
 
-			source.Reply(MEMO_CANCEL_NONE);
+			source.Reply(_("No memo was cancelable."));
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_CANCEL);
+		source.Reply(_("Syntax: \002CANCEL {\037nick\037 | \037channel\037}\002\n"
+				" \n"
+				"Cancels the last memo you sent to the given nick or channel,\n"
+				"provided it has not been read at the time you use the command."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "CANCEL", MEMO_CANCEL_SYNTAX);
+		SyntaxError(source, "CANCEL", _("CANCEL {\037nick\037 | \037channel\037}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_CANCEL);
+		source.Reply(_("    CANCEL Cancel last memo you sent"));
 	}
 };
 
diff --git a/modules/core/ms_check.cpp b/modules/core/ms_check.cpp
index b861a5b01..60e1d7182 100644
--- a/modules/core/ms_check.cpp
+++ b/modules/core/ms_check.cpp
@@ -31,13 +31,13 @@ class CommandMSCheck : public Command
 		NickAlias *na = findnick(recipient);
 		if (!na)
 		{
-			source.Reply(NICK_X_NOT_REGISTERED, recipient.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, recipient.c_str());
 			return MOD_CONT;
 		}
 
 		if (na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, recipient.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, recipient.c_str());
 			return MOD_CONT;
 		}
 
@@ -53,33 +53,36 @@ class CommandMSCheck : public Command
 				found = true; /* Yes, we've found the memo */
 
 				if (mi->memos[i]->HasFlag(MF_UNREAD))
-					source.Reply(MEMO_CHECK_NOT_READ, na->nick.c_str(), do_strftime(mi->memos[i]->time).c_str());
+					source.Reply(_("The last memo you sent to %s (sent on %s) has not yet been read."), na->nick.c_str(), do_strftime(mi->memos[i]->time).c_str());
 				else
-					source.Reply(MEMO_CHECK_READ, na->nick.c_str(), do_strftime(mi->memos[i]->time).c_str());
+					source.Reply(_("The last memo you sent to %s (sent on %s) has been read."), na->nick.c_str(), do_strftime(mi->memos[i]->time).c_str());
 				break;
 			}
 		}
 
 		if (!found)
-			source.Reply(MEMO_CHECK_NO_MEMO, na->nick.c_str());
+			source.Reply(_("Nick %s doesn't have a memo from you."), na->nick.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_CHECK);
+		source.Reply(_("Syntax: \002CHECK \037nick\037\002\n"
+				" \n"
+				"Checks whether the _last_ memo you sent to \037nick\037 has been read\n"
+				"or not. Note that this does only work with nicks, not with chans."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "CHECK", MEMO_CHECK_SYNTAX);
+		SyntaxError(source, "CHECK", _("CHECK \037nickname\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_CHECK);
+		source.Reply(_("    CHECK  Checks if last memo to a nick was read"));
 	}
 };
 
diff --git a/modules/core/ms_del.cpp b/modules/core/ms_del.cpp
index 3f778bfbe..668d3c418 100644
--- a/modules/core/ms_del.cpp
+++ b/modules/core/ms_del.cpp
@@ -34,7 +34,7 @@ class MemoDelCallback : public NumberList
 			FOREACH_MOD(I_OnMemoDel, OnMemoDel(source.u->Account(), mi, mi->memos[Number - 1]));
 
 		mi->Del(Number - 1);
-		source.Reply(MEMO_DELETED_ONE, Number);
+		source.Reply(_("Memo %d has been deleted."), Number);
 	}
 };
 
@@ -60,17 +60,17 @@ class CommandMSDel : public Command
 
 			if (!(ci = cs_findchan(chan)))
 			{
-				source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
+				source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
 			}
 			else if (readonly)
 			{
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 				return MOD_CONT;
 			}
 			else if (!check_access(u, ci, CA_MEMO))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			mi = &ci->memos;
@@ -82,9 +82,9 @@ class CommandMSDel : public Command
 		else if (mi->memos.empty())
 		{
 			if (!chan.empty())
-				source.Reply(MEMO_X_HAS_NO_MEMOS, chan.c_str());
+				source.Reply(LanguageString::MEMO_X_HAS_NO_MEMOS, chan.c_str());
 			else
-				source.Reply(MEMO_HAVE_NO_MEMOS);
+				source.Reply(LanguageString::MEMO_HAVE_NO_MEMOS);
 		}
 		else
 		{
@@ -101,7 +101,7 @@ class CommandMSDel : public Command
 				else
 					FOREACH_MOD(I_OnMemoDel, OnMemoDel(u->Account(), mi, mi->memos[mi->memos.size() - 1]));
 				mi->Del(mi->memos[mi->memos.size() - 1]);
-				source.Reply(MEMO_DELETED_ONE, mi->memos.size() + 1);
+				source.Reply(_("Memo %d has been deleted."), mi->memos.size() + 1);
 			}
 			else
 			{
@@ -114,9 +114,9 @@ class CommandMSDel : public Command
 					delete mi->memos[i];
 				mi->memos.clear();
 				if (!chan.empty())
-					source.Reply(MEMO_CHAN_DELETED_ALL, chan.c_str());
+					source.Reply(_("All memos for channel %s have been deleted."), chan.c_str());
 				else
-					source.Reply(MEMO_DELETED_ALL);
+					source.Reply(_("All of your memos have been deleted."));
 			}
 		}
 		return MOD_CONT;
@@ -124,18 +124,33 @@ class CommandMSDel : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_DEL);
+		source.Reply(_("Syntax: \002DEL [\037channel\037] {\037num\037 | \037list\037 | LAST | ALL}\002\n"
+				" \n"
+				"Deletes the specified memo or memos. You can supply\n"
+				"multiple memo numbers or ranges of numbers instead of a\n"
+				"single number, as in the second example below.\n"
+				" \n"
+				"If \002LAST\002 is given, the last memo will be deleted.\n"
+				"If \002ALL\002 is given, deletes all of your memos.\n"
+				" \n"
+				"Examples:\n"
+				" \n"
+				"   \002DEL 1\002\n"
+				"      Deletes your first memo.\n"
+				" \n"
+				"   \002DEL 2-5,7-9\002\n"
+				"      Deletes memos numbered 2 through 5 and 7 through 9."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEL", MEMO_DEL_SYNTAX);
+		SyntaxError(source, "DEL", _("DEL [\037channel\037] {\037num\037 | \037list\037 | ALL}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_DEL);
+		source.Reply(_("    DEL    Delete a memo or memos"));
 	}
 };
 
diff --git a/modules/core/ms_help.cpp b/modules/core/ms_help.cpp
index d67d012b1..fdcbbaf1e 100644
--- a/modules/core/ms_help.cpp
+++ b/modules/core/ms_help.cpp
@@ -30,11 +30,20 @@ class CommandMSHelp : public Command
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(MEMO_HELP_HEADER);
+		source.Reply(_("\002%S\002 is a utility allowing IRC users to send short\n"
+				"messages to other IRC users, whether they are online at\n"
+				"the time or not, or to channels(*). Both the sender's\n"
+				"nickname and the target nickname or channel must be\n"
+				"registered in order to send a memo.\n"
+				"%S's commands include:"));
 		for (CommandMap::const_iterator it = MemoServ->Commands.begin(), it_end = MemoServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
-		source.Reply(MEMO_HELP_FOOTER, Config->s_ChanServ.c_str());
+		source.Reply(_("Type \002%R%S HELP \037command\037\002 for help on any of the\n"
+				"above commands.\n"
+				"(*) By default, any user with at least level 10 access on a\n"
+				"    channel can read that channel's memos. This can be\n"
+				"    changed with the %s \002LEVELS\002 command."), Config->s_ChanServ.c_str());
 	}
 };
 
diff --git a/modules/core/ms_ignore.cpp b/modules/core/ms_ignore.cpp
index 8ff5b2e18..647219833 100644
--- a/modules/core/ms_ignore.cpp
+++ b/modules/core/ms_ignore.cpp
@@ -40,21 +40,21 @@ class CommandMSIgnore : public Command
 		if (!mi)
 		{
 			if (isforbid)
-				source.Reply(ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, channel.c_str());
+				source.Reply(ischan ? LanguageString::CHAN_X_FORBIDDEN : LanguageString::NICK_X_FORBIDDEN, channel.c_str());
 			else
-				source.Reply(ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, channel.c_str());
+				source.Reply(ischan ? LanguageString::CHAN_X_NOT_REGISTERED : LanguageString::NICK_X_NOT_REGISTERED, channel.c_str());
 		}
 		else if (ischan && !check_access(u, cs_findchan(channel), CA_MEMO))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (command.equals_ci("ADD") && !param.empty())
 		{
 			if (std::find(mi->ignores.begin(), mi->ignores.end(), param.ci_str()) == mi->ignores.end())
 			{
 				mi->ignores.push_back(param.ci_str());
-				source.Reply(MEMO_IGNORE_ADD, param.c_str());
+				source.Reply(_("\002%s\002 added to your ignore list."), param.c_str());
 			}
 			else
-				source.Reply(MEMO_IGNORE_ALREADY_IGNORED, param.c_str());
+				source.Reply(_("\002%s\002 is already on your ignore list."), param.c_str());
 		}
 		else if (command.equals_ci("DEL") && !param.empty())
 		{
@@ -63,18 +63,18 @@ class CommandMSIgnore : public Command
 			if (it != mi->ignores.end())
 			{
 				mi->ignores.erase(it);
-				source.Reply(MEMO_IGNORE_DEL, param.c_str());
+				source.Reply(_("\002%s\002 removed from your ignore list."), param.c_str());
 			}
 			else
-				source.Reply(MEMO_IGNORE_NOT_IGNORED, param.c_str());
+				source.Reply(_("\002%s\002 is not on your ignore list."), param.c_str());
 		}
 		else if (command.equals_ci("LIST"))
 		{
 			if (mi->ignores.empty())
-				source.Reply(MEMO_IGNORE_LIST_EMPTY);
+				source.Reply(_("Your memo ignore list is empty."));
 			else
 			{
-				source.Reply(MEMO_IGNORE_LIST_HEADER);
+				source.Reply(_("Ignore list:"));
 				for (unsigned i = 0; i < mi->ignores.size(); ++i)
 					source.Reply("    %s", mi->ignores[i].c_str());
 			}
@@ -87,18 +87,21 @@ class CommandMSIgnore : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_IGNORE);
+		source.Reply(_("Syntax: \002IGNORE [\037channek\037] {\002ADD|DEL|LIST\002} [\037entry\037]\n"
+				" \n"
+				"Allows you to ignore users by nick or host from memoing you. If someone on your\n"
+				"memo ignore list tries to memo you, they will not be told that you have them ignored."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "IGNORE", MEMO_IGNORE_SYNTAX);
+		SyntaxError(source, "IGNORE", _("IGNORE [\037channel\037] {\002ADD|DEL|\002} [\037entry\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_IGNORE);
+		source.Reply(_("    IGNORE Manage your memo ignore list"));
 	}
 };
 
diff --git a/modules/core/ms_info.cpp b/modules/core/ms_info.cpp
index aa2f8e8a7..1d34073d9 100644
--- a/modules/core/ms_info.cpp
+++ b/modules/core/ms_info.cpp
@@ -35,12 +35,12 @@ class CommandMSInfo : public Command
 			na = findnick(nname);
 			if (!na)
 			{
-				source.Reply(NICK_X_NOT_REGISTERED, nname.c_str());
+				source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nname.c_str());
 				return MOD_CONT;
 			}
 			else if (na->HasFlag(NS_FORBIDDEN))
 			{
-				source.Reply(NICK_X_FORBIDDEN, nname.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, nname.c_str());
 				return MOD_CONT;
 			}
 			mi = &na->nc->memos;
@@ -50,12 +50,12 @@ class CommandMSInfo : public Command
 		{
 			if (!(ci = cs_findchan(nname)))
 			{
-				source.Reply(CHAN_X_NOT_REGISTERED, nname.c_str());
+				source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, nname.c_str());
 				return MOD_CONT;
 			}
 			else if (!check_access(u, ci, CA_MEMO))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			mi = &ci->memos;
@@ -63,7 +63,7 @@ class CommandMSInfo : public Command
 		}
 		else if (!nname.empty()) /* It's not a chan and we aren't services admin */
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 		else
@@ -75,13 +75,13 @@ class CommandMSInfo : public Command
 		if (!nname.empty() && (ci || na->nc != u->Account()))
 		{
 			if (mi->memos.empty())
-				source.Reply(MEMO_INFO_X_NO_MEMOS, nname.c_str());
+				source.Reply(_("%s currently has no memos."), nname.c_str());
 			else if (mi->memos.size() == 1)
 			{
 				if (mi->memos[0]->HasFlag(MF_UNREAD))
-					source.Reply(MEMO_INFO_X_MEMO_UNREAD, nname.c_str());
+					source.Reply(_("%s currently has \0021\002 memo, and it has not yet been read."), nname.c_str());
 				else
-					source.Reply(MEMO_INFO_X_MEMO, nname.c_str());
+					source.Reply(_("%s currently has \0021\002 memo."), nname.c_str());
 			}
 			else
 			{
@@ -90,55 +90,55 @@ class CommandMSInfo : public Command
 					if (mi->memos[i]->HasFlag(MF_UNREAD))
 						++count;
 				if (count == mi->memos.size())
-					source.Reply(MEMO_INFO_X_MEMOS_ALL_UNREAD, nname.c_str(), count);
+					source.Reply(_("%s currently has \002%d\002 memos; all of them are unread."), nname.c_str(), count);
 				else if (!count)
-					source.Reply(MEMO_INFO_X_MEMOS, nname.c_str(), mi->memos.size());
+					source.Reply(_("%s currently has \002%d\002 memos."), nname.c_str(), mi->memos.size());
 				else if (count == 1)
-					source.Reply(MEMO_INFO_X_MEMOS_ONE_UNREAD, nname.c_str(), mi->memos.size());
+					source.Reply(_("%s currently has \002%d\002 memos, of which \0021\002 is unread."), nname.c_str(), mi->memos.size());
 				else
-					source.Reply(MEMO_INFO_X_MEMOS_SOME_UNREAD, nname.c_str(), mi->memos.size(), count);
+					source.Reply(_("%s currently has \002%d\002 memos, of which \002%d\002 are unread."), nname.c_str(), mi->memos.size(), count);
 			}
 			if (!mi->memomax)
 			{
 				if (hardmax)
-					source.Reply(MEMO_INFO_X_HARD_LIMIT, nname.c_str(), mi->memomax);
+					source.Reply(_("%s's memo limit is \002%d\002, and may not be changed."), nname.c_str(), mi->memomax);
 				else
-					source.Reply(MEMO_INFO_X_LIMIT, nname.c_str(), mi->memomax);
+					source.Reply(_("%s's memo limit is \002%d\002."), nname.c_str(), mi->memomax);
 			}
 			else if (mi->memomax > 0)
 			{
 				if (hardmax)
-					source.Reply(MEMO_INFO_X_HARD_LIMIT, nname.c_str(), mi->memomax);
+					source.Reply(_("%s's memo limit is \002%d\002, and may not be changed."), nname.c_str(), mi->memomax);
 				else
-					source.Reply(MEMO_INFO_X_LIMIT, nname.c_str(), mi->memomax);
+					source.Reply(_("%s's memo limit is \002%d\002."), nname.c_str(), mi->memomax);
 			}
 			else
-				source.Reply(MEMO_INFO_X_NO_LIMIT, nname.c_str());
+				source.Reply(_("%s has no memo limit."), nname.c_str());
 
 			/* I ripped this code out of ircservices 4.4.5, since I didn't want
 			   to rewrite the whole thing (it pisses me off). */
 			if (na)
 			{
 				if (na->nc->HasFlag(NI_MEMO_RECEIVE) && na->nc->HasFlag(NI_MEMO_SIGNON))
-					source.Reply(MEMO_INFO_X_NOTIFY_ON, nname.c_str());
+					source.Reply(_("%s is notified of new memos at logon and when they arrive."), nname.c_str());
 				else if (na->nc->HasFlag(NI_MEMO_RECEIVE))
-					source.Reply(MEMO_INFO_X_NOTIFY_RECEIVE, nname.c_str());
+					source.Reply(_("%s is notified when new memos arrive."), nname.c_str());
 				else if (na->nc->HasFlag(NI_MEMO_SIGNON))
-					source.Reply(MEMO_INFO_X_NOTIFY_SIGNON, nname.c_str());
+					source.Reply(_("%s is notified of news memos at logon."), nname.c_str());
 				else
-					source.Reply(MEMO_INFO_X_NOTIFY_OFF, nname.c_str());
+					source.Reply(_("%s is not notified of new memos."), nname.c_str());
 			}
 		}
 		else /* !nname || (!ci || na->nc == u->Account()) */
 		{
 			if (mi->memos.empty())
-				source.Reply(MEMO_INFO_NO_MEMOS);
+				source.Reply(_("You currently have no memos."));
 			else if (mi->memos.size() == 1)
 			{
 				if (mi->memos[0]->HasFlag(MF_UNREAD))
-					source.Reply(MEMO_INFO_MEMO_UNREAD);
+					source.Reply(_("You currently have \0021\002 memo, and it has not yet been read."));
 				else
-					source.Reply(MEMO_INFO_MEMO);
+					source.Reply(_("You currently have \0021\002 memo."));
 			}
 			else
 			{
@@ -147,41 +147,41 @@ class CommandMSInfo : public Command
 					if (mi->memos[i]->HasFlag(MF_UNREAD))
 						++count;
 				if (count == mi->memos.size())
-					source.Reply(MEMO_INFO_MEMOS_ALL_UNREAD, count);
+					source.Reply(_("You currently have \002%d\002 memos; all of them are unread."), count);
 				else if (!count)
-					source.Reply(MEMO_INFO_MEMOS, mi->memos.size());
+					source.Reply(_("You currently have \002%d\002 memos."), mi->memos.size());
 				else if (count == 1)
-					source.Reply(MEMO_INFO_MEMOS_ONE_UNREAD, mi->memos.size());
+					source.Reply(_("You currently have \002%d\002 memos, of which \0021\002 is unread."), mi->memos.size());
 				else
-					source.Reply(MEMO_INFO_MEMOS_SOME_UNREAD, mi->memos.size(), count);
+					source.Reply(_("You currently have \002%d\002 memos, of which \002%d\002 are unread."), mi->memos.size(), count);
 			}
 
 			if (!mi->memomax)
 			{
 				if (!u->Account()->IsServicesOper() && hardmax)
-					source.Reply(MEMO_INFO_HARD_LIMIT_ZERO);
+					source.Reply(_("Your memo limit is \0020\002; you will not receive any new memos.  You cannot change this limit."));
 				else
-					source.Reply(MEMO_INFO_LIMIT_ZERO);
+					source.Reply(_("Your memo limit is \0020\002; you will not receive any new memos."));
 			}
 			else if (mi->memomax > 0)
 			{
 				if (!u->Account()->IsServicesOper() && hardmax)
-					source.Reply(MEMO_INFO_HARD_LIMIT, mi->memomax);
+					source.Reply(_("Your memo limit is \002%d\002, and may not be changed."), mi->memomax);
 				else
-					source.Reply(MEMO_INFO_LIMIT, mi->memomax);
+					source.Reply(_("Your memo limit is \002%d\002."), mi->memomax);
 			}
 			else
-				source.Reply(MEMO_INFO_NO_LIMIT);
+				source.Reply(_("You have no limit on the number of memos you may keep."));
 
 			/* Ripped too. But differently because of a seg fault (loughs) */
 			if (u->Account()->HasFlag(NI_MEMO_RECEIVE) && u->Account()->HasFlag(NI_MEMO_SIGNON))
-				source.Reply(MEMO_INFO_NOTIFY_ON);
+				source.Reply(_("You will be notified of new memos at logon and when they arrive."));
 			else if (u->Account()->HasFlag(NI_MEMO_RECEIVE))
-				source.Reply(MEMO_INFO_NOTIFY_RECEIVE);
+				source.Reply(_("You will be notified when new memos arrive."));
 			else if (u->Account()->HasFlag(NI_MEMO_SIGNON))
-				source.Reply(MEMO_INFO_NOTIFY_SIGNON);
+				source.Reply(_("You will be notified of new memos at logon."));
 			else
-				source.Reply(MEMO_INFO_NOTIFY_OFF);
+				source.Reply(_("You will not be notified of new memos."));
 		}
 		return MOD_CONT;
 	}
@@ -190,16 +190,31 @@ class CommandMSInfo : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(MEMO_SERVADMIN_HELP_INFO);
+			source.Reply(_("Syntax: \002INFO [\037nick\037 | \037channel\037]\002\n"
+					"Without a parameter, displays information on the number of\n"
+					"memos you have, how many of them are unread, and how many\n"
+					"total memos you can receive.\n"
+					" \n"
+					"With a channel parameter, displays the same information for\n"
+					"the given channel.\n"
+					" \n"
+					"With a nickname parameter, displays the same information\n"
+					"for the given nickname.  This use limited to \002Services\n"
+					"admins\002."));
 		else
-			source.Reply(MEMO_HELP_INFO);
+			source.Reply(_("Syntax: \002INFO [\037channel\037]\002\n"
+					" \n"
+					"Displays information on the number of memos you have, how\n"
+					"many of them are unread, and how many total memos you can\n"
+					"receive.  With a parameter, displays the same information\n"
+					"for the given channel."));
 
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_INFO);
+		source.Reply(_("    INFO   Displays information about your memos"));
 	}
 };
 
diff --git a/modules/core/ms_list.cpp b/modules/core/ms_list.cpp
index 1b797dc2b..d00e9bd27 100644
--- a/modules/core/ms_list.cpp
+++ b/modules/core/ms_list.cpp
@@ -33,11 +33,11 @@ class MemoListCallback : public NumberList
 		{
 			SentHeader = true;
 			if (ci)
-				source.Reply(MEMO_LIST_CHAN_MEMOS, ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
+				source.Reply(_("Memos for %s.  To read, type: \002%R%s READ %s \037num\037\002"), ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
 			else
-				source.Reply(MEMO_LIST_MEMOS, source.u->nick.c_str(), Config->s_MemoServ.c_str());
+				source.Reply(_("Memos for %s.  To read, type: \002%R%s READ \037num\037\002"), source.u->nick.c_str(), Config->s_MemoServ.c_str());
 
-			source.Reply(MEMO_LIST_HEADER);
+			source.Reply(_(" Num  Sender            Date/Time"));
 		}
 
 		DoList(source, mi, Number - 1);
@@ -46,7 +46,7 @@ class MemoListCallback : public NumberList
 	static void DoList(CommandSource &source, const MemoInfo *mi, unsigned index)
 	{
 		Memo *m = mi->memos[index];
-		source.Reply(MEMO_LIST_FORMAT, (m->HasFlag(MF_UNREAD)) ? '*' : ' ', index + 1, m->sender.c_str(), do_strftime(m->time).c_str());
+		source.Reply(_("%c%3d  %-16s  %s"), (m->HasFlag(MF_UNREAD)) ? '*' : ' ', index + 1, m->sender.c_str(), do_strftime(m->time).c_str());
 	}
 };
 
@@ -73,12 +73,12 @@ class CommandMSList : public Command
 
 			if (!(ci = cs_findchan(chan)))
 			{
-				source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
+				source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
 			}
 			else if (!check_access(u, ci, CA_MEMO))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			mi = &ci->memos;
@@ -90,9 +90,9 @@ class CommandMSList : public Command
 		else if (!mi->memos.size())
 		{
 			if (!chan.empty())
-				source.Reply(MEMO_X_HAS_NO_MEMOS, chan.c_str());
+				source.Reply(LanguageString::MEMO_X_HAS_NO_MEMOS, chan.c_str());
 			else
-				source.Reply(MEMO_HAVE_NO_MEMOS);
+				source.Reply(LanguageString::MEMO_HAVE_NO_MEMOS);
 		}
 		else
 		{
@@ -111,9 +111,9 @@ class CommandMSList : public Command
 					if (i == end)
 					{
 						if (!chan.empty())
-							source.Reply(MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str());
+							source.Reply(LanguageString::MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str());
 						else
-							source.Reply(MEMO_HAVE_NO_NEW_MEMOS);
+							source.Reply(LanguageString::MEMO_HAVE_NO_NEW_MEMOS);
 						return MOD_CONT;
 					}
 				}
@@ -129,10 +129,10 @@ class CommandMSList : public Command
 					{
 						SentHeader = true;
 						if (ci)
-							source.Reply(!param.empty() ? MEMO_LIST_CHAN_NEW_MEMOS : MEMO_LIST_CHAN_MEMOS, ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
+							source.Reply(!param.empty() ? _("New memos for %s.  To read, type: \002%R%s READ %s \037num\037\002") : _("Memos for %s. To read, type: \002%R%s READ %s \037num\037\002"), ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
 						else
-							source.Reply(!param.empty() ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS, u->nick.c_str(), Config->s_MemoServ.c_str());
-						source.Reply(MEMO_LIST_HEADER);
+							source.Reply(!param.empty() ? _("New memos for %s.  To read, type: \002%R%s READ \037num\037\002") : _("Memos for %s. To read, type: \002%R%s READ \037num\037\002"), u->nick.c_str(), Config->s_MemoServ.c_str());
+						source.Reply(_(" Num  Sender            Date/Time"));
 					}
 
 					MemoListCallback::DoList(source, mi, i);
@@ -144,18 +144,25 @@ class CommandMSList : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_LIST);
+		source.Reply(_("Syntax: \002LIST [\037channel\037] [\037list\037 | NEW]\002\n"
+				" \n"
+				"Lists any memos you currently have.  With \002NEW\002, lists only\n"
+				"new (unread) memos. Unread memos are marked with a \"*\"\n"
+				"to the left of the memo number. You can also specify a list\n"
+				"of numbers, as in the example below:\n"
+				"   \002LIST 2-5,7-9\002\n"
+				"      Lists memos numbered 2 through 5 and 7 through 9."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "LIST", MEMO_LIST_SYNTAX);
+		SyntaxError(source, "LIST", _("LIST [\037channel\037] [\037list\037 | NEW]"));
 	}
 
 	void OnServCommand(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_LIST);
+		source.Reply(_("    LIST   List your memos"));
 	}
 };
 
diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp
index c381349bb..181b376f1 100644
--- a/modules/core/ms_read.cpp
+++ b/modules/core/ms_read.cpp
@@ -34,10 +34,10 @@ class MemoListCallback : public NumberList
 	{
 		Memo *m = mi->memos[index];
 		if (ci)
-			source.Reply(MEMO_CHAN_HEADER, index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), ci->name.c_str(), index + 1);
+			source.Reply(_("Memo %d from %s (%s).  To delete, type: \002%R%s DEL %s %d\002"), index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), ci->name.c_str(), index + 1);
 		else
-			source.Reply(MEMO_HEADER, index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), index + 1);
-		source.Reply(MEMO_TEXT, m->text.c_str());
+			source.Reply(_("Memo %d from %s (%s).  To delete, type: \002%R%s DEL %d\002"), index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), index + 1);
+		source.Reply("%s", m->text.c_str());
 		m->UnsetFlag(MF_UNREAD);
 
 		/* Check if a receipt notification was requested */
@@ -68,12 +68,12 @@ class CommandMSRead : public Command
 
 			if (!(ci = cs_findchan(chan)))
 			{
-				source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
+				source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
 			}
 			else if (!check_access(u, ci, CA_MEMO))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			mi = &ci->memos;
@@ -86,9 +86,9 @@ class CommandMSRead : public Command
 		else if (mi->memos.empty())
 		{
 			if (!chan.empty())
-				source.Reply(MEMO_X_HAS_NO_MEMOS, chan.c_str());
+				source.Reply(LanguageString::MEMO_X_HAS_NO_MEMOS, chan.c_str());
 			else
-				source.Reply(MEMO_HAVE_NO_MEMOS);
+				source.Reply(LanguageString::MEMO_HAVE_NO_MEMOS);
 		}
 		else
 		{
@@ -106,9 +106,9 @@ class CommandMSRead : public Command
 				if (!readcount)
 				{
 					if (!chan.empty())
-						source.Reply(MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str());
+						source.Reply(LanguageString::MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str());
 					else
-						source.Reply(MEMO_HAVE_NO_NEW_MEMOS);
+						source.Reply(LanguageString::MEMO_HAVE_NO_NEW_MEMOS);
 				}
 			}
 			else if (numstr.equals_ci("LAST"))
@@ -127,18 +127,27 @@ class CommandMSRead : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_READ);
+		source.Reply(_("Syntax: \002READ [\037channel\037] {\037num\037 | \037list\037 | LAST | NEW}\002\n"
+				" \n"
+				"Sends you the text of the memos specified. If LAST is\n"
+				"given, sends you the memo you most recently received. If\n"
+				"NEW is given, sends you all of your new memos.  Otherwise,\n"
+				"sends you memo number \037num\037. You can also give a list of\n"
+				"numbers, as in this example:\n"
+				" \n"
+				"   \002READ 2-5,7-9\002\n"
+				"      Displays memos numbered 2 through 5 and 7 through 9."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "READ", MEMO_READ_SYNTAX);
+		SyntaxError(source, "READ", _("READ [\037channel\037] {\037list\037 | LAST | NEW}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_READ);
+		source.Reply(_("    READ   Read a memo or memos"));
 	}
 };
 
diff --git a/modules/core/ms_rsend.cpp b/modules/core/ms_rsend.cpp
index 9f105a1ff..3fec2f8b7 100644
--- a/modules/core/ms_rsend.cpp
+++ b/modules/core/ms_rsend.cpp
@@ -31,7 +31,7 @@ class CommandMSRSend : public Command
 		/* prevent user from rsend to themselves */
 		if ((na = findnick(nick)) && na->nc == u->Account())
 		{
-			source.Reply(MEMO_NO_RSEND_SELF);
+			source.Reply(_("You can not request a receipt when sending a memo to yourself."));
 			return MOD_CONT;
 		}
 
@@ -41,7 +41,7 @@ class CommandMSRSend : public Command
 			if (u->Account()->IsServicesOper())
 				memo_send(source, nick, text, 3);
 			else
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 		}
 		else if (Config->MSMemoReceipt == 2)
 			/* Everybody can use rsend */
@@ -50,7 +50,7 @@ class CommandMSRSend : public Command
 		{
 			/* rsend has been disabled */
 			Log() << "MSMemoReceipt is set misconfigured to " << Config->MSMemoReceipt;
-			source.Reply(MEMO_RSEND_DISABLED);
+			source.Reply(_("Sorry, RSEND has been disabled on this network."));
 		}
 
 		return MOD_CONT;
@@ -58,18 +58,26 @@ class CommandMSRSend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_RSEND);
+		source.Reply(_("Syntax: \002RSEND {\037nick\037 | \037channel\037} \037memo-text\037\002\n"
+				" \n"
+				"Sends the named \037nick\037 or \037channel\037 a memo containing\n"
+				"\037memo-text\037. When sending to a nickname, the recipient will\n"
+				"receive a notice that he/she has a new memo. The target\n"
+				"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"
+				"has been read."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "RSEND", MEMO_RSEND_SYNTAX);
+		SyntaxError(source, "RSEND", _("RSEND {\037nick\037 | \037channel\037} \037memo-text\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_RSEND);
+		source.Reply(_("    RSEND  Sends a memo and requests a read receipt"));
 	}
 };
 
diff --git a/modules/core/ms_send.cpp b/modules/core/ms_send.cpp
index 467f62048..f368138e6 100644
--- a/modules/core/ms_send.cpp
+++ b/modules/core/ms_send.cpp
@@ -30,18 +30,23 @@ class CommandMSSend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_SEND);
+		source.Reply(_("Syntax: \002SEND {\037nick\037 | \037channel\037} \037memo-text\037\002\n"
+				" \n"
+				"Sends the named \037nick\037 or \037channel\037 a memo containing\n"
+				"\037memo-text\037. When sending to a nickname, the recipient will\n"
+				"receive a notice that he/she has a new memo. The target\n"
+				"nickname/channel must be registered."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SEND", MEMO_SEND_SYNTAX);
+		SyntaxError(source, "SEND", LanguageString::MEMO_SEND_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_SEND);
+		source.Reply(_("    SEND   Send a memo to a nick or channel"));
 	}
 };
 
diff --git a/modules/core/ms_sendall.cpp b/modules/core/ms_sendall.cpp
index 8c31d1013..1d2a703c3 100644
--- a/modules/core/ms_sendall.cpp
+++ b/modules/core/ms_sendall.cpp
@@ -27,7 +27,7 @@ class CommandMSSendAll : public Command
 
 		if (readonly)
 		{
-			source.Reply(MEMO_SEND_DISABLED);
+			source.Reply(LanguageString::MEMO_SEND_DISABLED);
 			return MOD_CONT;
 		}
 
@@ -41,24 +41,25 @@ class CommandMSSendAll : public Command
 				memo_send(source, nc->display, text, 1);
 		}
 
-		source.Reply(MEMO_MASS_SENT);
+		source.Reply(_("A massmemo has been sent to all registered users."));
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_SENDALL);
+		source.Reply(_("Syntax: \002SENDALL\002 \002memo-text\002\n \n"
+				"Sends all registered users a memo containing \037memo-text\037."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SENDALL", MEMO_SENDALL_SYNTAX);
+		SyntaxError(source, "SENDALL", _("SENDALL \037memo-text\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_SENDALL);
+		source.Reply(_("    SENDALL  Send a memo to all registered users"));
 	}
 };
 
diff --git a/modules/core/ms_set.cpp b/modules/core/ms_set.cpp
index e297adaf4..f5602b835 100644
--- a/modules/core/ms_set.cpp
+++ b/modules/core/ms_set.cpp
@@ -25,44 +25,44 @@ class CommandMSSet : public Command
 		{
 			u->Account()->SetFlag(NI_MEMO_SIGNON);
 			u->Account()->SetFlag(NI_MEMO_RECEIVE);
-			source.Reply(MEMO_SET_NOTIFY_ON, Config->s_MemoServ.c_str());
+			source.Reply(_("%s will now notify you of memos when you log on and when they are sent to you."), Config->s_MemoServ.c_str());
 		}
 		else if (param.equals_ci("LOGON"))
 		{
 			u->Account()->SetFlag(NI_MEMO_SIGNON);
 			u->Account()->UnsetFlag(NI_MEMO_RECEIVE);
-			source.Reply(MEMO_SET_NOTIFY_LOGON, Config->s_MemoServ.c_str());
+			source.Reply(_("%s will now notify you of memos when you log on or unset /AWAY."), Config->s_MemoServ.c_str());
 		}
 		else if (param.equals_ci("NEW"))
 		{
 			u->Account()->UnsetFlag(NI_MEMO_SIGNON);
 			u->Account()->SetFlag(NI_MEMO_RECEIVE);
-			source.Reply(MEMO_SET_NOTIFY_NEW, Config->s_MemoServ.c_str());
+			source.Reply(_("%s will now notify you of memos when they are sent to you."), Config->s_MemoServ.c_str());
 		}
 		else if (param.equals_ci("MAIL"))
 		{
 			if (!u->Account()->email.empty())
 			{
 				u->Account()->SetFlag(NI_MEMO_MAIL);
-				source.Reply(MEMO_SET_NOTIFY_MAIL);
+				source.Reply(_("You will now be informed about new memos via email."));
 			}
 			else
-				source.Reply(MEMO_SET_NOTIFY_INVALIDMAIL);
+				source.Reply(_("There's no email address set for your nick."));
 		}
 		else if (param.equals_ci("NOMAIL"))
 		{
 			u->Account()->UnsetFlag(NI_MEMO_MAIL);
-			source.Reply(MEMO_SET_NOTIFY_NOMAIL);
+			source.Reply(_("You will no longer be informed via email."));
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			u->Account()->UnsetFlag(NI_MEMO_SIGNON);
 			u->Account()->UnsetFlag(NI_MEMO_RECEIVE);
 			u->Account()->UnsetFlag(NI_MEMO_MAIL);
-			source.Reply(MEMO_SET_NOTIFY_OFF, Config->s_MemoServ.c_str());
+			source.Reply(_("%s will not send you any notification of memos."), Config->s_MemoServ.c_str());
 		}
 		else
-			SyntaxError(source, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX);
+			SyntaxError(source, "SET NOTIFY", _("SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"));
 
 		return MOD_CONT;
 	}
@@ -88,12 +88,12 @@ class CommandMSSet : public Command
 			p3 = params.size() > 4 ? params[4] : "";
 			if (!(ci = cs_findchan(chan)))
 			{
-				source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
+				source.Reply(LanguageString::CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
 			}
 			else if (!is_servadmin && !check_access(u, ci, CA_MEMO))
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			mi = &ci->memos;
@@ -105,7 +105,7 @@ class CommandMSSet : public Command
 				NickAlias *na;
 				if (!(na = findnick(p1)))
 				{
-					source.Reply(NICK_X_NOT_REGISTERED, p1.c_str());
+					source.Reply(LanguageString::NICK_X_NOT_REGISTERED, p1.c_str());
 					return MOD_CONT;
 				}
 				user = p1;
@@ -114,14 +114,9 @@ class CommandMSSet : public Command
 				p1 = p2;
 				p2 = p3;
 			}
-			else if (p1.empty())
+			else if (p1.empty() || (!isdigit(p1[0]) && !p1.equals_ci("NONE")) || (!p2.empty() && !p2.equals_ci("HARD")))
 			{
-				SyntaxError(source, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX);
-				return MOD_CONT;
-			}
-			if ((!isdigit(p1[0]) && !p1.equals_ci("NONE")) || (!p2.empty() && !p2.equals_ci("HARD")))
-			{
-				SyntaxError(source, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX);
+				SyntaxError(source, "SET LIMIT", _("SET LIMIT [\037user\037 | \037channel\037] {\037limit\037 | NONE} [HARD]"));
 				return MOD_CONT;
 			}
 			if (!chan.empty())
@@ -141,7 +136,7 @@ class CommandMSSet : public Command
 			limit = p1.is_pos_number_only() ? convertTo<int32>(p1) : -1;
 			if (limit < 0 || limit > 32767)
 			{
-				source.Reply(MEMO_SET_LIMIT_OVERFLOW, 32767);
+				source.Reply(_("Memo limit too large; limiting to %d instead."), 32767);
 				limit = 32767;
 			}
 			if (p1.equals_ci("NONE"))
@@ -151,17 +146,17 @@ class CommandMSSet : public Command
 		{
 			if (p1.empty() || !p2.empty() || !isdigit(p1[0]))
 			{
-				SyntaxError(source, "SET LIMIT", MEMO_SET_LIMIT_SYNTAX);
+				SyntaxError(source, "SET LIMIT", _("SET LIMIT [\037channel\037] \037limit\037"));
 				return MOD_CONT;
 			}
 			if (!chan.empty() && ci->HasFlag(CI_MEMO_HARDMAX))
 			{
-				source.Reply(MEMO_SET_LIMIT_FORBIDDEN, chan.c_str());
+				source.Reply(_("The memo limit for %s may not be changed."), chan.c_str());
 				return MOD_CONT;
 			}
 			else if (chan.empty() && nc->HasFlag(NI_MEMO_HARDMAX))
 			{
-				source.Reply(MEMO_SET_YOUR_LIMIT_FORBIDDEN);
+				source.Reply(_("You are not permitted to change your memo limit."));
 				return MOD_CONT;
 			}
 			limit = p1.is_pos_number_only() ? convertTo<int32>(p1) : -1;
@@ -170,14 +165,14 @@ class CommandMSSet : public Command
 			if (limit < 0 || (Config->MSMaxMemos > 0 && static_cast<unsigned>(limit) > Config->MSMaxMemos))
 			{
 				if (!chan.empty())
-					source.Reply(MEMO_SET_LIMIT_TOO_HIGH, chan.c_str(), Config->MSMaxMemos);
+					source.Reply(_("You cannot set the memo limit for %s higher than %d."), chan.c_str(), Config->MSMaxMemos);
 				else
-					source.Reply(MEMO_SET_YOUR_LIMIT_TOO_HIGH, Config->MSMaxMemos);
+					source.Reply(_("You cannot set your memo limit higher than %d."), Config->MSMaxMemos);
 				return MOD_CONT;
 			}
 			else if (limit > 32767)
 			{
-				source.Reply(MEMO_SET_LIMIT_OVERFLOW, 32767);
+				source.Reply(_("Memo limit too large; limiting to %d instead."), 32767);
 				limit = 32767;
 			}
 		}
@@ -185,23 +180,23 @@ class CommandMSSet : public Command
 		if (limit > 0)
 		{
 			if (chan.empty() && nc == u->Account())
-				source.Reply(MEMO_SET_YOUR_LIMIT, limit);
+				source.Reply(_("Your memo limit has been set to \002%d\002."), limit);
 			else
-				source.Reply(MEMO_SET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str(), limit);
+				source.Reply(_("Memo limit for %s set to \002%d\002."), !chan.empty() ? chan.c_str() : user.c_str(), limit);
 		}
 		else if (!limit)
 		{
 			if (chan.empty() && nc == u->Account())
-				source.Reply(MEMO_SET_YOUR_LIMIT_ZERO);
+				source.Reply(_("You will no longer be able to receive memos."));
 			else
-				source.Reply(MEMO_SET_LIMIT_ZERO, !chan.empty() ? chan.c_str() : user.c_str());
+				source.Reply(_("Memo limit for %s set to \0020\002."), !chan.empty() ? chan.c_str() : user.c_str());
 		}
 		else
 		{
 			if (chan.empty() && nc == u->Account())
-				source.Reply(MEMO_UNSET_YOUR_LIMIT);
+				source.Reply(_("Your memo limit has been disabled."));
 			else
-				source.Reply(MEMO_UNSET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str());
+				source.Reply(_("Memo limit \002disabled\002 for %s."), !chan.empty() ? chan.c_str() : user.c_str());
 		}
 		return MOD_CONT;
 	}
@@ -217,15 +212,15 @@ class CommandMSSet : public Command
 		MemoInfo *mi = &u->Account()->memos;
 
 		if (readonly)
-			source.Reply(MEMO_SET_DISABLED);
+			source.Reply(_("Sorry, memo option setting is temporarily disabled."));
 		else if (cmd.equals_ci("NOTIFY"))
 			return this->DoNotify(source, params, mi);
 		else if (cmd.equals_ci("LIMIT"))
 			return this->DoLimit(source, params, mi);
 		else
 		{
-			source.Reply(NICK_SET_UNKNOWN_OPTION, cmd.c_str());
-			source.Reply(MORE_INFO, Config->s_MemoServ.c_str(), "SET");
+			source.Reply(LanguageString::NICK_SET_UNKNOWN_OPTION, cmd.c_str());
+			source.Reply(LanguageString::MORE_INFO, Config->s_MemoServ.c_str(), "SET");
 		}
 
 		return MOD_CONT;
@@ -234,16 +229,62 @@ class CommandMSSet : public Command
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
 		if (subcommand.empty())
-			source.Reply(MEMO_HELP_SET);
+			source.Reply(_("Syntax: \002SET \037option\037 \037parameters\037\002\n \n"
+					"Sets various memo options.  \037option\037 can be one of:\n"
+					" \n"
+					"    NOTIFY      Changes when you will be notified about\n"
+					"                   new memos (only for nicknames)\n"
+					"    LIMIT       Sets the maximum number of memos you can\n"
+					"                   receive\n"
+					" \n"
+					"Type \002%R%S HELP SET \037option\037\002 for more information\n"
+					"on a specific option."));
 		else if (subcommand.equals_ci("NOTIFY"))
-			source.Reply(MEMO_HELP_SET_NOTIFY);
+			source.Reply(_("Syntax: \002SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\002\n"
+					"Changes when you will be notified about new memos:\n"
+					" \n"
+					"    ON      You will be notified of memos when you log on,\n"
+					"               when you unset /AWAY, and when they are sent\n"
+					"               to you.\n"
+					"    LOGON   You will only be notified of memos when you log\n"
+					"               on or when you unset /AWAY.\n"
+					"    NEW     You will only be notified of memos when they\n"
+					"               are sent to you.\n"
+					"    MAIL    You will be notified of memos by email aswell as\n"
+					"               any other settings you have.\n"
+					"    NOMAIL  You will not be notified of memos by email.\n"
+					"    OFF     You will not receive any notification of memos.\n"
+					" \n"
+					"\002ON\002 is essentially \002LOGON\002 and \002NEW\002 combined."));
 		else if (subcommand.equals_ci("LIMIT"))
 		{
 			User *u = source.u;
 			if (u->Account() && u->Account()->IsServicesOper())
-				source.Reply(MEMO_SERVADMIN_HELP_SET_LIMIT, Config->MSMaxMemos);
+				source.Reply(_("Syntax: \002SET LIMIT [\037user\037 | \037channel\037] {\037limit\037 | NONE} [HARD]\002\n"
+						" \n"
+						"Sets the maximum number of memos a user or channel is\n"
+						"allowed to have.  Setting the limit to 0 prevents the user\n"
+						"from receiving any memos; setting it to \002NONE\002 allows the\n"
+						"user to receive and keep as many memos as they want.  If\n"
+						"you do not give a nickname or channel, your own limit is\n"
+						"set.\n"
+						" \n"
+						"Adding \002HARD\002 prevents the user from changing the limit.  Not\n"
+						"adding \002HARD\002 has the opposite effect, allowing the user to\n"
+						"change the limit (even if a previous limit was set with\n"
+						"\002HARD\002).\n"
+						"This use of the \002SET LIMIT\002 command is limited to \002Services\002\n"
+						"\002admins\002.  Other users may only enter a limit for themselves\n"
+						"or a channel on which they have such privileges, may not\n"
+						"remove their limit, may not set a limit above %d, and may\n"
+						"not set a hard limit."), Config->MSMaxMemos);
 			else
-				source.Reply(MEMO_HELP_SET_LIMIT, Config->MSMaxMemos);
+				source.Reply(_("Syntax: \002SET LIMIT [\037channel\037] \037limit\037\002\n"
+									" \n"
+									"Sets the maximum number of memos you (or the given channel)\n"
+									"are allowed to have. If you set this to 0, no one will be\n"
+									"able to send any memos to you.  However, you cannot set\n"
+									"this any higher than %d."), Config->MSMaxMemos);
 		}
 		else
 			return false;
@@ -253,12 +294,12 @@ class CommandMSSet : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SET", NICK_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_SET);
+		source.Reply(_("    SET    Set options related to memos"));
 	}
 };
 
diff --git a/modules/core/ms_staff.cpp b/modules/core/ms_staff.cpp
index 414694292..a1c232870 100644
--- a/modules/core/ms_staff.cpp
+++ b/modules/core/ms_staff.cpp
@@ -26,7 +26,7 @@ class CommandMSStaff : public Command
 
 		if (readonly)
 		{
-			source.Reply(MEMO_SEND_DISABLED);
+			source.Reply(LanguageString::MEMO_SEND_DISABLED);
 			return MOD_CONT;
 		}
 
@@ -43,18 +43,21 @@ class CommandMSStaff : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(MEMO_HELP_STAFF);
+		source.Reply(_("Syntax: \002STAFF\002 \002memo-text\002\n"
+			" \n"
+			"Sends all services staff a memo containing \037memo-text\037."));
+
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "STAFF", MEMO_STAFF_SYNTAX);
+		SyntaxError(source, "STAFF", _("STAFF \037memo-text\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(MEMO_HELP_CMD_STAFF);
+		source.Reply(_("    STAFF  Send a memo to all opers/admins"));
 	}
 };
 
diff --git a/modules/core/ns_access.cpp b/modules/core/ns_access.cpp
index 1d7ed4491..e7c0c3f90 100644
--- a/modules/core/ns_access.cpp
+++ b/modules/core/ns_access.cpp
@@ -23,17 +23,17 @@ class CommandNSAccess : public Command
 
 		if (nc->access.empty())
 		{
-			source.Reply(NICK_ACCESS_LIST_X_EMPTY, nc->display.c_str());
+			source.Reply(_("Access list for \002%s\002 is empty."), nc->display.c_str());
 			return MOD_CONT;
 		}
 
 		if (nc->HasFlag(NI_SUSPENDED))
 		{
-			source.Reply(NICK_X_SUSPENDED, nc->display.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, nc->display.c_str());
 			return MOD_CONT;
 		}
 
-		source.Reply(NICK_ACCESS_LIST_X, params[1].c_str());
+		source.Reply(_("Access list for \002%s\002:"), params[1].c_str());
 		for (i = 0, end = nc->access.size(); i < end; ++i)
 		{
 			Anope::string access = nc->GetAccess(i);
@@ -56,18 +56,18 @@ class CommandNSAccess : public Command
 
 		if (nc->access.size() >= Config->NSAccessMax)
 		{
-			source.Reply(NICK_ACCESS_REACHED_LIMIT, Config->NSAccessMax);
+			source.Reply(_("Sorry, you can only have %d access entries for a nickname."), Config->NSAccessMax);
 			return MOD_CONT;
 		}
 
 		if (nc->FindAccess(mask))
 		{
-			source.Reply(NICK_ACCESS_ALREADY_PRESENT, mask.c_str());
+			source.Reply(_("Mask \002%s\002 already present on your access list."), mask.c_str());
 			return MOD_CONT;
 		}
 
 		nc->AddAccess(mask);
-		source.Reply(NICK_ACCESS_ADDED, mask.c_str());
+		source.Reply(_("\002%s\002 added to your access list."), mask.c_str());
 
 		return MOD_CONT;
 	}
@@ -82,11 +82,11 @@ class CommandNSAccess : public Command
 
 		if (!nc->FindAccess(mask))
 		{
-			source.Reply(NICK_ACCESS_NOT_FOUND, mask.c_str());
+			source.Reply(_("\002%s\002 not found on your access list."), mask.c_str());
 			return MOD_CONT;
 		}
 
-		source.Reply(NICK_ACCESS_DELETED, mask.c_str());
+		source.Reply(_("\002%s\002 deleted from your access list."), mask.c_str());
 		nc->EraseAccess(mask);
 
 		return MOD_CONT;
@@ -99,11 +99,11 @@ class CommandNSAccess : public Command
 
 		if (nc->access.empty())
 		{
-			source.Reply(NICK_ACCESS_LIST_EMPTY, u->nick.c_str());
+			source.Reply(_("Your access list is empty."), u->nick.c_str());
 			return MOD_CONT;
 		}
 
-		source.Reply(NICK_ACCESS_LIST);
+		source.Reply(_("Access list:"));
 		for (i = 0, end = nc->access.size(); i < end; ++i)
 		{
 			Anope::string access = nc->GetAccess(i);
@@ -131,11 +131,11 @@ class CommandNSAccess : public Command
 
 		if (!mask.empty() && mask.find('@') == Anope::string::npos)
 		{
-			source.Reply(BAD_USERHOST_MASK);
-			source.Reply(MORE_INFO, Config->s_NickServ.c_str(), "ACCESS");
+			source.Reply(LanguageString::BAD_USERHOST_MASK);
+			source.Reply(LanguageString::MORE_INFO, Config->s_NickServ.c_str(), "ACCESS");
 		}
 		else if (u->Account()->HasFlag(NI_SUSPENDED))
-			source.Reply(NICK_X_SUSPENDED, u->Account()->display.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, u->Account()->display.c_str());
 		else if (cmd.equals_ci("ADD"))
 			return this->DoAdd(source, u->Account(), mask);
 		else if (cmd.equals_ci("DEL"))
@@ -150,18 +150,39 @@ class CommandNSAccess : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_ACCESS);
+		source.Reply(_("Syntax: \002ACCESS ADD \037mask\037\002\n"
+				"        \002ACCESS DEL \037mask\037\002\n"
+					"        \002ACCESS LIST\002\n"
+					" \n"
+					"Modifies or displays the access list for your nick.  This\n"
+					"is the list of addresses which will be automatically\n"
+					"recognized by %S as allowed to use the nick.  If\n"
+					"you want to use the nick from a different address, you\n"
+					"need to send an \002IDENTIFY\002 command to make %S\n"
+					"recognize you.\n"
+					" \n"
+					"Examples:\n"
+					" \n"
+					"    \002ACCESS ADD anyone@*.bepeg.com\002\n"
+					"        Allows access to user \002anyone\002 from any machine in\n"
+					"        the \002bepeg.com\002 domain.\n"
+					" \n"
+					"    \002ACCESS DEL anyone@*.bepeg.com\002\n"
+					"        Reverses the previous command.\n"
+					" \n"
+					"    \002ACCESS LIST\002\n"
+					"        Displays the current access list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "ACCESS", NICK_ACCESS_SYNTAX);
+		SyntaxError(source, "ACCESS", _("ACCESS {ADD | DEL | LIST} [\037mask\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_ACCESS);
+		source.Reply(_("    ACCESS     Modify the list of authorized addresses"));
 	}
 };
 
diff --git a/modules/core/ns_ajoin.cpp b/modules/core/ns_ajoin.cpp
index 29ddfab46..db1d0f960 100644
--- a/modules/core/ns_ajoin.cpp
+++ b/modules/core/ns_ajoin.cpp
@@ -21,10 +21,11 @@ class CommandNSAJoin : public Command
 		source.u->Account()->GetExtRegular("ns_ajoin_channels", channels);
 
 		if (channels.empty())
-			source.Reply(NICK_AJOIN_LIST_EMPTY);
+			source.Reply(_("Your auto join list is empty."));
 		else
 		{
-			source.Reply(NICK_AJOIN_LIST_HEAD);
+			source.Reply(_("Your auto join list:\n"
+					"  Num   Channel      Key"));
 			for (unsigned i = 0; i < channels.size(); ++i)
 				source.Reply(" %3d    %-12s %s", i + 1, channels[i].first.c_str(), channels[i].second.c_str());
 		}
@@ -36,13 +37,13 @@ class CommandNSAJoin : public Command
 		source.u->Account()->GetExtRegular("ns_ajoin_channels", channels);
 
 		if (channels.size() >= Config->AJoinMax)
-			source.Reply(NICK_AJOIN_LIST_FULL);
+			source.Reply(_("Your auto join list is full."));
 		else if (ircdproto->IsChannelValid(params[1]) == false)
- 			source.Reply(CHAN_X_INVALID, params[1].c_str());
+ 			source.Reply(LanguageString::CHAN_X_INVALID, params[1].c_str());
 		else
 		{
 			channels.push_back(std::make_pair(params[1], params.size() > 2 ? params[2] : ""));
-			source.Reply(NICK_AJOIN_ADDED, params[1].c_str());
+			source.Reply(_("Added %s to your auto join list."), params[1].c_str());
 			source.u->Account()->Extend("ns_ajoin_channels", new ExtensibleItemRegular<std::vector<
 				std::pair<Anope::string, Anope::string> > >(channels));
 		}
@@ -59,13 +60,13 @@ class CommandNSAJoin : public Command
 				break;
 		
 		if (i == channels.size())
-			source.Reply(NICK_AJOIN_NOTFOUND, params[1].c_str());
+			source.Reply(_("%s was not found on your auto join list."), params[1].c_str());
 		else
 		{
 			channels.erase(channels.begin() + i);
 			source.u->Account()->Extend("ns_ajoin_channels", new ExtensibleItemRegular<std::vector<
 				std::pair<Anope::string, Anope::string> > >(channels));
-			source.Reply(NICK_AJOIN_DELETED, params[1].c_str());
+			source.Reply(_("%s was removed from your auto join list."), params[1].c_str());
 		}
 	}
 
@@ -92,18 +93,21 @@ class CommandNSAJoin : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_AJOIN);
+		source.Reply(_("Syntax: \002AJOIN {ADD | DEL | LIST} [\037channel\037] [\037key\037]\002\n"
+				" \n"
+				"This command manages your auto join list. When you identify\n"
+				"you will automatically join the channels on your auto join list"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "AJOIN", NICK_AJOIN_SYNTAX);
+		SyntaxError(source, "AJOIN", _("AJOIN {ADD | DEL | LIST} [\037channel\037] [\037key\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_AJOIN);
+		source.Reply(_("    AJOIN      Manage your auto join list"));
 	}
 };
 
diff --git a/modules/core/ns_alist.cpp b/modules/core/ns_alist.cpp
index 4521099d0..1777dacb1 100644
--- a/modules/core/ns_alist.cpp
+++ b/modules/core/ns_alist.cpp
@@ -77,17 +77,22 @@ class CommandNSAList : public Command
 		}
 
 		if (!na)
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (min_level <= ACCESS_INVALID || min_level > ACCESS_FOUNDER)
-			source.Reply(CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
+			source.Reply(LanguageString::CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
 		else
 		{
 			int chan_count = 0;
 			int match_count = 0;
 
-			source.Reply(is_servadmin ? NICK_ALIST_HEADER_X : NICK_ALIST_HEADER, na->nick.c_str());
+			if (is_servadmin)
+				source.Reply(_("Channels that \002%s\002 has access on:\n"
+					"  Num  Channel              Level    Description"), na->nick.c_str());
+			else
+				source.Reply(_("Channels that you have access on:\n"
+						"  Num  Channel              Level    Description"));
 
 			for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it)
 			{
@@ -107,14 +112,14 @@ class CommandNSAList : public Command
 					{
 						Anope::string xop = get_xop_level(access->level);
 
-						source.Reply(NICK_ALIST_XOP_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), xop.c_str(), !ci->desc.empty() ? ci->desc.c_str() : "");
+						source.Reply(_("  %3d %c%-20s %-8s %s"), match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), xop.c_str(), !ci->desc.empty() ? ci->desc.c_str() : "");
 					}
 					else
-						source.Reply(NICK_ALIST_ACCESS_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), access->level, !ci->desc.empty() ? ci->desc.c_str() : "");
+						source.Reply(_("  %3d %c%-20s %-8d %s"), match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), access->level, !ci->desc.empty() ? ci->desc.c_str() : "");
 				}
 			}
 
-			source.Reply(NICK_ALIST_FOOTER, match_count, chan_count);
+			source.Reply(_("End of list - %d/%d channels shown."), match_count, chan_count);
 		}
 		return MOD_CONT;
 	}
@@ -123,16 +128,38 @@ class CommandNSAList : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(NICK_SERVADMIN_HELP_ALIST);
+			source.Reply(_("Syntax: \002ALIST [\037nickname\037] [\037level\037]\002\n"
+					" \n"
+					"With no parameters, lists channels you have access on. With\n"
+					"one parameter, lists channels that \002nickname\002 has access \n"
+					"on. With two parameters lists channels that \002nickname\002 has \n"
+					"\002level\002 access or greater on.\n"
+					"This use limited to \002Services Operators\002."));
 		else
-			source.Reply(NICK_HELP_ALIST);
+			source.Reply(_("Syntax: \002ALIST [\037level\037]\002\n"
+					" \n"
+					"Lists all channels you have access on. Optionally, you can specify\n"
+					"a level in XOP or ACCESS format. The resulting list will only\n"
+					"include channels where you have the given level of access.\n"
+					"Examples:\n"
+					"    \002ALIST Founder\002\n"
+					"        Lists all channels where you have Founder\n"
+					"        access.\n"
+					"    \002ALIST AOP\002\n"
+					"        Lists all channels where you have AOP\n"
+					"        access or greater.\n"
+					"    \002ALIST 10\002\n"
+					"        Lists all channels where you have level 10\n"
+					"        access or greater.\n"
+					"Channels that have the \037NOEXPIRE\037 option set will be\n"
+					"prefixed by an exclamation mark."));
 
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_ALIST);
+		source.Reply(_("    ALIST      List channels you have access on"));
 	}
 };
 
diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp
index 899d52b7d..30ec2730a 100644
--- a/modules/core/ns_drop.cpp
+++ b/modules/core/ns_drop.cpp
@@ -28,7 +28,7 @@ class CommandNSDrop : public Command
 
 		if (readonly)
 		{
-			source.Reply(NICK_DROP_DISABLED);
+			source.Reply(_("Sorry, nickname de-registration is temporarily disabled."));
 			return MOD_CONT;
 		}
 
@@ -43,7 +43,7 @@ class CommandNSDrop : public Command
 
 				Log(LOG_ADMIN, u, this) << "to drop nickname " << nr->nick << " (email: " << nr->email << ")";
 				delete nr;
-				source.Reply(NICK_X_DROPPED, nick.c_str());
+				source.Reply(_("Nickname \002%s\002 has been dropped."), nick.c_str());
 			}
 			else if (nr && !nick.empty())
 			{
@@ -51,23 +51,23 @@ class CommandNSDrop : public Command
 				if (res)
 				{
 					Log(LOG_COMMAND, u, this) << "to drop nick request " << nr->nick;
-					source.Reply(NICK_X_DROPPED, nr->nick.c_str());
+					source.Reply(_("Nickname \002%s\002 has been dropped."), nr->nick.c_str());
 					delete nr;
 				}
 				else if (bad_password(u))
 					return MOD_STOP;
 				else
-					source.Reply(PASSWORD_INCORRECT);
+					source.Reply(LanguageString::PASSWORD_INCORRECT);
 			}
 			else
-				source.Reply(NICK_NOT_REGISTERED);
+				source.Reply(LanguageString::NICK_NOT_REGISTERED);
 
 			return MOD_CONT;
 		}
 
 		if (!u->Account())
 		{
-			source.Reply(NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
+			source.Reply(LanguageString::NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
 			return MOD_CONT;
 		}
 
@@ -77,13 +77,13 @@ class CommandNSDrop : public Command
 			my_nick = na->nick;
 
 		if (!is_mine && !u->Account()->HasPriv("nickserv/drop"))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (Config->NSSecureAdmins && !is_mine && na->nc->IsServicesOper())
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else
 		{
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 
 			if (ircd->sqline && na->HasFlag(NS_FORBIDDEN))
 			{
@@ -100,14 +100,14 @@ class CommandNSDrop : public Command
 			{
 				if (Config->WallDrop)
 					ircdproto->SendGlobops(NickServ, "\2%s\2 used DROP on \2%s\2", u->nick.c_str(), nick.c_str());
-				source.Reply(NICK_X_DROPPED, nick.c_str());
+				source.Reply(_("Nickname \002%s\002 has been dropped."), nick.c_str());
 			}
 			else
 			{
 				if (!nick.empty())
-					source.Reply(NICK_X_DROPPED, nick.c_str());
+					source.Reply(_("Nickname \002%s\002 has been dropped."), nick.c_str());
 				else
-					source.Reply(NICK_DROPPED);
+					source.Reply(_("Your nickname has been dropped."));
 			}
 		}
 
@@ -118,16 +118,38 @@ class CommandNSDrop : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->HasPriv("nickserv/drop"))
-			source.Reply(NICK_SERVADMIN_HELP_DROP);
+			source.Reply(_("Syntax: \002DROP [\037nickname\037]\002\n"
+					" \n"
+					"Without a parameter, drops your nickname from the\n"
+					"%S database.\n"
+					" \n"
+					"With a parameter, drops the named nick from the database.\n"
+					"You may drop any nick within your group without any \n"
+					"special privileges. Dropping any nick is limited to \n"
+					"\002Services Operators\002."));
 		else
-			source.Reply(NICK_HELP_DROP);
+			source.Reply(_("Syntax: \002DROP [\037nickname\037 | \037password\037]\002\n"
+					" \n"
+					"Drops your nickname from the %S database.  A nick\n"
+					"that has been dropped is free for anyone to re-register.\n"
+					" \n"
+					"You may drop a nick within your group by passing it\n"
+					"as the \002nick\002 parameter.\n"
+					" \n"
+					"If you have a nickname registration pending but can not confirm\n"
+					"it for any reason, you can cancel your registration by passing\n"
+					"your password as the \002password\002 parameter.\n"
+					" \n"
+					"In order to use this command, you must first identify\n"
+					"with your password (\002%R%S HELP IDENTIFY\002 for more\n"
+					"information)."));
 
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_DROP);
+		source.Reply(_("    DROP       Cancel the registration of a nickname"));
 	}
 };
 
diff --git a/modules/core/ns_forbid.cpp b/modules/core/ns_forbid.cpp
index 2095cfb76..d88b9a9e9 100644
--- a/modules/core/ns_forbid.cpp
+++ b/modules/core/ns_forbid.cpp
@@ -34,10 +34,10 @@ class CommandNSForbid : public Command
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 		if (!ircdproto->IsNickValid(nick))
 		{
-			source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -46,7 +46,7 @@ class CommandNSForbid : public Command
 		{
 			if (Config->NSSecureAdmins && na->nc->IsServicesOper())
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				return MOD_CONT;
 			}
 			delete na;
@@ -63,7 +63,7 @@ class CommandNSForbid : public Command
 
 		if (curr)
 		{
-			curr->SendMessage(NickServ, FORCENICKCHANGE_NOW);
+			curr->SendMessage(NickServ, LanguageString::FORCENICKCHANGE_NOW);
 			curr->Collide(na);
 		}
 
@@ -77,7 +77,7 @@ class CommandNSForbid : public Command
 			ircdproto->SendGlobops(NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick.c_str(), nick.c_str());
 
 		Log(LOG_ADMIN, u, this) << "to forbid nick " << nick;
-		source.Reply(NICK_FORBID_SUCCEEDED, nick.c_str());
+		source.Reply(_("Nick \002%s\002 is now forbidden."), nick.c_str());
 
 		FOREACH_MOD(I_OnNickForbidden, OnNickForbidden(na));
 
@@ -86,18 +86,23 @@ class CommandNSForbid : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_SERVADMIN_HELP_FORBID);
+		source.Reply(_("Syntax: \002FORBID \037nickname\037 [\037reason\037]\002\n"
+				" \n"
+				"Disallows a nickname from being registered or used by\n"
+				"anyone.  May be cancelled by dropping the nick.\n"
+				" \n"
+				"On certain networks, reason is required."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "FORBID", Config->ForceForbidReason ? NICK_FORBID_SYNTAX_REASON : NICK_FORBID_SYNTAX);
+		SyntaxError(source, "FORBID", Config->ForceForbidReason ? _("FORBID \037nickname\037 \037reason\037") : _("FORBID \037nickname\037 [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_FORBID);
+		source.Reply(_("    FORBID     Prevents a nickname from being registered"));
 	}
 };
 
diff --git a/modules/core/ns_getemail.cpp b/modules/core/ns_getemail.cpp
index 7c3518849..91a5bb2b1 100644
--- a/modules/core/ns_getemail.cpp
+++ b/modules/core/ns_getemail.cpp
@@ -39,13 +39,13 @@ class CommandNSGetEMail : public Command
 			if (!nc->email.empty() && nc->email.equals_ci(email))
 			{
 				++j;
-				source.Reply(NICK_GETEMAIL_EMAILS_ARE, nc->display.c_str(), email.c_str());
+				source.Reply(_("Emails Match \002%s\002 to \002%s\002."), nc->display.c_str(), email.c_str());
 			}
 		}
 
 		if (j <= 0)
 		{
-			source.Reply(NICK_GETEMAIL_NOT_USED, email.c_str());
+			source.Reply(_("No Emails listed for \002%s\002."), email.c_str());
 			return MOD_CONT;
 		}
 
@@ -54,18 +54,22 @@ class CommandNSGetEMail : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_SERVADMIN_HELP_GETEMAIL);
+		source.Reply(_("Syntax: \002GETEMAIL \037user@emailhost\037\002\n"
+				"Returns the matching nicks that used given email. \002Note\002 that\n"
+				"you can not use wildcards for either user or emailhost. Whenever\n"
+				"this command is used, a message including the person who issued\n"
+				"the command and the email it was used on will be logged."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "GETMAIL", NICK_GETEMAIL_SYNTAX);
+		SyntaxError(source, "GETMAIL", _("GETEMAIL \002user@email-host\002 No WildCards!!"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_GETEMAIL);
+		source.Reply(_("    GETEMAIL   Matches and returns all users that registered using given email"));
 	}
 };
 
diff --git a/modules/core/ns_getpass.cpp b/modules/core/ns_getpass.cpp
index fc35e8270..7c6c14785 100644
--- a/modules/core/ns_getpass.cpp
+++ b/modules/core/ns_getpass.cpp
@@ -35,15 +35,15 @@ class CommandNSGetPass : public Command
 				Log(LOG_ADMIN, u, this) << "for " << nr->nick;
 				if (Config->WallGetpass)
 					ircdproto->SendGlobops(NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick.c_str(), nick.c_str());
-				source.Reply(NICK_GETPASS_PASSCODE_IS, nick.c_str(), nr->passcode.c_str());
+				source.Reply(_("Passcode for %s is \002%s\002."), nick.c_str(), nr->passcode.c_str());
 			}
 			else
-				source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+				source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		}
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (Config->NSSecureAdmins && na->nc->IsServicesOper())
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else
 		{
 			if (enc_decrypt(na->nc->pass, tmp_pass) == 1)
@@ -51,28 +51,33 @@ class CommandNSGetPass : public Command
 				Log(LOG_ADMIN, u, this) << "for " << nick;
 				if (Config->WallGetpass)
 					ircdproto->SendGlobops(NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick.c_str(), nick.c_str());
-				source.Reply(NICK_GETPASS_PASSWORD_IS, nick.c_str(), tmp_pass.c_str());
+				source.Reply(_("Password for %s is \002%s\002."), nick.c_str(), tmp_pass.c_str());
 			}
 			else
-				source.Reply(NICK_GETPASS_UNAVAILABLE);
+				source.Reply(_("GETPASS command unavailable because encryption is in use."));
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_SERVADMIN_HELP_GETPASS);
+		source.Reply(_("Syntax: \002GETPASS \037nickname\037\002\n"
+				" \n"
+				"Returns the password for the given nickname.  \002Note\002 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."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "GETPASS", NICK_GETPASS_SYNTAX);
+		SyntaxError(source, "GETPASS", _("GETPASS \037nickname\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_GETPASS);
+		source.Reply(_("    GETPASS    Retrieve the password for a nickname"));
 	}
 };
 
diff --git a/modules/core/ns_ghost.cpp b/modules/core/ns_ghost.cpp
index f6ed15bf3..9bffa5b3c 100644
--- a/modules/core/ns_ghost.cpp
+++ b/modules/core/ns_ghost.cpp
@@ -31,31 +31,31 @@ class CommandNSGhost : public Command
 		NickAlias *na = findnick(nick);
 
 		if (!user)
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else if (!na)
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (na->nc->HasFlag(NI_SUSPENDED))
-			source.Reply(NICK_X_SUSPENDED, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, na->nick.c_str());
 		else if (nick.equals_ci(u->nick))
-			source.Reply(NICK_NO_GHOST_SELF);
+			source.Reply(_("You can't ghost yourself!"));
 		else if ((u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc))) ||
 				(!pass.empty() && enc_check_password(pass, na->nc->pass) == 1))
 		{
 			if (!user->IsIdentified() && FindCommand(NickServ, "RECOVER"))
-				source.Reply(NICK_GHOST_UNIDENTIFIED);
+				source.Reply(_("You may not ghost an unidentified user, use RECOVER instead."));
 			else
 			{
 				Log(LOG_COMMAND, u, this) << "for " << nick;
 				Anope::string buf = "GHOST command used by " + u->nick;
 				kill_user(Config->s_NickServ, user, buf);
-				source.Reply(NICK_GHOST_KILLED, nick.c_str());
+				source.Reply(_("Ghost with your nick has been killed."), nick.c_str());
 			}
 		}
 		else
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			if (!pass.empty())
 			{
 				Log(LOG_COMMAND, u, this) << "with an invalid password for " << nick;
@@ -69,18 +69,31 @@ class CommandNSGhost : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_GHOST);
+		source.Reply(_("Syntax: \002GHOST \037nickname\037 [\037password\037]\002\n"
+				""
+				"itermminates a \"ghost\" IRC session using your nick.  A\n"
+				"ghost\" session is one which is not actually connected,\n"
+				"but which the IRC server believes is still online for one\n"
+				"reason or another. Typically, this happens if your\n"
+				"computer crashes or your Internet or modem connection\n"
+				"goes down while you're on IRC.\n"
+				" \n"
+				"In order to use the \002GHOST\002 command for a nick, your\n"
+				"current address as shown in /WHOIS must be on that nick's\n"
+				"access list, you must be identified and in the group of\n"
+				"that nick, or you must supply the correct password for\n"
+				"the nickname."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "GHOST", NICK_GHOST_SYNTAX);
+		SyntaxError(source, "GHOST", _("GHOST \037nickname\037 [\037password\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_GHOST);
+		source.Reply(_("    GHOST      Disconnects a \"ghost\" IRC session using your nick"));
 	}
 };
 
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp
index 4180620d8..8fbcfb2fe 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/core/ns_group.cpp
@@ -30,19 +30,19 @@ class CommandNSGroup : public Command
 
 		if (Config->NSEmailReg && findrequestnick(u->nick))
 		{
-			source.Reply(NICK_REQUESTED);
+			source.Reply(LanguageString::NICK_REQUESTED);
 			return MOD_CONT;
 		}
 
 		if (readonly)
 		{
-			source.Reply(NICK_GROUP_DISABLED);
+			source.Reply(_("Sorry, nickname grouping is temporarily disabled."));
 			return MOD_CONT;
 		}
 
 		if (!ircdproto->IsNickValid(u->nick))
 		{
-			source.Reply(NICK_X_FORBIDDEN, u->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, u->nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -50,42 +50,44 @@ class CommandNSGroup : public Command
 			for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it)
 				if (!u->HasMode(UMODE_OPER) && u->nick.find_ci(it->first) != Anope::string::npos)
 				{
-					source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
+					source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
 					return MOD_CONT;
 				}
 
 		NickAlias *target, *na = findnick(u->nick);
 		if (!(target = findnick(nick)))
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
-			source.Reply(NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime);
+			source.Reply(_("Please wait %d seconds before using the GROUP command again."), (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime);
 		else if (u->Account() && u->Account()->HasFlag(NI_SUSPENDED))
 		{
 			Log(NickServ) << NickServ << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick;
-			source.Reply(NICK_X_SUSPENDED, u->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, u->nick.c_str());
 		}
 		else if (target && target->nc->HasFlag(NI_SUSPENDED))
 		{
 			Log(LOG_COMMAND, u, this) << "tried to use GROUP for SUSPENDED nick " << target->nick;
-			source.Reply(NICK_X_SUSPENDED, target->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, target->nick.c_str());
 		}
 		else if (target->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 		else if (na && target->nc == na->nc)
-			source.Reply(NICK_GROUP_SAME, target->nick.c_str());
+			source.Reply(_("You are already a member of the group of \002%s\002."), target->nick.c_str());
 		else if (na && na->nc != u->Account())
-			source.Reply(NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
+			source.Reply(LanguageString::NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
 		else if (na && Config->NSNoGroupChange)
-			source.Reply(NICK_GROUP_CHANGE_DISABLED, Config->s_NickServ.c_str());
+			source.Reply(_("Your nick is already registered; type \002%R%s DROP\002 first."), Config->s_NickServ.c_str());
 		else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
-			source.Reply(NICK_GROUP_TOO_MANY, target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
+			source.Reply(_("There are too many nicks in %s's group; list them and drop some.\n"
+					"Type \002%R%s HELP GLIST\002 and \002%R%s HELP DROP\002\n"
+					"for more information."), target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
 		else
 		{
 			int res = enc_check_password(pass, target->nc->pass);
 			if (res == -1)
 			{
 				Log(LOG_COMMAND, u, this) << "failed group for " << na->nick << " (invalid password)";
-				source.Reply(PASSWORD_INCORRECT);
+				source.Reply(LanguageString::PASSWORD_INCORRECT);
 				if (bad_password(u))
 					return MOD_STOP;
 			}
@@ -103,7 +105,7 @@ class CommandNSGroup : public Command
 
 					if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && !u->nick.substr(prefixlen).find_first_not_of("1234567890"))
 					{
-						source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
+						source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
 						return MOD_CONT;
 					}
 				}
@@ -121,7 +123,7 @@ class CommandNSGroup : public Command
 				u->SetMode(NickServ, UMODE_REGISTERED);
 
 				Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")";
-				source.Reply(NICK_GROUP_JOINED, target->nick.c_str());
+				source.Reply(_("You are now in the group of \002%s\002."), target->nick.c_str());
 
 				u->lastnickreg = Anope::CurTime;
 
@@ -133,18 +135,47 @@ class CommandNSGroup : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_GROUP);
+		source.Reply(_("Syntax: \002GROUP \037target\037 \037password\037\002\n"
+				" \n"
+				"This command makes your nickname join the \037target\037 nickname's \n"
+				"group. \037password\037 is the password of the target nickname.\n"
+				" \n"
+				"Joining a group will allow you to share your configuration,\n"
+				"memos, and channel privileges with all the nicknames in the\n"
+				"group, and much more!\n"
+				" \n"
+				"A group exists as long as it is useful. This means that even\n"
+				"if a nick of the group is dropped, you won't lose the\n"
+				"shared things described above, as long as there is at\n"
+				"least one nick remaining in the group.\n"
+				" \n"
+				"You can use this command even if you have not registered\n"
+				"your nick yet. If your nick is already registered, you'll\n"
+				"need to identify yourself before using this command. Type\n"
+				"\037%R%S HELP IDENTIFY\037 for more information. This\n"
+				"last may be not possible on your IRC network.\n"
+				" \n"
+				"It is recommended to use this command with a non-registered\n"
+				"nick because it will be registered automatically when \n"
+				"using this command. You may use it with a registered nick (to \n"
+				"change your group) only if your network administrators allowed \n"
+				"it.\n"
+				" \n"
+				"You can only be in one group at a time. Group merging is\n"
+				"not possible.\n"
+				" \n"
+				"\037Note\037: all the nicknames of a group have the same password."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "GROUP", NICK_GROUP_SYNTAX);
+		SyntaxError(source, "GROUP", _("\037target\037 \037password\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_GROUP);
+		source.Reply(_("    GROUP      Join a group"));
 	}
 };
 
@@ -162,11 +193,11 @@ class CommandNSUngroup : public Command
 		NickAlias *na = findnick(!nick.empty() ? nick : u->nick);
 
 		if (u->Account()->aliases.size() == 1)
-			source.Reply(NICK_UNGROUP_ONE_NICK);
+			source.Reply(_("Your nick is not grouped to anything, you can't ungroup it."));
 		else if (!na)
-			source.Reply(NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str());
 		else if (na->nc != u->Account())
-			source.Reply(NICK_UNGROUP_NOT_IN_GROUP, na->nick.c_str());
+			source.Reply(_("The nick %s is not in your group."), na->nick.c_str());
 		else
 		{
 			NickCore *oldcore = na->nc;
@@ -188,7 +219,7 @@ class CommandNSUngroup : public Command
 				na->nc->greet = oldcore->greet;
 			na->nc->language = oldcore->language;
 
-			source.Reply(NICK_UNGROUP_SUCCESSFUL, na->nick.c_str(), oldcore->display.c_str());
+			source.Reply(_("Nick %s has been ungrouped from %s."), na->nick.c_str(), oldcore->display.c_str());
 
 			User *user = finduser(na->nick);
 			if (user)
@@ -201,13 +232,19 @@ class CommandNSUngroup : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_UNGROUP);
+		source.Reply(_("Syntax: \002UNGROUP \037[nick]\037\002\n"
+				" \n"
+				"This command ungroups your nick, or if given, the specificed nick,\n"
+				"from the group it is in. The ungrouped nick keeps its registration\n"
+				"time, password, email, greet, language, url, and icq. Everything\n"
+				"else is reset. You may not ungroup yourself if there is only one\n"
+				"nick in your group."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_UNGROUP);
+		source.Reply(_("    UNGROUP    Remove a nick from a group"));
 	}
 };
 
@@ -226,19 +263,19 @@ class CommandNSGList : public Command
 		const NickCore *nc = u->Account();
 
 		if (!nick.empty() && (!nick.equals_ci(u->nick) && !u->Account()->IsServicesOper()))
-			source.Reply(ACCESS_DENIED, Config->s_NickServ.c_str());
+			source.Reply(LanguageString::ACCESS_DENIED, Config->s_NickServ.c_str());
 		else if (!nick.empty() && (!findnick(nick) || !(nc = findnick(nick)->nc)))
-			source.Reply(nick.empty() ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(nick.empty() ? LanguageString::NICK_NOT_REGISTERED : LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else
 		{
-			source.Reply(!nick.empty() ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER, nc->display.c_str());
+			source.Reply(!nick.empty() ? _("List of nicknames in the group of \002%s\002:") : _("List of nicknames in your group:"), nc->display.c_str());
 			for (std::list<NickAlias *>::const_iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end; ++it)
 			{
 				NickAlias *na2 = *it;
 
-				source.Reply(na2->HasFlag(NS_NO_EXPIRE) ? NICK_GLIST_REPLY_NOEXPIRE : NICK_GLIST_REPLY, na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str());
+				source.Reply(na2->HasFlag(NS_NO_EXPIRE) ? _("   %s (does not expire)") : _("   %s (expires in %s)"), na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str());
 			}
-			source.Reply(NICK_GLIST_FOOTER, nc->aliases.size());
+			source.Reply(_("%d nicknames in the group."), nc->aliases.size());
 		}
 		return MOD_CONT;
 	}
@@ -247,16 +284,25 @@ class CommandNSGList : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(NICK_SERVADMIN_HELP_GLIST);
+			source.Reply(_("Syntax: \002GLIST [\037nickname\037]\002\n"
+					" \n"
+					"Without a parameter, lists all nicknames that are in\n"
+					"your group.\n"
+					" \n"
+					"With a parameter, lists all nicknames that are in the\n"
+					"group of the given nick.\n"
+					"This use limited to \002Services Operators\002."));
 		else
-			source.Reply(NICK_HELP_GLIST);
+			source.Reply(_("Syntax: \002GLIST\002\n"
+					" \n"
+					"Lists all nicks in your group."));
 
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_GLIST);
+		source.Reply(_("    GLIST      Lists all nicknames in your group"));
 	}
 };
 
diff --git a/modules/core/ns_help.cpp b/modules/core/ns_help.cpp
index cc7f6c3a3..654d2233a 100644
--- a/modules/core/ns_help.cpp
+++ b/modules/core/ns_help.cpp
@@ -30,15 +30,31 @@ class CommandNSHelp : public Command
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(NICK_HELP);
+		source.Reply(_("\002%S\002 allows you to \"register\" a nickname and\n"
+				"prevent others from using it. The following\n"
+				"commands allow for registration and maintenance of\n"
+				"nicknames; to use them, type \002%R%S \037command\037\002.\n"
+				"For more information on a specific command, type\n"
+				"\002%R%S HELP \037command\037\002."));
 		for (CommandMap::const_iterator it = NickServ->Commands.begin(), it_end = NickServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(NICK_SERVADMIN_HELP);
+			source.Reply(_(" \n"
+					"Services Operators can also drop any nickname without needing\n"
+					"to identify for the nick, and may view the access list for\n"
+					"any nickname (\002%R%S ACCESS LIST \037nick\037\002)."));
 		if (Config->NSExpire >= 86400)
-			source.Reply(NICK_HELP_EXPIRES, Config->NSExpire / 86400);
-		source.Reply(NICK_HELP_FOOTER);
+			source.Reply(_("Nicknames that are not used anymore are subject to \n"
+					"the automatic expiration, i.e. they will be deleted\n"
+					"after %d days if not used."), Config->NSExpire / 86400);
+		source.Reply(_(" \n"
+				"\002NOTICE:\002 This service is intended to provide a way for\n"
+				"IRC users to ensure their identity is not compromised.\n"
+				"It is \002NOT\002 intended to facilitate \"stealing\" of\n"
+				"nicknames or other malicious actions. Abuse of %S\n"
+				"will result in, at minimum, loss of the abused\n"
+				"nickname(s)."));
 	}
 };
 
diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp
index eb337d93e..625ccd7e2 100644
--- a/modules/core/ns_identify.cpp
+++ b/modules/core/ns_identify.cpp
@@ -33,32 +33,32 @@ class CommandNSIdentify : public Command
 		{
 			NickRequest *nr = findrequestnick(nick);
 			if (nr)
-				source.Reply(NICK_IS_PREREG);
+				source.Reply(LanguageString::NICK_IS_PREREG);
 			else
-				source.Reply(NICK_NOT_REGISTERED);
+				source.Reply(LanguageString::NICK_NOT_REGISTERED);
 		}
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (na->nc->HasFlag(NI_SUSPENDED))
-			source.Reply(NICK_X_SUSPENDED, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, na->nick.c_str());
 		/* You can now identify for other nicks without logging out first,
 		 * however you can not identify again for the group you're already
 		 * identified as
 		 */
 		else if (u->Account() && u->Account() == na->nc)
-			source.Reply(NICK_ALREADY_IDENTIFIED);
+			source.Reply(_("You are already identified."));
 		else
 		{
 			int res = enc_check_password(pass, na->nc->pass);
 			if (!res)
 			{
 				Log(LOG_COMMAND, u, this) << "and failed to identify";
-				source.Reply(PASSWORD_INCORRECT);
+				source.Reply(LanguageString::PASSWORD_INCORRECT);
 				if (bad_password(u))
 					return MOD_STOP;
 			}
 			else if (res == -1)
-				source.Reply(NICK_IDENTIFY_FAILED);
+				source.Reply(_("Sorry, identification failed."));
 			else
 			{
 				if (u->IsIdentified())
@@ -79,7 +79,7 @@ class CommandNSIdentify : public Command
 				FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u));
 
 				Log(LOG_COMMAND, u, this) << "and identified for account " << u->Account()->display;
-				source.Reply(NICK_IDENTIFY_SUCCEEDED);
+				source.Reply(_("Password accepted - you are now recognized."));
 				if (ircd->vhost)
 					do_on_id(u);
 				if (Config->NSModeOnID)
@@ -87,8 +87,12 @@ class CommandNSIdentify : public Command
 
 				if (Config->NSForceEmail && u->Account() && u->Account()->email.empty())
 				{
-					source.Reply(NICK_IDENTIFY_EMAIL_REQUIRED);
-					source.Reply(NICK_IDENTIFY_EMAIL_HOWTO);
+					source.Reply(_("You must now supply an e-mail for your nick.\n"
+						"This e-mail will allow you to retrieve your password in\n"
+						"case you forget it."));
+					source.Reply(_("Type \002%R%S SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n"
+						"Your privacy is respected; this e-mail won't be given to\n"
+					"any third-party person."));
 				}
 
 				if (u->IsIdentified())
@@ -100,18 +104,24 @@ class CommandNSIdentify : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_IDENTIFY);
+		source.Reply(_("Syntax: \002IDENTIFY [account] \037password\037\002\n"
+				" \n"
+				"Tells %S that you are really the owner of this\n"
+				"nick.  Many commands require you to authenticate yourself\n"
+				"with this command before you use them.  The password\n"
+				"should be the same one you sent with the \002REGISTER\002\n"
+				"command."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "IDENTIFY", NICK_IDENTIFY_SYNTAX);
+		SyntaxError(source, "IDENTIFY", _("IDENTIFY [account] \037password\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_IDENTIFY);
+		source.Reply(_("    IDENTIFY   Identify yourself with your password"));
 	}
 };
 
diff --git a/modules/core/ns_info.cpp b/modules/core/ns_info.cpp
index ed894d604..63e92391f 100644
--- a/modules/core/ns_info.cpp
+++ b/modules/core/ns_info.cpp
@@ -46,21 +46,21 @@ class CommandNSInfo : public Command
 			NickRequest *nr = findrequestnick(nick);
 			if (nr)
 			{
-				source.Reply(NICK_IS_PREREG);
+				source.Reply(LanguageString::NICK_IS_PREREG);
 				if (has_auspex)
-					source.Reply(NICK_INFO_EMAIL, nr->email.c_str());
+					source.Reply(_("   E-mail address: %s"), nr->email.c_str());
 			}
 			else if (nickIsServices(nick, true))
-				source.Reply(NICK_X_IS_SERVICES, nick.c_str());
+				source.Reply(_("Nick \002%s\002 is part of this Network's Services."), nick.c_str());
 			else
-				source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+				source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		}
 		else if (na->HasFlag(NS_FORBIDDEN))
 		{
 			if (u->HasMode(UMODE_OPER) && !na->last_usermask.empty())
-				source.Reply(NICK_X_FORBIDDEN_OPER, nick.c_str(), na->last_usermask.c_str(), !na->last_realname.empty() ? na->last_realname.c_str() : GetString(u, NO_REASON).c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN_OPER, nick.c_str(), na->last_usermask.c_str(), !na->last_realname.empty() ? na->last_realname.c_str() : GetString(u->Account(), LanguageString::NO_REASON).c_str());
 			else
-				source.Reply(NICK_X_FORBIDDEN, nick.c_str());
+				source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
 		}
 		else
 		{
@@ -74,71 +74,71 @@ class CommandNSInfo : public Command
 			if (has_auspex || (u->Account() && na->nc == u->Account()))
 				show_hidden = true;
 
-			source.Reply(NICK_INFO_REALNAME, na->nick.c_str(), na->last_realname.c_str());
+			source.Reply(_("%s is %s"), na->nick.c_str(), na->last_realname.c_str());
 
 			if (na->nc->IsServicesOper() && (show_hidden || !na->nc->HasFlag(NI_HIDE_STATUS)))
-				source.Reply(NICK_INFO_SERVICES_OPERTYPE, na->nick.c_str(), na->nc->ot->GetName().c_str());
+				source.Reply(_("%s is a services operator of type %s."), na->nick.c_str(), na->nc->ot->GetName().c_str());
 
 			if (nick_online)
 			{
 				if (show_hidden || !na->nc->HasFlag(NI_HIDE_MASK))
-					source.Reply(NICK_INFO_ADDRESS_ONLINE, na->last_usermask.c_str());
+					source.Reply(_("   Is online from: %s"), na->last_usermask.c_str());
 				else
-					source.Reply(NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick.c_str());
+					source.Reply(_("%s is currently online."), na->nick.c_str());
 			}
 			else
 			{
 				if (show_hidden || !na->nc->HasFlag(NI_HIDE_MASK))
-					source.Reply(NICK_INFO_ADDRESS, na->last_usermask.c_str());
+					source.Reply(_("Last seen address: %s"), na->last_usermask.c_str());
 			}
 
-			source.Reply(NICK_INFO_TIME_REGGED, do_strftime(na->time_registered).c_str());
+			source.Reply(_("  Time registered: %s"), do_strftime(na->time_registered).c_str());
 
 			if (!nick_online)
 			{
-				source.Reply(NICK_INFO_LAST_SEEN, do_strftime(na->last_seen).c_str());
+				source.Reply(_("   Last seen time: %s"), do_strftime(na->last_seen).c_str());
 			}
 
 			if (!na->last_quit.empty() && (show_hidden || !na->nc->HasFlag(NI_HIDE_QUIT)))
-				source.Reply(NICK_INFO_LAST_QUIT, na->last_quit.c_str());
+				source.Reply(_("Last quit message: %s"), na->last_quit.c_str());
 
 			if (!na->nc->email.empty() && (show_hidden || !na->nc->HasFlag(NI_HIDE_EMAIL)))
-				source.Reply(NICK_INFO_EMAIL, na->nc->email.c_str());
+				source.Reply(_("   E-mail address: %s"), na->nc->email.c_str());
 
 			if (show_hidden)
 			{
 				if (!Config->s_HostServ.empty() && ircd->vhost && na->hostinfo.HasVhost())
 				{
 					if (ircd->vident && !na->hostinfo.GetIdent().empty())
-						source.Reply(NICK_INFO_VHOST2, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
+						source.Reply(_("            vhost: %s@%s"), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
 					else
-						source.Reply(NICK_INFO_VHOST, na->hostinfo.GetHost().c_str());
+						source.Reply(_("            vhost: %s"), na->hostinfo.GetHost().c_str());
 				}
 				if (!na->nc->greet.empty())
-					source.Reply(NICK_INFO_GREET, na->nc->greet.c_str());
+					source.Reply(_("    Greet message: %s"), na->nc->greet.c_str());
 
 				Anope::string optbuf;
 
-				CheckOptStr(optbuf, NI_KILLPROTECT, GetString(u, NICK_INFO_OPT_KILL).c_str(), na->nc);
-				CheckOptStr(optbuf, NI_SECURE, GetString(u, NICK_INFO_OPT_SECURE).c_str(), na->nc);
-				CheckOptStr(optbuf, NI_PRIVATE, GetString(u, NICK_INFO_OPT_PRIVATE).c_str(), na->nc);
-				CheckOptStr(optbuf, NI_MSG, GetString(u, NICK_INFO_OPT_MSG).c_str(), na->nc);
-				CheckOptStr(optbuf, NI_AUTOOP, GetString(u, NICK_INFO_OPT_AUTOOP).c_str(), na->nc);
+				CheckOptStr(optbuf, NI_KILLPROTECT, GetString(u->Account(), _("Protection")).c_str(), na->nc);
+				CheckOptStr(optbuf, NI_SECURE, GetString(u->Account(), _("Security")).c_str(), na->nc);
+				CheckOptStr(optbuf, NI_PRIVATE, GetString(u->Account(), _("Private")).c_str(), na->nc);
+				CheckOptStr(optbuf, NI_MSG, GetString(u->Account(), _("Message mode")).c_str(), na->nc);
+				CheckOptStr(optbuf, NI_AUTOOP, GetString(u->Account(), _("Auto-op")).c_str(), na->nc);
 
-				source.Reply(NICK_INFO_OPTIONS, optbuf.empty() ? GetString(u, NICK_INFO_OPT_NONE).c_str() : optbuf.c_str());
+				source.Reply(LanguageString::NICK_INFO_OPTIONS, optbuf.empty() ? _("None") : optbuf.c_str());
 
 				if (na->nc->HasFlag(NI_SUSPENDED))
 				{
 					if (!na->last_quit.empty())
-						source.Reply(NICK_INFO_SUSPENDED, na->last_quit.c_str());
+						source.Reply(_("This nickname is currently suspended, reason: %s"), na->last_quit.c_str());
 					else
-						source.Reply(NICK_INFO_SUSPENDED_NO_REASON);
+						source.Reply(_("This nickname is currently suspended"));
 				}
 
 				if (na->HasFlag(NS_NO_EXPIRE))
-					source.Reply(NICK_INFO_NO_EXPIRE);
+					source.Reply(_("This nickname will not expire."));
 				else
-					source.Reply(NICK_INFO_EXPIRE, do_strftime(na->last_seen + Config->NSExpire).c_str());
+					source.Reply(_("Expires on: %s"), do_strftime(na->last_seen + Config->NSExpire).c_str());
 			}
 
 			FOREACH_MOD(I_OnNickInfo, OnNickInfo(u, na, show_hidden));
@@ -148,19 +148,23 @@ class CommandNSInfo : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_INFO);
+		source.Reply(_("Syntax: \002INFO \037nickname\037\002\n"
+				" \n"
+				"Displays information about the given nickname, such as\n"
+				"the nick's owner, last seen address and time, and nick\n"
+				"options."));
 
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "INFO", NICK_INFO_SYNTAX);
+		SyntaxError(source, "INFO", _("INFO \037nick\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_INFO);
+		source.Reply(_("    INFO       Displays information about a given nickname"));
 	}
 };
 
diff --git a/modules/core/ns_list.cpp b/modules/core/ns_list.cpp
index 1e77798a3..4c3db50ed 100644
--- a/modules/core/ns_list.cpp
+++ b/modules/core/ns_list.cpp
@@ -51,7 +51,7 @@ class CommandNSList : public Command
 
 		if (Config->NSListOpersOnly && !u->HasMode(UMODE_OPER)) /* reverse the help logic */
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_STOP;
 		}
 
@@ -60,24 +60,24 @@ class CommandNSList : public Command
 			Anope::string tmp = myStrGetToken(pattern.substr(1), '-', 0); /* Read FROM out */
 			if (tmp.empty())
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
 				return MOD_CONT;
 			}
 			if (!tmp.is_number_only())
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
 				return MOD_CONT;
 			}
 			from = convertTo<int>(tmp);
 			tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
 			if (tmp.empty())
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
 				return MOD_CONT;
 			}
 			if (!tmp.is_number_only())
 			{
-				source.Reply(LIST_INCORRECT_RANGE);
+				source.Reply(LanguageString::LIST_INCORRECT_RANGE);
 				return MOD_CONT;
 			}
 			to = convertTo<int>(tmp);
@@ -105,7 +105,7 @@ class CommandNSList : public Command
 
 		mync = u->Account();
 
-		source.Reply(NICK_LIST_HEADER, pattern.c_str());
+		source.Reply(LanguageString::LIST_HEADER, pattern.c_str());
 		if (!unconfirmed)
 		{
 			for (nickalias_map::const_iterator it = NickAliasList.begin(), it_end = NickAliasList.end(); it != it_end; ++it)
@@ -167,7 +167,7 @@ class CommandNSList : public Command
 				}
 			}
 		}
-		source.Reply(NICK_LIST_RESULTS, nnicks > Config->NSListMax ? Config->NSListMax : nnicks, nnicks);
+		source.Reply(_("End of list - %d/%d matches shown."), nnicks > Config->NSListMax ? Config->NSListMax : nnicks, nnicks);
 		return MOD_CONT;
 	}
 
@@ -175,9 +175,49 @@ class CommandNSList : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(NICK_SERVADMIN_HELP_LIST);
+			source.Reply(_("Syntax: \002LIST \037pattern\037 [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\002\n"
+					" \n"
+					"Lists all registered nicknames which match the given\n"
+					"pattern, in \037nick!user@host\037 format.  Nicks with the \002PRIVATE\002\n"
+					"option set will only be displayed to Services Operators.  Nicks\n"
+					"with the \002NOEXPIRE\002 option set will have a \002!\002 appended to\n"
+					"the nickname for Services Operators.\n"
+					" \n"
+					"If the FORBIDDEN, SUSPENDED, NOEXPIRE or UNCONFIRMED options are given, only\n"
+					"nicks which, respectively, are FORBIDDEN, SUSPENDED, UNCONFIRMED or have the\n"
+					"NOEXPIRE flag set will be displayed. If multiple options are\n"
+					"given, all nicks matching at least one option will be displayed.\n"
+					"These options are limited to \037Services Operators\037.  \n"
+					"Examples:\n"
+					" \n"
+					"    \002LIST *!joeuser@foo.com\002\n"
+					"        Lists all registered nicks owned by joeuser@foo.com.\n"
+					" \n"
+					"    \002LIST *Bot*!*@*\002\n"
+					"        Lists all registered nicks with \002Bot\002 in their\n"
+					"        names (case insensitive).\n"
+					" \n"
+					"    \002LIST * NOEXPIRE\002\n"
+					"        Lists all registered nicks which have been set to\n"));
 		else
-			source.Reply(NICK_HELP_LIST);
+			source.Reply(_("Syntax: \002LIST \037pattern\037\002\n"
+					" \n"
+					"Lists all registered nicknames which match the given\n"
+					"pattern, in \037nick!user@host\037 format.  Nicks with the\n"
+					"\002PRIVATE\002 option set will not be displayed.\n"
+					" \n"
+					"Examples:\n"
+					" \n"
+					"    \002LIST *!joeuser@foo.com\002\n"
+					"        Lists all nicks owned by joeuser@foo.com.\n"
+					" \n"
+					"    \002LIST *Bot*!*@*\002\n"
+					"        Lists all registered nicks with \002Bot\002 in their\n"
+					"        names (case insensitive).\n"
+					" \n"
+					"    \002LIST *!*@*.bar.org\002\n"
+					"        Lists all nicks owned by users in the \002bar.org\002\n"
+					"        domain."));
 
 		return true;
 	}
@@ -186,14 +226,14 @@ class CommandNSList : public Command
 	{
 		User *u = source.u;
 		if (u->Account()->IsServicesOper())
-			SyntaxError(source, "LIST", NICK_LIST_SERVADMIN_SYNTAX);
+			SyntaxError(source, "LIST", _("LIST \037pattern\037 [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"));
 		else
-			SyntaxError(source, "LIST", NICK_LIST_SYNTAX);
+			SyntaxError(source, "LIST", LanguageString::NICK_LIST_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_LIST);
+		source.Reply(_("    LIST       List all registered nicknames that match a given pattern"));
 	}
 };
 
diff --git a/modules/core/ns_logout.cpp b/modules/core/ns_logout.cpp
index 446e33b5c..81ccc841d 100644
--- a/modules/core/ns_logout.cpp
+++ b/modules/core/ns_logout.cpp
@@ -31,9 +31,9 @@ class CommandNSLogout : public Command
 		if (!u->Account()->IsServicesOper() && !nick.empty())
 			this->OnSyntaxError(source, "");
 		else if (!(u2 = (!nick.empty() ? finduser(nick) : u)))
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else if (!nick.empty() && u2->Account() && !u2->Account()->IsServicesOper())
-			source.Reply(NICK_LOGOUT_SERVICESADMIN, nick.c_str());
+			source.Reply(_("You can't logout %s because they are a Services Operator."), nick.c_str());
 		else
 		{
 			if (!nick.empty() && !param.empty() && param.equals_ci("REVALIDATE"))
@@ -44,9 +44,9 @@ class CommandNSLogout : public Command
 
 			/* Remove founder status from this user in all channels */
 			if (!nick.empty())
-				source.Reply(NICK_LOGOUT_X_SUCCEEDED, nick.c_str());
+				source.Reply(_("Nick %s has been logged out."), nick.c_str());
 			else
-				source.Reply(NICK_LOGOUT_SUCCEEDED);
+				source.Reply(_("Your nick has been logged out."));
 
 			ircdproto->SendAccountLogout(u2, u2->Account());
 			u2->RemoveMode(NickServ, UMODE_REGISTERED);
@@ -64,21 +64,35 @@ class CommandNSLogout : public Command
 	{
 		User *u = source.u;
 		if (u->Account() && u->Account()->IsServicesOper())
-			source.Reply(NICK_SERVADMIN_HELP_LOGOUT);
+			source.Reply(_("Syntax: \002LOGOUT [\037nickname\037 [REVALIDATE]]\002\n"
+					" \n"
+					"Without a parameter, reverses the effect of the \002IDENTIFY\002 \n"
+					"command, i.e. make you not recognized as the real owner of the nick\n"
+					"anymore. Note, however, that you won't be asked to reidentify\n"
+					"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"
+					"to re-identify. This use limited to \002Services Operators\002."));
 		else
-			source.Reply(NICK_HELP_LOGOUT);
+			source.Reply(_("Syntax: \002LOGOUT\002\n"
+					" \n"
+					"This reverses the effect of the \002IDENTIFY\002 command, i.e.\n"
+					"make you not recognized as the real owner of the nick\n"
+					"anymore. Note, however, that you won't be asked to reidentify\n"
+					"yourself."));
 
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "LOGOUT", NICK_LOGOUT_SYNTAX);
+		SyntaxError(source, "LOGOUT", _("LOGOUT"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_LOGOUT);
+		source.Reply(_("    LOGOUT     Reverses the effect of the IDENTIFY command"));
 	}
 };
 
diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp
index b7a2ec7ba..ad32c664c 100644
--- a/modules/core/ns_recover.cpp
+++ b/modules/core/ns_recover.cpp
@@ -31,32 +31,32 @@ class CommandNSRecover : public Command
 		NickAlias *na;
 		User *u2;
 		if (!(u2 = finduser(nick)))
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else if (!(na = findnick(u2->nick)))
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (na->nc->HasFlag(NI_SUSPENDED))
-			source.Reply(NICK_X_SUSPENDED, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, na->nick.c_str());
 		else if (nick.equals_ci(u->nick))
-			source.Reply(NICK_NO_RECOVER_SELF);
+			source.Reply(_("You can't recover yourself!"));
 		else if (!pass.empty())
 		{
 			int res = enc_check_password(pass, na->nc->pass);
 
 			if (res == 1)
 			{
-				u2->SendMessage(NickServ, FORCENICKCHANGE_NOW);
+				u2->SendMessage(NickServ, LanguageString::FORCENICKCHANGE_NOW);
 				u2->Collide(na);
 
 				/* Convert Config->NSReleaseTimeout seconds to string format */
 				Anope::string relstr = duration(na->nc, Config->NSReleaseTimeout);
 
-				source.Reply(NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
+				source.Reply(LanguageString::NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
 			}
 			else
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				if (!res)
 				{
 					Log(LOG_COMMAND, u, this) << "with invalid password for " << nick;
@@ -69,16 +69,16 @@ class CommandNSRecover : public Command
 		{
 			if (u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc)))
 			{
-				u2->SendMessage(NickServ, FORCENICKCHANGE_NOW);
+				u2->SendMessage(NickServ, LanguageString::FORCENICKCHANGE_NOW);
 				u2->Collide(na);
 
 				/* Convert Config->NSReleaseTimeout seconds to string format */
 				Anope::string relstr = duration(na->nc, Config->NSReleaseTimeout);
 
-				source.Reply(NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
+				source.Reply(LanguageString::NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
 			}
 			else
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 		}
 		return MOD_CONT;
 	}
@@ -88,19 +88,40 @@ class CommandNSRecover : public Command
 		/* Convert Config->NSReleaseTimeout seconds to string format */
 		Anope::string relstr = duration(source.u->Account(), Config->NSReleaseTimeout);
 
-		source.Reply(NICK_HELP_RECOVER, relstr.c_str());
+		source.Reply(_("Syntax: \002RECOVER \037nickname\037 [\037password\037]\002\n"
+				" \n"
+				"Allows you to recover your nickname if someone else has\n"
+				"taken it; this does the same thing that %S does\n"
+				"automatically if someone tries to use a kill-protected\n"
+				"nick.\n"
+				" \n"
+				"When you give this command, %S will bring a fake\n"
+				"user online with the same nickname as the user you're\n"
+				"trying to recover your nick from.  This causes the IRC\n"
+				"servers to disconnect the other user.  This fake user will\n"
+				"remain online for %s to ensure that the other\n"
+				"user does not immediately reconnect; after that time, you\n"
+				"can reclaim your nick.  Alternatively, use the \002RELEASE\002\n"
+				"command (\002%R%S HELP RELEASE\002) to get the nick\n"
+				"back sooner.\n"
+				" \n"
+				"In order to use the \002RECOVER\002 command for a nick, your\n"
+				"current address as shown in /WHOIS must be on that nick's\n"
+				"access list, you must be identified and in the group of\n"
+				"that nick, or you must supply the correct password for\n"
+				"the nickname."), relstr.c_str());
 
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "RECOVER", NICK_RECOVER_SYNTAX);
+		SyntaxError(source, "RECOVER", _("RECOVER \037nickname\037 [\037password\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_RECOVER);
+		source.Reply(_("    RECOVER    Kill another user who has taken your nick"));
 	}
 };
 
diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp
index 0a5a5f641..ec885f728 100644
--- a/modules/core/ns_register.cpp
+++ b/modules/core/ns_register.cpp
@@ -52,23 +52,23 @@ class CommandNSConfirm : public Command
 			u->Login(na->nc);
 			Log(LOG_COMMAND, u, this) << "to register " << nr->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")";
 			if (Config->NSAddAccessOnReg)
-				source.Reply(NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str());
+				source.Reply(_("Nickname \002%s\002 registered under your account: %s"), u->nick.c_str(), na->nc->GetAccess(0).c_str());
 			else
-				source.Reply(NICK_REGISTERED_NO_MASK, u->nick.c_str());
+				source.Reply(_("Nickname \002%s\002 registered."), u->nick.c_str());
 			delete nr;
 
 			ircdproto->SendAccountLogin(u, u->Account());
 			ircdproto->SetAutoIdentificationToken(u);
 
 			if (enc_decrypt(na->nc->pass, tmp_pass) == 1)
-				source.Reply(NICK_PASSWORD_IS, tmp_pass.c_str());
+				source.Reply(_("Your password is \002%s\002 - remember this for later use."), tmp_pass.c_str());
 
 			u->lastnickreg = Anope::CurTime;
 		}
 		else
 		{
 			Log(LOG_COMMAND, u, this) << "to confirm " << nr->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")";
-			source.Reply(NICK_FORCE_REG, nr->nick.c_str());
+			source.Reply(_("Nickname \002%s\002 confirmed"), nr->nick.c_str());
 			User *user = finduser(nr->nick);
 			/* Delrequest must be called before validate_user */
 			delete nr;
@@ -109,21 +109,21 @@ class CommandNSConfirm : public Command
 						return MOD_CONT;
 					}
 				}
-				source.Reply(NICK_CONFIRM_NOT_FOUND, Config->s_NickServ.c_str());
+				source.Reply(_("Registration step 1 may have expired, please use \"%R%s register <password> <email>\" first."), Config->s_NickServ.c_str());
 
 				return MOD_CONT;
 			}
 
 			if (!nr->passcode.equals_cs(passcode))
 			{
-				source.Reply(NICK_CONFIRM_INVALID);
+				source.Reply(LanguageString::NICK_CONFIRM_INVALID);
 				return MOD_CONT;
 			}
 		}
 
 		if (!nr)
 		{
-			source.Reply(NICK_REGISTRATION_FAILED);
+			source.Reply(_("Sorry, registration failed."));
 			return MOD_CONT;
 		}
 
@@ -145,20 +145,31 @@ class CommandNSConfirm : public Command
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(NICK_HELP_CONFIRM);
+		source.Reply(_("Syntax: \002CONFIRM \037passcode\037\002\n"
+				" \n"
+				"This is the second step of nickname registration process.\n"
+				"You must perform this command in order to get your nickname\n"
+				"registered with %S. The passcode (or called auth code also)\n"
+				"is sent to your e-mail address in the first step of the\n"
+				"registration process. For more information about the first\n"
+				"stage of the registration process, type: \002%R%S HELP REGISTER\002\n"
+				" \n"
+				"This is also used after the RESETPASS command has been used to\n"
+				"force identify you to your nick so you may change your password."));
 		if (u->Account() && u->Account()->HasPriv("nickserv/confirm"))
-			source.Reply(NICK_HELP_CONFIRM_OPER);
+			source.Reply(_("Additionally, Services Operators with the \037nickserv/confirm\037 permission can\n"
+				"replace \037passcode\037 with a users nick to force validate them."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_CONFIRM_INVALID);
+		source.Reply(LanguageString::NICK_CONFIRM_INVALID);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_CONFIRM);
+		source.Reply(_("    CONFIRM    Confirm a nickserv auth code"));
 	}
 };
 
@@ -192,19 +203,19 @@ class CommandNSRegister : public CommandNSConfirm
 
 		if (readonly)
 		{
-			source.Reply(NICK_REGISTRATION_DISABLED);
+			source.Reply(_("Sorry, nickname registration is temporarily disabled."));
 			return MOD_CONT;
 		}
 
 		if (!u->HasMode(UMODE_OPER) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay)
 		{
-			source.Reply(NICK_REG_DELAY, Config->NickRegDelay);
+			source.Reply(_("You must have been using this nick for at least %d seconds to register."), Config->NickRegDelay);
 			return MOD_CONT;
 		}
 
 		if ((anr = findrequestnick(u->nick)))
 		{
-			source.Reply(NICK_REQUESTED);
+			source.Reply(LanguageString::NICK_REQUESTED);
 			return MOD_CONT;
 		}
 
@@ -215,13 +226,13 @@ class CommandNSRegister : public CommandNSConfirm
 		 */
 		if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && u->nick.substr(prefixlen).find_first_not_of("1234567890") == Anope::string::npos)
 		{
-			source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
+			source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (!ircdproto->IsNickValid(u->nick))
 		{
-			source.Reply(NICK_X_FORBIDDEN, u->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, u->nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -232,7 +243,7 @@ class CommandNSRegister : public CommandNSConfirm
 
 				if (u->nick.find_ci(nick) != Anope::string::npos && !u->HasMode(UMODE_OPER))
 				{
-					source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
+					source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
 					return MOD_CONT;
 				}
 		}
@@ -240,24 +251,24 @@ class CommandNSRegister : public CommandNSConfirm
 		if (Config->NSForceEmail && email.empty())
 			this->OnSyntaxError(source, "");
 		else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
-			source.Reply(NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
+			source.Reply(_("Please wait %d seconds before using the REGISTER command again."), (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
 		else if ((na = findnick(u->nick)))
 		{
 			/* i.e. there's already such a nick regged */
 			if (na->HasFlag(NS_FORBIDDEN))
 			{
 				Log(NickServ) << u->GetMask() << " tried to register FORBIDden nick " << u->nick;
-				source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
+				source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
 			}
 			else
-				source.Reply(NICK_ALREADY_REGISTERED, u->nick.c_str());
+				source.Reply(LanguageString::NICK_ALREADY_REGISTERED, u->nick.c_str());
 		}
 		else if (pass.equals_ci(u->nick) || (Config->StrictPasswords && pass.length() < 5))
-			source.Reply(MORE_OBSCURE_PASSWORD);
+			source.Reply(LanguageString::MORE_OBSCURE_PASSWORD);
 		else if (pass.length() > Config->PassLen)
-			source.Reply(PASSWORD_TOO_LONG);
+			source.Reply(LanguageString::PASSWORD_TOO_LONG);
 		else if (!email.empty() && !MailValidate(email))
-			source.Reply(MAIL_X_INVALID, email.c_str());
+			source.Reply(LanguageString::MAIL_X_INVALID, email.c_str());
 		else
 		{
 			for (idx = 0; idx < 9; ++idx)
@@ -273,13 +284,16 @@ class CommandNSRegister : public CommandNSConfirm
 			{
 				if (SendRegmail(u, nr))
 				{
-					source.Reply(NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
+					source.Reply(_("A passcode has been sent to %s, please type %R%s confirm <passcode> to complete registration.\n"
+					  "If you need to cancel your registration, use \"%R%s drop <password>\"."),
+					  email.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
+
 					Log(LOG_COMMAND, u, this) << "send registration verification code to " << nr->email;
 				}
 				else
 				{
 					Log(LOG_COMMAND, u, this) << "unable to send registration verification mail";
-					source.Reply(NICK_REG_UNABLE);
+					source.Reply(_("Nick NOT registered, please try again later."));
 					delete nr;
 					return MOD_CONT;
 				}
@@ -296,21 +310,51 @@ class CommandNSRegister : public CommandNSConfirm
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_REGISTER);
+		source.Reply(_("Syntax: \002REGISTER \037password\037 \037[email]\037\002\n"
+				" \n"
+				"Registers your nickname in the %S database. Once\n"
+				"your nick is registered, you can use the \002SET\002 and \002ACCESS\002\n"
+				"commands to configure your nick's settings as you like\n"
+				"them. Make sure you remember the password you use when\n"
+				"registering - you'll need it to make changes to your nick\n"
+				"later. (Note that \002case matters!\002 \037ANOPE\037, \037Anope\037, and \n"
+				"\037anope\037 are all different passwords!)\n"
+				" \n"
+				"Guidelines on choosing passwords:\n"
+				" \n"
+				"Passwords should not be easily guessable. For example,\n"
+				"using your real name as a password is a bad idea. Using\n"
+				"your nickname as a password is a much worse idea ;) and,\n"
+				"in fact, %S will not allow it. Also, short\n"
+				"passwords are vulnerable to trial-and-error searches, so\n"
+				"you should choose a password at least 5 characters long.\n"
+				"Finally, the space character cannot be used in passwords.\n"
+				" \n"
+				"The parameter \037email\037 is optional and will set the email\n"
+				"for your nick immediately. However, it may be required\n"
+				"on certain networks.\n"
+				"Your privacy is respected; this e-mail won't be given to\n"
+				"any third-party person.\n"
+				" \n"
+				"This command also creates a new group for your nickname,\n"
+				"that will allow you to register other nicks later sharing\n"
+				"the same configuration, the same set of memos and the\n"
+				"same channel privileges. For more information on this\n"
+				"feature, type \002%R%S HELP GROUP\002."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		if (Config->NSForceEmail)
-			SyntaxError(source, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL);
+			SyntaxError(source, "REGISTER", _("\037password\037 \037email\037"));
 		else
-			SyntaxError(source, "REGISTER", NICK_REGISTER_SYNTAX);
+			SyntaxError(source, "REGISTER", _("\037password\037 [\037email\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_REGISTER);
+		source.Reply(_("    REGISTER   Register a nickname"));
 	}
 };
 
@@ -332,13 +376,13 @@ class CommandNSResend : public Command
 			{
 				if (Anope::CurTime < nr->lastmail + Config->NSResendDelay)
 				{
-					source.Reply(MAIL_LATER);
+					source.Reply(_("Cannot send mail now; please retry a little later."));
 					return MOD_CONT;
 				}
 				if (!SendRegmail(u, nr))
 				{
 					nr->lastmail = Anope::CurTime;
-					source.Reply(NICK_REG_RESENT, nr->email.c_str());
+					source.Reply(_("Your passcode has been re-sent to %s."), nr->email.c_str());
 					Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick;
 				}
 				else
@@ -353,13 +397,16 @@ class CommandNSResend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_RESEND);
+		source.Reply(_("Syntax: \002RESEND\002\n"
+				" \n"
+				"This command will re-send the auth code (also called passcode)\n"
+				"to the e-mail address of the user whom is performing it."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_RESEND);
+		source.Reply(_("    RESEND     Resend a nickserv auth code"));
 	}
 };
 
@@ -385,8 +432,15 @@ static bool SendRegmail(User *u, NickRequest *nr)
 {
 	char subject[BUFSIZE], message[BUFSIZE];
 
-	snprintf(subject, sizeof(subject), GetString(NICK_REG_MAIL_SUBJECT).c_str(), nr->nick.c_str());
-	snprintf(message, sizeof(message), GetString(NICK_REG_MAIL).c_str(), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str());
+	snprintf(subject, sizeof(subject), GetString(NULL, "Nickname Registration (%s)").c_str(), nr->nick.c_str());
+	snprintf(message, sizeof(message), GetString(NULL, "Hi,\n"
+	" \n"
+	"You have requested to register the nickname %s on %s.\n"
+	"Please type \" %R%s confirm %s \" to complete registration.\n"
+	" \n"
+	"If you don't know why this mail was sent to you, please ignore it silently.\n"
+	" \n"
+	"%s administrators.").c_str(), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str());
 
 	return Mail(u, nr, NickServ, subject, message);
 }
diff --git a/modules/core/ns_release.cpp b/modules/core/ns_release.cpp
index ed0b18eb9..67c1b73ea 100644
--- a/modules/core/ns_release.cpp
+++ b/modules/core/ns_release.cpp
@@ -29,24 +29,24 @@ class CommandNSRelease : public Command
 		NickAlias *na;
 
 		if (!(na = findnick(nick)))
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (na->nc->HasFlag(NI_SUSPENDED))
-			source.Reply(NICK_X_SUSPENDED, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, na->nick.c_str());
 		else if (!na->HasFlag(NS_HELD))
-			source.Reply(NICK_RELEASE_NOT_HELD, nick.c_str());
+			source.Reply(_("Nick \002%s\002 isn't being held."), nick.c_str());
 		else if (!pass.empty())
 		{
 			int res = enc_check_password(pass, na->nc->pass);
 			if (res == 1)
 			{
 				Log(LOG_COMMAND, u, this) << "released " << na->nick;
-				source.Reply(NICK_RELEASED);
+				source.Reply(_("Services' hold on your nick has been released."));
 			}
 			else
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 				if (!res)
 				{
 					Log(LOG_COMMAND, u, this) << "invalid password for " << nick;
@@ -60,10 +60,10 @@ class CommandNSRelease : public Command
 			if (u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc)))
 			{
 				na->Release();
-				source.Reply(NICK_RELEASED);
+				source.Reply(_("Services' hold on your nick has been released."));
 			}
 			else
-				source.Reply(ACCESS_DENIED);
+				source.Reply(LanguageString::ACCESS_DENIED);
 		}
 		return MOD_CONT;
 	}
@@ -74,19 +74,31 @@ class CommandNSRelease : public Command
 		User *u = source.u;
 		Anope::string relstr = duration(u->Account(), Config->NSReleaseTimeout);
 
-		source.Reply(NICK_HELP_RELEASE, relstr.c_str());
+		source.Reply(_("Syntax: \002RELEASE \037nickname\037 [\037password\037]\002\n"
+				" \n"
+				"Instructs %S to remove any hold on your nickname\n"
+				"caused by automatic kill protection or use of the \002RECOVER\002\n"
+				"command. This holds lasts for %s;\n"
+				"This command gets rid of them sooner.\n"
+				" \n"
+				"In order to use the \002RELEASE\002 command for a nick, your\n"
+				"current address as shown in /WHOIS must be on that nick's\n"
+				"access list, you must be identified and in the group of\n"
+				"that nick, or you must supply the correct password for\n"
+				"the nickname."));
+
 
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "RELEASE", NICK_RELEASE_SYNTAX);
+		SyntaxError(source, "RELEASE", _("RELEASE \037nickname\037 [\037password\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_RELEASE);
+		source.Reply(_("    RELEASE    Regain custody of your nick after RECOVER"));
 	}
 };
 
diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp
index cf0a6cba1..7b5473122 100644
--- a/modules/core/ns_resetpass.cpp
+++ b/modules/core/ns_resetpass.cpp
@@ -29,17 +29,17 @@ class CommandNSResetPass : public Command
 		NickAlias *na;
 
 		if (Config->RestrictMail && (!u->Account() || !u->Account()->HasCommand("nickserv/resetpass")))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		if (!(na = findnick(params[0])))
-			source.Reply(NICK_X_NOT_REGISTERED, params[0].c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, params[0].c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else
 		{
 			if (SendResetEmail(u, na))
 			{
 				Log(LOG_COMMAND, u, this) << "for " << na->nick << " (group: " << na->nc->display << ")";
-				source.Reply(NICK_RESETPASS_COMPLETE, na->nick.c_str());
+				source.Reply(_("Password reset email for \002%s\002 has been sent."), na->nick.c_str());
 			}
 		}
 
@@ -48,18 +48,20 @@ class CommandNSResetPass : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_RESETPASS);
+		source.Reply(_("Syntax: \002RESETPASS \037nickname\037\002\n"
+				"Sends a code key to the nickname with instructions on how to\n"
+				"reset their password."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "RESETPASS", NICK_RESETPASS_SYNTAX);
+		SyntaxError(source, "RESETPASS", _("RESETPASS \037nickname\037\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_RESETPASS);
+		source.Reply(_("    RESETPASS  Helps you reset lost passwords"));
 	}
 };
 
@@ -97,7 +99,7 @@ class NSResetPass : public Module
 				{
 					na->nc->Shrink("ns_resetpass_code");
 					na->nc->Shrink("ns_resetpass_time");
-					source.Reply(NICK_CONFIRM_EXPIRED);
+					source.Reply(_("Your password reset request has expired."));
 					return EVENT_STOP;
 				}
 
@@ -117,7 +119,7 @@ class NSResetPass : public Module
 					FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u));
 
 					Log(LOG_COMMAND, u, &commandnsresetpass) << "confirmed RESETPASS to forcefully identify to " << na->nick;
-					source.Reply(NICK_CONFIRM_SUCCESS, Config->s_NickServ.c_str());
+					source.Reply(_("You are now identified for your nick. Change your password using \"%R%s SET PASSWORD \002newpassword\002\" now."), Config->s_NickServ.c_str());
 
 					if (ircd->vhost)
 						do_on_id(u);
@@ -128,7 +130,7 @@ class NSResetPass : public Module
 				else
 				{
 					Log(LOG_COMMAND, u, &commandnsresetpass) << "invalid confirm passcode for " << na->nick;
-					source.Reply(NICK_CONFIRM_INVALID);
+					source.Reply(LanguageString::NICK_CONFIRM_INVALID);
 					bad_password(u);
 				}
 
@@ -144,7 +146,7 @@ static bool SendResetEmail(User *u, NickAlias *na)
 {
 	char subject[BUFSIZE], message[BUFSIZE];
 
-	snprintf(subject, sizeof(subject), GetString(na->nc, NICK_RESETPASS_SUBJECT).c_str(), na->nick.c_str());
+	snprintf(subject, sizeof(subject), GetString(na->nc, _("Reset password request for %s")).c_str(), na->nick.c_str());
 
 	int min = 1, max = 62;
 	int chars[] = {
@@ -160,7 +162,15 @@ static bool SendResetEmail(User *u, NickAlias *na)
 	for (idx = 0; idx < 20; ++idx)
 		passcode += chars[1 + static_cast<int>((static_cast<float>(max - min)) * getrandom16() / 65536.0) + min];
 
-	snprintf(message, sizeof(message), GetString(na->nc, NICK_RESETPASS_MESSAGE).c_str(), na->nick.c_str(), Config->s_NickServ.c_str(), passcode.c_str(), Config->NetworkName.c_str());
+	snprintf(message, sizeof(message), GetString(na->nc, 
+	"Hi,\n"
+	" \n"
+	"You have requested to have the password for %s reset.\n"
+	"To reset your password, type \002%R%s CONFIRM %s\002\n"
+	" \n"
+	"If you don't know why this mail was sent to you, please ignore it silently.\n"
+	" \n"
+	"%s administrators.").c_str(), na->nick.c_str(), Config->s_NickServ.c_str(), passcode.c_str(), Config->NetworkName.c_str());
 
 	na->nc->Shrink("ns_resetpass_code");
 	na->nc->Shrink("ns_resetpass_time");
diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp
index 4cadaeba4..66c4b6ef7 100644
--- a/modules/core/ns_saset.cpp
+++ b/modules/core/ns_saset.cpp
@@ -36,17 +36,17 @@ class CommandNSSASet : public Command
 
 		if (readonly)
 		{
-			source.Reply(NICK_SET_DISABLED);
+			source.Reply(LanguageString::NICK_SET_DISABLED);
 			return MOD_CONT;
 		}
 
 		NickAlias *na = findnick(nick);
 		if (!na)
-			source.Reply(NICK_SASET_BAD_NICK, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else if (na->nc->HasFlag(NI_SUSPENDED))
-			source.Reply(NICK_X_SUSPENDED, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, na->nick.c_str());
 		else
 		{
 			Command *c = this->FindCommand(params[1]);
@@ -64,7 +64,7 @@ class CommandNSSASet : public Command
 				mod_run_cmd(NickServ, u, c, params[1], cmdparams, false);
 			}
 			else
-				source.Reply(NICK_SASET_UNKNOWN_OPTION, cmd.c_str());
+				source.Reply(_("Unknown SASET option \002%s\002."), cmd.c_str());
 		}
 
 		return MOD_CONT;
@@ -74,10 +74,14 @@ class CommandNSSASet : public Command
 	{
 		if (subcommand.empty())
 		{
-			source.Reply(NICK_HELP_SASET_HEAD);
+			source.Reply(_("Syntax: \002SASET \037nickname\037 \037option\037 \037parameters\037\002.\n"
+					" \n"
+					"Sets various nickname options. \037option\037 can be one of:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(NICK_HELP_SASET_TAIL);
+			source.Reply(_("Type \002%R%S HELP SASET \037option\037\002 for more information\n"
+					"on a specific option. The options will be set on the given\n"
+					"\037nickname\037."));
 			return true;
 		}
 		else
@@ -93,12 +97,12 @@ class CommandNSSASet : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SASET", NICK_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET);
+		source.Reply(_("    SASET      Set SET-options on another nickname"));
 	}
 
 	bool AddSubcommand(Module *creator, Command *c)
@@ -141,30 +145,33 @@ class CommandNSSASetDisplay : public Command
 		NickAlias *na = findnick(params[1]);
 		if (!na || na->nc != nc)
 		{
-			source.Reply(NICK_SASET_DISPLAY_INVALID, nc->display.c_str());
+			source.Reply(LanguageString::NICK_SASET_DISPLAY_INVALID, nc->display.c_str());
 			return MOD_CONT;
 		}
 
 		change_core_display(nc, params[1]);
-		source.Reply(NICK_SET_DISPLAY_CHANGED, nc->display.c_str());
+		source.Reply(LanguageString::NICK_SET_DISPLAY_CHANGED, nc->display.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_DISPLAY);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 DISPLAY \037new-display\037\002\n"
+				" \n"
+				"Changes the display used to refer to the nickname group in \n"
+				"Services. The new display MUST be a nick of the group."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SASET", NICK_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_DISPLAY);
+		source.Reply(_("    DISPLAY    Set the display of the group in Services"));
 	}
 };
 
@@ -187,32 +194,32 @@ class CommandNSSASetPassword : public Command
 
 		if (Config->NSSecureAdmins && u->Account() != nc && nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 		else if (nc->display.equals_ci(params[1]) || (Config->StrictPasswords && len < 5))
 		{
-			source.Reply(MORE_OBSCURE_PASSWORD);
+			source.Reply(LanguageString::MORE_OBSCURE_PASSWORD);
 			return MOD_CONT;
 		}
 		else if (len > Config->PassLen)
 		{
-			source.Reply(PASSWORD_TOO_LONG);
+			source.Reply(LanguageString::PASSWORD_TOO_LONG);
 			return MOD_CONT;
 		}
 
 		if (enc_encrypt(params[1], nc->pass))
 		{
 			Log(NickServ) << "Failed to encrypt password for " << nc->display << " (saset)";
-			source.Reply(NICK_SASET_PASSWORD_FAILED, nc->display.c_str());
+			source.Reply(LanguageString::NICK_SASET_PASSWORD_FAILED, nc->display.c_str());
 			return MOD_CONT;
 		}
 
 		Anope::string tmp_pass;
 		if (enc_decrypt(nc->pass, tmp_pass) == 1)
-			source.Reply(NICK_SASET_PASSWORD_CHANGED_TO, nc->display.c_str(), tmp_pass.c_str());
+			source.Reply(LanguageString::NICK_SASET_PASSWORD_CHANGED_TO, nc->display.c_str(), tmp_pass.c_str());
 		else
-			source.Reply(NICK_SASET_PASSWORD_CHANGED, nc->display.c_str());
+			source.Reply(LanguageString::NICK_SASET_PASSWORD_CHANGED, nc->display.c_str());
 
 		if (Config->WallSetpass)
 			ircdproto->SendGlobops(NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick.c_str(), nc->display.c_str());
@@ -222,18 +229,20 @@ class CommandNSSASetPassword : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_PASSWORD);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 PASSWORD \037new-password\037\002\n"
+				" \n"
+				"Changes the password used to identify as the nick's owner."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET", NICK_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_PASSWORD);
+		source.Reply(_("    PASSWORD   Set the nickname password"));
 	}
 };
 
diff --git a/modules/core/ns_saset_noexpire.cpp b/modules/core/ns_saset_noexpire.cpp
index 296195785..bc7103aae 100644
--- a/modules/core/ns_saset_noexpire.cpp
+++ b/modules/core/ns_saset_noexpire.cpp
@@ -31,12 +31,12 @@ class CommandNSSASetNoexpire : public Command
 		if (param.equals_ci("ON"))
 		{
 			na->SetFlag(NS_NO_EXPIRE);
-			source.Reply(NICK_SASET_NOEXPIRE_ON, na->nick.c_str());
+			source.Reply(_("Nick %s \002will not\002 expire."), na->nick.c_str());
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			na->UnsetFlag(NS_NO_EXPIRE);
-			source.Reply(NICK_SASET_NOEXPIRE_OFF, na->nick.c_str());
+			source.Reply(_("Nick %s \002will\002 expire."), na->nick.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "NOEXPIRE");
@@ -46,18 +46,21 @@ class CommandNSSASetNoexpire : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_NOEXPIRE);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 NOEXPIRE {ON | OFF}\002\n"
+				" \n"
+				"Sets whether the given nickname will expire.  Setting this\n"
+				"to \002ON\002 prevents the nickname from expiring."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX);
+		SyntaxError(source, "SASET NOEXPIRE", _("SASET \037nickname\037 NOEXPIRE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_NOEXPIRE);
+		source.Reply(_("    NOEXPIRE   Prevent the nickname from expiring"));
 	}
 };
 
diff --git a/modules/core/ns_sendpass.cpp b/modules/core/ns_sendpass.cpp
index 09729f81c..d232f8f16 100644
--- a/modules/core/ns_sendpass.cpp
+++ b/modules/core/ns_sendpass.cpp
@@ -30,11 +30,11 @@ class CommandNSSendPass : public Command
 		NickAlias *na;
 
 		if (Config->RestrictMail && (!u->Account() || !u->Account()->HasCommand("nickserv/sendpass")))
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 		else if (!(na = findnick(nick)))
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 		else
 		{
 			Anope::string tmp_pass;
@@ -43,11 +43,11 @@ class CommandNSSendPass : public Command
 				if (SendPassMail(u, na, tmp_pass))
 				{
 					Log(Config->RestrictMail ? LOG_ADMIN : LOG_COMMAND, u, this) << "for " << na->nick;
-					source.Reply(NICK_SENDPASS_OK, nick.c_str());
+					source.Reply(_("Password of \002%s\002 has been sent."), nick.c_str());
 				}
 			}
 			else
-				source.Reply(NICK_SENDPASS_UNAVAILABLE);
+				source.Reply(_("SENDPASS command unavailable because encryption is in use."));
 		}
 
 		return MOD_CONT;
@@ -55,18 +55,24 @@ class CommandNSSendPass : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_SENDPASS);
+		source.Reply(_("Syntax: \002SENDPASS \037nickname\037\002\n"
+				" \n"
+				"Send the password of the given nickname to the e-mail address\n"
+				"set in the nickname record. This command is really useful\n"
+				"to deal with lost passwords.\n"
+				" \n"
+				"May be limited to \002IRC operators\002 on certain networks."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SENDPASS", NICK_SENDPASS_SYNTAX);
+		SyntaxError(source, "SENDPASS", _("SENDPASS \037nickname\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SENDPASS);
+		source.Reply(_("    SENDPASS   Forgot your password? Try this"));
 	}
 };
 
@@ -95,8 +101,16 @@ static bool SendPassMail(User *u, NickAlias *na, const Anope::string &pass)
 {
 	char subject[BUFSIZE], message[BUFSIZE];
 
-	snprintf(subject, sizeof(subject), GetString(na->nc, NICK_SENDPASS_SUBJECT).c_str(), na->nick.c_str());
-	snprintf(message, sizeof(message), GetString(na->nc, NICK_SENDPASS).c_str(), na->nick.c_str(), pass.c_str(), Config->NetworkName.c_str());
+	snprintf(subject, sizeof(subject), GetString(na->nc, "Nickname password (%s)").c_str(), na->nick.c_str());
+	snprintf(message, sizeof(message), GetString(na->nc, 
+	"Hi,\n"
+	" \n"
+	"You have requested to receive the password of nickname %s by e-mail.\n"
+	"The password is %s. For security purposes, you should change it as soon as you receive this mail.\n"
+	" \n"
+	"If you don't know why this mail was sent to you, please ignore it silently.\n"
+	" \n"
+	"%s administrators.").c_str(), na->nick.c_str(), pass.c_str(), Config->NetworkName.c_str());
 
 	return Mail(u, na->nc, NickServ, subject, message);
 }
diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp
index 482f43d1e..703bec9df 100644
--- a/modules/core/ns_set.cpp
+++ b/modules/core/ns_set.cpp
@@ -34,13 +34,13 @@ class CommandNSSet : public Command
 
 		if (readonly)
 		{
-			source.Reply(NICK_SET_DISABLED);
+			source.Reply(LanguageString::NICK_SET_DISABLED);
 			return MOD_CONT;
 		}
 
 		if (u->Account()->HasFlag(NI_SUSPENDED))
 		{
-			source.Reply(NICK_X_SUSPENDED, u->Account()->display.c_str());
+			source.Reply(LanguageString::NICK_X_SUSPENDED, u->Account()->display.c_str());
 			return MOD_CONT;
 		}
 
@@ -59,7 +59,7 @@ class CommandNSSet : public Command
 			mod_run_cmd(NickServ, u, c, params[0], cmdparams, false);
 		}
 		else
-			source.Reply(NICK_SET_UNKNOWN_OPTION, params[0].c_str());
+			source.Reply(LanguageString::NICK_SET_UNKNOWN_OPTION, params[0].c_str());
 
 		return MOD_CONT;
 	}
@@ -68,10 +68,17 @@ class CommandNSSet : public Command
 	{
 		if (subcommand.empty())
 		{
-			source.Reply(NICK_HELP_SET_HEAD);
+			source.Reply(_("Syntax: \002SET \037option\037 \037parameters\037\002\n"
+					" \n"
+					"Sets various nickname options.  \037option\037 can be one of:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(NICK_HELP_SET_TAIL);
+			source.Reply(_("In order to use this command, you must first identify\n"
+					"with your password (\002%R%S HELP IDENTIFY\002 for more\n"
+					"information).\n"
+					" \n"
+					"Type \002%R%S HELP SET \037option\037\002 for more information\n"
+					"on a specific option."));
 			return true;
 		}
 		else
@@ -87,12 +94,12 @@ class CommandNSSet : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SET", NICK_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET);
+		source.Reply(_("    SET        Set options, including kill protection"));
 	}
 
 	bool AddSubcommand(Module *creator, Command *c)
@@ -132,30 +139,33 @@ class CommandNSSetDisplay : public Command
 
 		if (!na || na->nc != u->Account())
 		{
-			source.Reply(NICK_SASET_DISPLAY_INVALID, u->Account()->display.c_str());
+			source.Reply(LanguageString::NICK_SASET_DISPLAY_INVALID, u->Account()->display.c_str());
 			return MOD_CONT;
 		}
 
 		change_core_display(u->Account(), params[1]);
-		source.Reply(NICK_SET_DISPLAY_CHANGED, u->Account()->display.c_str());
+		source.Reply(LanguageString::NICK_SET_DISPLAY_CHANGED, u->Account()->display.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_DISPLAY);
+		source.Reply(_("Syntax: \002SET DISPLAY \037new-display\037\002\n"
+				" \n"
+				"Changes the display used to refer to your nickname group in \n"
+				"Services. The new display MUST be a nick of your group."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SET", NICK_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_DISPLAY);
+		source.Reply(_("    DISPLAY    Set the display of your group in Services"));
 	}
 };
 
@@ -175,46 +185,49 @@ class CommandNSSetPassword : public Command
 
 		if (u->Account()->display.equals_ci(param) || (Config->StrictPasswords && len < 5))
 		{
-			source.Reply(MORE_OBSCURE_PASSWORD);
+			source.Reply(LanguageString::MORE_OBSCURE_PASSWORD);
 			return MOD_CONT;
 		}
 		else if (len > Config->PassLen)
 		{
-			source.Reply(PASSWORD_TOO_LONG);
+			source.Reply(LanguageString::PASSWORD_TOO_LONG);
 			return MOD_CONT;
 		}
 
 		if (enc_encrypt(param, u->Account()->pass) < 0)
 		{
 			Log(NickServ) << "Failed to encrypt password for " << u->Account()->display << " (set)";
-			source.Reply(NICK_SASET_PASSWORD_FAILED);
+			source.Reply(LanguageString::NICK_SASET_PASSWORD_FAILED);
 			return MOD_CONT;
 		}
 
 		Anope::string tmp_pass;
 		if (enc_decrypt(u->Account()->pass, tmp_pass) == 1)
-			source.Reply(NICK_SASET_PASSWORD_CHANGED_TO, u->Account()->display.c_str(), tmp_pass.c_str());
+			source.Reply(LanguageString::NICK_SASET_PASSWORD_CHANGED_TO, u->Account()->display.c_str(), tmp_pass.c_str());
 		else
-			source.Reply(NICK_SASET_PASSWORD_CHANGED, u->Account()->display.c_str());
+			source.Reply(LanguageString::NICK_SASET_PASSWORD_CHANGED, u->Account()->display.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_PASSWORD);
+		source.Reply(_("Syntax: \002SET PASSWORD \037new-password\037\002\n"
+				" \n"
+				"Changes the password used to identify you as the nick's\n"
+				"owner."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
 		// XXX
-		SyntaxError(source, "SET", NICK_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_PASSWORD);
+		source.Reply(_("    PASSWORD   Set your nickname password"));
 	}
 };
 
diff --git a/modules/core/ns_set_autoop.cpp b/modules/core/ns_set_autoop.cpp
index 61ebb78a2..a7fc9f9fa 100644
--- a/modules/core/ns_set_autoop.cpp
+++ b/modules/core/ns_set_autoop.cpp
@@ -32,12 +32,12 @@ class CommandNSSetAutoOp : public Command
 		if (param.equals_ci("ON"))
 		{
 			nc->SetFlag(NI_AUTOOP);
-			source.Reply(NICK_SASET_AUTOOP_ON, nc->display.c_str());
+			source.Reply(_("Services will now autoop %s in channels."), nc->display.c_str());
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			nc->UnsetFlag(NI_AUTOOP);
-			source.Reply(NICK_SASET_AUTOOP_OFF, nc->display.c_str());
+			source.Reply(_("Services will no longer autoop %s in channels."), nc->display.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "AUTOOP");
@@ -47,18 +47,21 @@ class CommandNSSetAutoOp : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_AUTOOP);
+		source.Reply(_("Syntax: \002SET AUTOOP {ON | OFF}\002\n"
+				" \n"
+				"Sets whether you will be opped automatically. Set to ON to \n"
+				"allow ChanServ to op you automatically when entering channels."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX);
+		SyntaxError(source, "SET AUTOOP", _("SET AUTOOP {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_AUTOOP);
+		source.Reply(_("    AUTOOP     Should services op you automatically.    "));
 	}
 };
 
@@ -71,18 +74,22 @@ class CommandNSSASetAutoOp : public CommandNSSetAutoOp
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_AUTOOP);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 AUTOOP {ON | OFF}\002\n"
+				" \n"
+				"Sets whether the given nickname will be opped automatically.\n"
+				"Set to \002ON\002 to allow ChanServ to op the given nickname \n"
+				"omatically when joining channels."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX);
+		SyntaxError(source, "SET AUTOOP", _("SASET \037nickname\037 AUTOOP {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_AUTOOP);
+		source.Reply(_("    AUTOOP     Turn autoop on or off"));
 	}
 };
 
diff --git a/modules/core/ns_set_email.cpp b/modules/core/ns_set_email.cpp
index 227941acd..41aa84e31 100644
--- a/modules/core/ns_set_email.cpp
+++ b/modules/core/ns_set_email.cpp
@@ -32,29 +32,29 @@ class CommandNSSetEmail : public Command
 
 		if (param.empty() && Config->NSForceEmail)
 		{
-			source.Reply(NICK_SET_EMAIL_UNSET_IMPOSSIBLE);
+			source.Reply(_("You cannot unset the e-mail on this network."));
 			return MOD_CONT;
 		}
 		else if (Config->NSSecureAdmins && u->Account() != nc && nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 		else if (!param.empty() && !MailValidate(param))
 		{
-			source.Reply(MAIL_X_INVALID, param.c_str());
+			source.Reply(LanguageString::MAIL_X_INVALID, param.c_str());
 			return MOD_CONT;
 		}
 
 		if (!param.empty())
 		{
 			nc->email = param;
-			source.Reply(NICK_SASET_EMAIL_CHANGED, nc->display.c_str(), param.c_str());
+			source.Reply(_("E-mail address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
 		}
 		else
 		{
 			nc->email.clear();
-			source.Reply(NICK_SASET_EMAIL_UNSET, nc->display.c_str());
+			source.Reply(_("E-mail address for \002%s\002 unset."), nc->display.c_str());
 		}
 
 		return MOD_CONT;
@@ -62,13 +62,17 @@ class CommandNSSetEmail : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_EMAIL);
+		source.Reply(_("Syntax: \002SET EMAIL \037address\037\002\n"
+				" \n"
+				"Associates the given E-mail address with your nickname.\n"
+				"This address will be displayed whenever someone requests\n"
+				"information on the nickname with the \002INFO\002 command."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_EMAIL);
+		source.Reply(_("    EMAIL      Associate an E-mail address with your nickname"));
 	}
 };
 
@@ -81,13 +85,15 @@ class CommandNSSASetEmail : public CommandNSSetEmail
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_EMAIL);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 EMAIL \037address\037\002\n"
+				" \n"
+				"Associates the given E-mail address with the nickname."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_EMAIL);
+		source.Reply(_("    EMAIL      Associate an E-mail address with the nickname"));
 	}
 };
 
diff --git a/modules/core/ns_set_greet.cpp b/modules/core/ns_set_greet.cpp
index ab1733fa8..d0c0bdcd9 100644
--- a/modules/core/ns_set_greet.cpp
+++ b/modules/core/ns_set_greet.cpp
@@ -32,12 +32,12 @@ class CommandNSSetGreet : public Command
 		if (!param.empty())
 		{
 			nc->greet = param;
-			source.Reply(NICK_SASET_GREET_CHANGED, nc->display.c_str(), nc->greet.c_str());
+			source.Reply(_("Greet message for \002%s\002 changed to \002%s\002."), nc->display.c_str(), nc->greet.c_str());
 		}
 		else
 		{
 			nc->greet.clear();
-			source.Reply(NICK_SASET_GREET_UNSET, nc->display.c_str());
+			source.Reply(_("Greet message for \002%s\002 unset."), nc->display.c_str());
 		}
 
 		return MOD_CONT;
@@ -45,13 +45,18 @@ class CommandNSSetGreet : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_GREET);
+		source.Reply(_("Syntax: \002SET GREET \037message\037\002\n"
+				" \n"
+				"Makes the given message the greet of your nickname, that\n"
+				"will be displayed when joining a channel that has GREET\n"
+				"option enabled, provided that you have the necessary \n"
+				"access on it."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_GREET);
+		source.Reply(_("    GREET      Associate a greet message with your nickname"));
 	}
 };
 
@@ -64,13 +69,18 @@ class CommandNSSASetGreet : public CommandNSSetGreet
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_GREET);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 GREET \037message\037\002\n"
+				" \n"
+				"Makes the given message the greet of the nickname, that\n"
+				"will be displayed when joining a channel that has GREET\n"
+				"option enabled, provided that the user has the necessary \n"
+				"access on it."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_GREET);
+		source.Reply(_("    GREET      Associate a greet message with the nickname"));
 	}
 };
 
diff --git a/modules/core/ns_set_hide.cpp b/modules/core/ns_set_hide.cpp
index f7685cfc2..460dbebaa 100644
--- a/modules/core/ns_set_hide.cpp
+++ b/modules/core/ns_set_hide.cpp
@@ -27,7 +27,7 @@ class CommandNSSetHide : public Command
 			throw CoreException("NULL na in CommandNSSetHide");
 		NickCore *nc = na->nc;
 
-		LanguageString onmsg, offmsg;
+		Anope::string onmsg, offmsg;
 		NickCoreFlag flag;
 
 		Anope::string param = params[1];
@@ -36,26 +36,26 @@ class CommandNSSetHide : public Command
 		if (param.equals_ci("EMAIL"))
 		{
 			flag = NI_HIDE_EMAIL;
-			onmsg = NICK_SASET_HIDE_EMAIL_ON;
-			offmsg = NICK_SASET_HIDE_EMAIL_OFF;
+			onmsg = _("The E-mail address of \002%s\002 will now be hidden from %s INFO displays.");
+			offmsg = _("The E-mail address of \002%s\002 will now be shown in %s INFO displays.");
 		}
 		else if (param.equals_ci("USERMASK"))
 		{
 			flag = NI_HIDE_MASK;
-			onmsg = NICK_SASET_HIDE_MASK_ON;
-			offmsg = NICK_SASET_HIDE_MASK_OFF;
+			onmsg = _("The last seen user@host mask of \002%s\002 will now be hidden from %s INFO displays.");
+			offmsg = _("The last seen user@host mask of \002%s\002 will now be shown in %s INFO displays.");
 		}
 		else if (param.equals_ci("STATUS"))
 		{
 			flag = NI_HIDE_STATUS;
-			onmsg = NICK_SASET_HIDE_STATUS_ON;
-			offmsg = NICK_SASET_HIDE_STATUS_OFF;
+			onmsg = _("The services access status of \002%s\002 will now be hidden from %s INFO displays.");
+			offmsg = _("The services access status of \002%s\002 will now be shown in %s INFO displays.");
 		}
 		else if (param.equals_ci("QUIT"))
 		{
 			flag = NI_HIDE_QUIT;
-			onmsg = NICK_SASET_HIDE_QUIT_ON;
-			offmsg = NICK_SASET_HIDE_QUIT_OFF;
+			onmsg = _("The last quit message of \002%s\002 will now be hidden from %s INFO displays.");
+			offmsg = _("The last quit message of \002%s\002 will now be shown in %s INFO displays.");
 		}
 		else
 		{
@@ -66,12 +66,12 @@ class CommandNSSetHide : public Command
 		if (arg.equals_ci("ON"))
 		{
 			nc->SetFlag(flag);
-			source.Reply(onmsg, nc->display.c_str(), Config->s_NickServ.c_str());
+			source.Reply(onmsg.c_str(), nc->display.c_str(), Config->s_NickServ.c_str());
 		}
 		else if (arg.equals_ci("OFF"))
 		{
 			nc->UnsetFlag(flag);
-			source.Reply(offmsg, nc->display.c_str(), Config->s_NickServ.c_str());
+			source.Reply(offmsg.c_str(), nc->display.c_str(), Config->s_NickServ.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "HIDE");
@@ -81,18 +81,26 @@ class CommandNSSetHide : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_HIDE);
+		source.Reply(_("Syntax: \002SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\002\n"
+				" \n"
+				"Allows you to prevent certain pieces of information from\n"
+				"being displayed when someone does a %S \002INFO\002 on your\n"
+				"nick.  You can hide your E-mail address (\002EMAIL\002), last seen\n"
+				"user@host mask (\002USERMASK\002), your services access status\n"
+				"(\002STATUS\002) and  last quit message (\002QUIT\002).\n"
+				"The second parameter specifies whether the information should\n"
+				"be displayed (\002OFF\002) or hidden (\002ON\002)."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET HIDE", NICK_SET_HIDE_SYNTAX);
+		SyntaxError(source, "SET HIDE", _("SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_HIDE);
+		source.Reply(_("    HIDE       Hide certain pieces of nickname information"));
 	}
 };
 
@@ -105,18 +113,26 @@ class CommandNSSASetHide : public CommandNSSetHide
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_HIDE);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\002\n"
+				" \n"
+				"Allows you to prevent certain pieces of information from\n"
+				"being displayed when someone does a %S \002INFO\002 on the\n"
+				"nick.  You can hide the E-mail address (\002EMAIL\002), last seen\n"
+				"user@host mask (\002USERMASK\002), the services access status\n"
+				"(\002STATUS\002) and  last quit message (\002QUIT\002).\n"
+				"The second parameter specifies whether the information should\n"
+				"be displayed (\002OFF\002) or hidden (\002ON\002)."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
+		SyntaxError(source, "SASET HIDE", _("SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_HIDE);
+		source.Reply(_("    HIDE       Hide certain pieces of nickname information"));
 	}
 };
 
diff --git a/modules/core/ns_set_kill.cpp b/modules/core/ns_set_kill.cpp
index 2e8b86320..35cca658d 100644
--- a/modules/core/ns_set_kill.cpp
+++ b/modules/core/ns_set_kill.cpp
@@ -35,14 +35,14 @@ class CommandNSSetKill : public Command
 			nc->SetFlag(NI_KILLPROTECT);
 			nc->UnsetFlag(NI_KILL_QUICK);
 			nc->UnsetFlag(NI_KILL_IMMED);
-			source.Reply(NICK_SASET_KILL_ON, nc->display.c_str());
+			source.Reply(_("Protection is now \002\002 for \002%s\002."), nc->display.c_str());
 		}
 		else if (param.equals_ci("QUICK"))
 		{
 			nc->SetFlag(NI_KILLPROTECT);
 			nc->SetFlag(NI_KILL_QUICK);
 			nc->UnsetFlag(NI_KILL_IMMED);
-			source.Reply(NICK_SASET_KILL_QUICK, nc->display.c_str());
+			source.Reply(_("Protection is now \002\002 for \002%s\002, with a reduced delay."), nc->display.c_str());
 		}
 		else if (param.equals_ci("IMMED"))
 		{
@@ -51,17 +51,17 @@ class CommandNSSetKill : public Command
 				nc->SetFlag(NI_KILLPROTECT);
 				nc->SetFlag(NI_KILL_IMMED);
 				nc->UnsetFlag(NI_KILL_QUICK);
-				source.Reply(NICK_SASET_KILL_IMMED, nc->display.c_str());
+				source.Reply(_("Protection is now \002\002 for \002%s\002, with no delay."), nc->display.c_str());
 			}
 			else
-				source.Reply(NICK_SET_KILL_IMMED_DISABLED);
+				source.Reply(_("The \002IMMED\002 option is not available on this network."));
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			nc->UnsetFlag(NI_KILLPROTECT);
 			nc->UnsetFlag(NI_KILL_QUICK);
 			nc->UnsetFlag(NI_KILL_IMMED);
-			source.Reply(NICK_SASET_KILL_OFF, nc->display.c_str());
+			source.Reply(_("Protection is now \002\002 for \002%s\002."), nc->display.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "KILL");
@@ -71,18 +71,31 @@ class CommandNSSetKill : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_KILL);
+		source.Reply(_("Syntax: \002SET KILL {ON | QUICK | IMMED | OFF}\002\n"
+				" \n"
+				"Turns the automatic protection option for your nick\n"
+				"on or off.  With protection on, if another user\n"
+				"tries to take your nick, they will be given one minute to\n"
+				"change to another nick, after which %S will forcibly change\n"
+				"their nick.\n"
+				" \n"
+				"If you select \002QUICK\002, the user will be given only 20 seconds\n"
+				"to change nicks instead of the usual 60.  If you select\n"
+				"\002IMMED\002, user's nick will be changed immediately \037without\037 being\n"
+				"warned first or given a chance to change their nick; please\n"
+				"do not use this option unless necessary. Also, your\n"
+				"network's administrators may have disabled this option."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET KILL", Config->NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX : NICK_SET_KILL_SYNTAX);
+		SyntaxError(source, "SET KILL", Config->NSAllowKillImmed ? _("SET KILL {ON | QUICK | IMMED | OFF}") : _("SET KILL {ON | QUICK | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_KILL);
+		source.Reply(_("    KILL       Turn protection on or off"));
 	}
 };
 
@@ -95,18 +108,31 @@ class CommandNSSASetKill : public CommandNSSetKill
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_KILL);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 KILL {ON | QUICK | IMMED | OFF}\002\n"
+				" \n"
+				"Turns the automatic protection option for the nick\n"
+				"on or off. With protection on, if another user\n"
+				"tries to take the nick, they will be given one minute to\n"
+				"change to another nick, after which %S will forcibly change\n"
+				"their nick.\n"
+				" \n"
+				"If you select \002QUICK\002, the user will be given only 20 seconds\n"
+				"to change nicks instead of the usual 60. If you select\n"
+				"\002IMMED\002, the user's nick will be changed immediately \037without\037 being\n"
+				"warned first or given a chance to change their nick; please\n"
+				"do not use this option unless necessary. Also, your\n"
+				"network's administrators may have disabled this option."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET KILL", Config->NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX : NICK_SASET_KILL_SYNTAX);
+		SyntaxError(source, "SASET KILL", Config->NSAllowKillImmed ? _("SASET \037nickname\037 KILL {ON | QUICK | IMMED | OFF}") : _("SASET \037nickname\037 KILL {ON | QUICK | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_KILL);
+		source.Reply(_("    KILL       Turn protection on or off"));
 	}
 };
 
diff --git a/modules/core/ns_set_language.cpp b/modules/core/ns_set_language.cpp
index 9f81a43f0..e942be388 100644
--- a/modules/core/ns_set_language.cpp
+++ b/modules/core/ns_set_language.cpp
@@ -41,18 +41,28 @@ class CommandNSSetLanguage : public Command
 		}
 
 		nc->language = param != "en" ? param : "";
-		source.Reply(NICK_SET_LANGUAGE_CHANGED);
+		PopLanguage();
+		PushLanguage("anope", nc->language);
+		source.Reply(_("Language changed to \002English\002."));
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_LANGUAGE);
+		source.Reply(_("Syntax: \002SET LANGUAGE \037language\037\002\n"
+				" \n"
+				"Changes the language Services uses when sending messages to\n"
+				"you (for example, when responding to a command you send).\n"
+				"\037language\037 should be chosen from the following list of\n"
+				"supported languages:"));
+
 		source.Reply("         en (English)");
 		for (unsigned j = 0; j < languages.size(); ++j)
 		{
-			const Anope::string &langname = GetString(languages[j], LANGUAGE_NAME);
+			PushLanguage("anope", languages[j]);
+			const Anope::string &langname = _("English");
+			PopLanguage();
 			if (langname == "English")
 				continue;
 			source.Reply("         %s (%s)", languages[j].c_str(), langname.c_str());
@@ -63,12 +73,14 @@ class CommandNSSetLanguage : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET LANGUAGE", NICK_SET_LANGUAGE_SYNTAX);
+		SyntaxError(source, "SET LANGUAGE", _("SET LANGUAGE \037language\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_LANGUAGE);
+		source.Reply(_("    LANGUAGE   Set the language Services will use when\n"
+				"                   sending messages to you"));
+
 	}
 };
 
@@ -81,18 +93,28 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_LANGUAGE);
+		source.Reply(_("Syntax: \002SET LANGUAGE \037language\037\002\n"
+				" \n"
+				"Changes the language Services uses when sending messages to\n"
+				"you (for example, when responding to a command you send).\n"
+				"\037language\037 should be chosen from the following list of\n"
+				"supported languages:"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET LANGUAGE", NICK_SASET_LANGUAGE_SYNTAX);
+		SyntaxError(source, "SASET LANGUAGE", _("SASET \037nickname\037 LANGUAGE \037number\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_LANGUAGE);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 LANGUAGE \037language\037\002\n"
+				" \n"
+				"Changes the language Services uses when sending messages to\n"
+				"\037nickname\037 (for example, when responding to a command he sends).\n"
+				"\037language\037 should be chosen from a list of supported languages\n"
+				"that you can get by typing \002%R%S HELP SET LANGUAGE\002."));
 	}
 };
 
diff --git a/modules/core/ns_set_message.cpp b/modules/core/ns_set_message.cpp
index 948a12f52..fc14e067d 100644
--- a/modules/core/ns_set_message.cpp
+++ b/modules/core/ns_set_message.cpp
@@ -29,7 +29,7 @@ class CommandNSSetMessage : public Command
 
 		if (!Config->UsePrivmsg)
 		{
-			source.Reply(NICK_SET_OPTION_DISABLED, "MSG");
+			source.Reply(_("Option \002%s\02 cannot be set on this network."), "MSG");
 			return MOD_CONT;
 		}
 
@@ -38,12 +38,12 @@ class CommandNSSetMessage : public Command
 		if (param.equals_ci("ON"))
 		{
 			nc->SetFlag(NI_MSG);
-			source.Reply(NICK_SASET_MSG_ON, nc->display.c_str());
+			source.Reply(_("Services will now reply to \002%s\002 with \002messages\002."), nc->display.c_str());
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			nc->UnsetFlag(NI_MSG);
-			source.Reply(NICK_SASET_MSG_OFF, nc->display.c_str());
+			source.Reply(_("Services will now reply to \002%s\002 with \002notices\002."), nc->display.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "MSG");
@@ -53,18 +53,22 @@ class CommandNSSetMessage : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_MSG);
+		source.Reply(_("Syntax: \002SET MSG {ON | OFF}\002\n"
+				" \n"
+				"Allows you to choose the way Services are communicating with \n"
+				"you. With \002MSG\002 set, Services will use messages, else they'll \n"
+				"use notices."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET MSG", NICK_SET_MSG_SYNTAX);
+		SyntaxError(source, "SET MSG", _("SET MSG {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_MSG);
+		source.Reply(_("    MSG        Change the communication method of Services"));
 	}
 };
 
@@ -77,18 +81,22 @@ class CommandNSSASetMessage : public CommandNSSetMessage
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_MSG);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 MSG {ON | OFF}\002\n"
+				" \n"
+				"Allows you to choose the way Services are communicating with \n"
+				"the given user. With \002MSG\002 set, Services will use messages,\n"
+				"else they'll use notices."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET MSG", NICK_SASET_MSG_SYNTAX);
+		SyntaxError(source, "SASET MSG", _("SASAET \037nickname\037 PRIVATE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_MSG);
+		source.Reply(_("    MSG        Change the communication method of Services"));
 	}
 };
 
diff --git a/modules/core/ns_set_private.cpp b/modules/core/ns_set_private.cpp
index 61d6f5bd8..70e93e27e 100644
--- a/modules/core/ns_set_private.cpp
+++ b/modules/core/ns_set_private.cpp
@@ -32,12 +32,12 @@ class CommandNSSetPrivate : public Command
 		if (param.equals_ci("ON"))
 		{
 			nc->SetFlag(NI_PRIVATE);
-			source.Reply(NICK_SASET_PRIVATE_ON, nc->display.c_str());
+			source.Reply(_("Private option is now \002\002 for \002%s\002."), nc->display.c_str());
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			nc->UnsetFlag(NI_PRIVATE);
-			source.Reply(NICK_SASET_PRIVATE_OFF, nc->display.c_str());
+			source.Reply(_("Private option is now \002\002 for \002%s\002."), nc->display.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "PRIVATE");
@@ -47,18 +47,24 @@ class CommandNSSetPrivate : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_PRIVATE);
+		source.Reply(_("Syntax: \002SET PRIVATE {ON | OFF}\002\n"
+				" \n"
+				"Turns %S's privacy option on or off for your nick.\n"
+				"With \002PRIVATE\002 set, your nickname will not appear in\n"
+				"nickname lists generated with %S's \002LIST\002 command.\n"
+				"(However, anyone who knows your nickname can still get\n"
+				"information on it using the \002INFO\002 command.)"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET PRIVATE", NICK_SET_PRIVATE_SYNTAX);
+		SyntaxError(source, "SET PRIVATE", _("SET PRIVATE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_PRIVATE);
+		source.Reply(_("    PRIVATE    Prevent the nickname from appearing in a \002%R%S LIST\002"));
 	}
 };
 
@@ -71,18 +77,23 @@ class CommandNSSASetPrivate : public CommandNSSetPrivate
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_PRIVATE);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 PRIVATE {ON | OFF}\002\n"
+				" \n"
+				"Turns %S's privacy option on or off for the nick.\n"
+				"With \002PRIVATE\002 set, the nickname will not appear in\n"
+				"nickname lists generated with %S's \002LIST\002 command.\n"
+				"(However, anyone who knows the nickname can still get\n"
+				"information on it using the \002INFO\002 command.)"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET PRIVATE", NICK_SASET_PRIVATE_SYNTAX);
+		SyntaxError(source, "SASET PRIVATE", _("SASET \037nickname\037 PRIVATE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SASET_PRIVATE);
 	}
 };
 
diff --git a/modules/core/ns_set_secure.cpp b/modules/core/ns_set_secure.cpp
index afcaf6db0..9c3ad7b60 100644
--- a/modules/core/ns_set_secure.cpp
+++ b/modules/core/ns_set_secure.cpp
@@ -32,12 +32,12 @@ class CommandNSSetSecure : public Command
 		if (param.equals_ci("ON"))
 		{
 			nc->SetFlag(NI_SECURE);
-			source.Reply(NICK_SASET_SECURE_ON, nc->display.c_str());
+			source.Reply(_("Secure option is now \002\002 for \002%s\002."), nc->display.c_str());
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			nc->UnsetFlag(NI_SECURE);
-			source.Reply(NICK_SASET_SECURE_OFF, nc->display.c_str());
+			source.Reply(_("Secure option is now \002\002 for \002%s\002."), nc->display.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "SECURE");
@@ -47,18 +47,26 @@ class CommandNSSetSecure : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SET_SECURE);
+		source.Reply(_("Syntax: \002SET SECURE {ON | OFF}\002\n"
+				" \n"
+				"Turns %S's security features on or off for your\n"
+				"nick. With \002SECURE\002 set, you must enter your password\n"
+				"before you will be recognized as the owner of the nick,\n"
+				"regardless of whether your address is on the access\n"
+				"list. However, if you are on the access list, %S\n"
+				"will not auto-kill you regardless of the setting of the\n"
+				"\002KILL\002 option."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET SECURE", NICK_SET_SECURE_SYNTAX);
+		SyntaxError(source, "SET SECURE", _("SET SECURE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_SECURE);
+		source.Reply(_("    SECURE     Turn nickname security on or off"));
 	}
 };
 
@@ -71,18 +79,26 @@ class CommandNSSASetSecure : public CommandNSSetSecure
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_SASET_SECURE);
+		source.Reply(_("Syntax: \002SASET \037nickname\037 SECURE {ON | OFF}\002\n"
+				" \n"
+				"Turns %S's security features on or off for your\n"
+				"nick. With \002SECURE\002 set, you must enter your password\n"
+				"before you will be recognized as the owner of the nick,\n"
+				"regardless of whether your address is on the access\n"
+				"list. However, if you are on the access list, %S\n"
+				"will not auto-kill you regardless of the setting of the\n"
+				"\002KILL\002 option."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET SECURE", NICK_SASET_SECURE_SYNTAX);
+		SyntaxError(source, "SASET SECURE", _("SASET \037nickname\037 SECURE {ON | OFF}"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SET_SECURE);
+		source.Reply(_("    SECURE     Turn nickname security on or off"));
 	}
 };
 
diff --git a/modules/core/ns_status.cpp b/modules/core/ns_status.cpp
index 824b9a7d4..5584d957d 100644
--- a/modules/core/ns_status.cpp
+++ b/modules/core/ns_status.cpp
@@ -33,31 +33,50 @@ class CommandNSStatus : public Command
 		{
 			User *u2 = finduser(nickbuf);
 			if (!u2) /* Nick is not online */
-				source.Reply(NICK_STATUS_REPLY, nickbuf.c_str(), 0, "");
+				source.Reply(_("STATUS %s %d %s"), nickbuf.c_str(), 0, "");
 			else if (u2->IsIdentified() && na && na->nc == u2->Account()) /* Nick is identified */
-				source.Reply(NICK_STATUS_REPLY, nickbuf.c_str(), 3, u2->Account()->display.c_str());
+				source.Reply(_("STATUS %s %d %s"), nickbuf.c_str(), 3, u2->Account()->display.c_str());
 			else if (u2->IsRecognized()) /* Nick is recognised, but NOT identified */
-				source.Reply(NICK_STATUS_REPLY, nickbuf.c_str(), 2, u2->Account() ? u2->Account()->display.c_str() : "");
+				source.Reply(_("STATUS %s %d %s"), nickbuf.c_str(), 2, u2->Account() ? u2->Account()->display.c_str() : "");
 			else if (!na) /* Nick is online, but NOT a registered */
-				source.Reply(NICK_STATUS_REPLY, nickbuf.c_str(), 0, "");
+				source.Reply(_("STATUS %s %d %s"), nickbuf.c_str(), 0, "");
 			else
 				/* Nick is not identified for the nick, but they could be logged into an account,
 				 * so we tell the user about it
 				 */
-				source.Reply(NICK_STATUS_REPLY, nickbuf.c_str(), 1, u2->Account() ? u2->Account()->display.c_str() : "");
+				source.Reply(_("STATUS %s %d %s"), nickbuf.c_str(), 1, u2->Account() ? u2->Account()->display.c_str() : "");
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_HELP_STATUS);
+		source.Reply(_("Syntax: \002STATUS \037nickname\037...\002\n"
+				" \n"
+				"Returns whether the user using the given nickname is\n"
+				"recognized as the owner of the nickname. The response has\n"
+				"this format:\n"
+				" \n"
+				"    \037nickname\037 \037status-code\037 \037account\037\n"
+				" \n"
+				"where \037nickname\037 is the nickname sent with the command,\n"
+				"\037status-code\037 is one of the following, and \037account\037\n"
+				"is the account they are logged in as.\n"
+				" \n"
+				"    0 - no such user online \002or\002 nickname not registered\n"
+				"    1 - user not recognized as nickname's owner\n"
+				"    2 - user recognized as owner via access list only\n"
+				"    3 - user recognized as owner via password identification\n"
+				" \n"
+				"Up to sixteen nicknames may be sent with each command; the\n"
+				"rest will be ignored. If no nickname is given, your status\n"
+				"will be returned."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_STATUS);
+		source.Reply(_("    STATUS     Returns the owner status of the given nickname"));
 	}
 };
 
diff --git a/modules/core/ns_suspend.cpp b/modules/core/ns_suspend.cpp
index c07999762..70a8ea122 100644
--- a/modules/core/ns_suspend.cpp
+++ b/modules/core/ns_suspend.cpp
@@ -29,26 +29,26 @@ class CommandNSSuspend : public Command
 
 		if (readonly)
 		{
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 			return MOD_CONT;
 		}
 
 		NickAlias *na = findnick(nick);
 		if (!na)
 		{
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (Config->NSSecureAdmins && na->nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -79,7 +79,7 @@ class CommandNSSuspend : public Command
 			ircdproto->SendGlobops(NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick.c_str(), nick.c_str());
 
 		Log(LOG_ADMIN, u, this) << "for " << nick << " (" << (!reason.empty() ? reason : "No reason") << ")";
-		source.Reply(NICK_SUSPEND_SUCCEEDED, nick.c_str());
+		source.Reply(_("Nick %s is now suspended."), nick.c_str());
 
 		FOREACH_MOD(I_OnNickSuspended, OnNickSuspend(na));
 
@@ -88,18 +88,19 @@ class CommandNSSuspend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_SERVADMIN_HELP_SUSPEND);
+		source.Reply(_("Syntax: SUSPEND nickname reason\n"
+			"SUSPENDs a nickname from being used."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SUSPEND", NICK_SUSPEND_SYNTAX);
+		SyntaxError(source, "SUSPEND", _("SUSPEND nickname reason"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_SUSPEND);
+		source.Reply(_("    SUSPEND    Suspend a given nick"));
 	}
 };
 
@@ -117,26 +118,26 @@ class CommandNSUnSuspend : public Command
 
 		if (readonly)
 		{
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 			return MOD_CONT;
 		}
 
 		NickAlias *na = findnick(nick);
 		if (!na)
 		{
-			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (na->HasFlag(NS_FORBIDDEN))
 		{
-			source.Reply(NICK_X_FORBIDDEN, na->nick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, na->nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (Config->NSSecureAdmins && na->nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(LanguageString::ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
@@ -146,7 +147,7 @@ class CommandNSUnSuspend : public Command
 			ircdproto->SendGlobops(NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick.c_str(), nick.c_str());
 
 		Log(LOG_ADMIN, u, this) << "for " << na->nick;
-		source.Reply(NICK_UNSUSPEND_SUCCEEDED, nick.c_str());
+		source.Reply(_("Nick %s is now released."), nick.c_str());
 
 		FOREACH_MOD(I_OnNickUnsuspended, OnNickUnsuspended(na));
 
@@ -155,18 +156,19 @@ class CommandNSUnSuspend : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NICK_SERVADMIN_HELP_UNSUSPEND);
+		source.Reply(_("Syntax: UNSUSPEND nickname\n"
+			"UNSUSPENDS a nickname from being used."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX);
+		SyntaxError(source, "UNSUSPEND", _("UNSUSPEND nickname"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_UNSUSPEND);
+		source.Reply(_("    UNSUSPEND  Unsuspend a given nick"));
 	}
 };
 
diff --git a/modules/core/ns_update.cpp b/modules/core/ns_update.cpp
index 2d5bd6391..6ddf7cdb5 100644
--- a/modules/core/ns_update.cpp
+++ b/modules/core/ns_update.cpp
@@ -35,19 +35,22 @@ class CommandNSUpdate : public Command
 		na->last_seen = Anope::CurTime;
 		if (ircd->vhost)
 			do_on_id(u);
-		source.Reply(NICK_UPDATE_SUCCESS, Config->s_NickServ.c_str());
+		source.Reply(_("Status updated (memos, vhost, chmodes, flags)."), Config->s_NickServ.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(NICK_HELP_UPDATE);
+		source.Reply(_("Syntax: UPDATE\n"
+				"Updates your current status, i.e. it checks for new memos,\n"
+				"sets needed chanmodes (ModeonID) and updates your vhost and\n"
+				"your userflags (lastseentime, etc)."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(NICK_HELP_CMD_UPDATE);
+		source.Reply(_("    UPDATE     Updates your current status, i.e. it checks for new memos"));
 	}
 };
 
diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp
index f5212cb2b..499fd380d 100644
--- a/modules/core/os_akill.cpp
+++ b/modules/core/os_akill.cpp
@@ -25,11 +25,11 @@ class AkillDelCallback : public NumberList
 	~AkillDelCallback()
 	{
 		if (!Deleted)
-			source.Reply(OPER_AKILL_NO_MATCH);
+			source.Reply(_("No matching entries on the AKILL list."));
 		else if (Deleted == 1)
-			source.Reply(OPER_AKILL_DELETED_ONE);
+			source.Reply(_("Deleted 1 entry from the AKILL list."));
 		else
-			source.Reply(OPER_AKILL_DELETED_SEVERAL, Deleted);
+			source.Reply(_("Deleted %d entries from the AKILL list."), Deleted);
 	}
 
 	void HandleNumber(unsigned Number)
@@ -65,9 +65,9 @@ class AkillListCallback : public NumberList
 	~AkillListCallback()
 	{
 		if (!SentHeader)
-			source.Reply(OPER_AKILL_NO_MATCH);
+			source.Reply(_("No matching entries on the AKILL list."));
 		else
-			source.Reply(END_OF_ANY_LIST, "Akill");
+			source.Reply(LanguageString::END_OF_ANY_LIST, "Akill");
 	}
 
 	void HandleNumber(unsigned Number)
@@ -83,7 +83,8 @@ class AkillListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_AKILL_LIST_HEADER);
+			source.Reply(_("Current AKILL list:\n"
+					"  Num   Mask                              Reason"));
 		}
 
 		DoList(source, x, Number);
@@ -91,7 +92,7 @@ class AkillListCallback : public NumberList
 
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
-		source.Reply(OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -115,7 +116,7 @@ class AkillViewCallback : public AkillListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_AKILL_VIEW_HEADER);
+			source.Reply(_("Current AKILL list:"));
 		}
 
 		DoList(source, x, Number);
@@ -123,7 +124,7 @@ class AkillViewCallback : public AkillListCallback
 
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
-		source.Reply(OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expire_left(source.u->Account(), x->Expires).c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expire_left(source.u->Account(), x->Expires).c_str(), x->Reason.c_str());
 	}
 };
 
@@ -154,7 +155,7 @@ class CommandOSAKill : public Command
 		/* Do not allow less than a minute expiry time */
 		if (expires && expires < 60)
 		{
-			source.Reply(BAD_EXPIRY_TIME);
+			source.Reply(LanguageString::BAD_EXPIRY_TIME);
 			return MOD_CONT;
 		}
 		else if (expires > 0)
@@ -182,7 +183,7 @@ class CommandOSAKill : public Command
 
 			if (percent > 95)
 			{
-				source.Reply(USERHOST_MASK_TOO_WIDE, mask.c_str());
+				source.Reply(LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 				Log(LOG_ADMIN, u, this) << "tried to akill " << percent << "% of the network (" << affected << " users)";
 				return MOD_CONT;
 			}
@@ -192,7 +193,7 @@ class CommandOSAKill : public Command
 			if (!x)
 				return MOD_CONT;
 
-			source.Reply(OPER_AKILL_ADDED, mask.c_str());
+			source.Reply(_("\002%s\002 added to the AKILL list."), mask.c_str());
 
 			if (Config->WallOSAkill)
 			{
@@ -228,7 +229,7 @@ class CommandOSAKill : public Command
 			}
 
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 		}
 		else
 			this->OnSyntaxError(source, "ADD");
@@ -249,7 +250,7 @@ class CommandOSAKill : public Command
 
 		if (SGLine->GetList().empty())
 		{
-			source.Reply(OPER_LIST_EMPTY);
+			source.Reply(_("AKILL list is empty."));
 			return MOD_CONT;
 		}
 
@@ -264,18 +265,18 @@ class CommandOSAKill : public Command
 
 			if (!x)
 			{
-				source.Reply(OPER_AKILL_NOT_FOUND, mask.c_str());
+				source.Reply(_("\002%s\002 not found on the AKILL list."), mask.c_str());
 				return MOD_CONT;
 			}
 
 			FOREACH_MOD(I_OnDelAkill, OnDelAkill(u, x));
 
 			AkillDelCallback::DoDel(source, x);
-			source.Reply(OPER_AKILL_DELETED, mask.c_str());
+			source.Reply(_("\002%s\002 deleted from the AKILL list."), mask.c_str());
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		return MOD_CONT;
 	}
@@ -284,7 +285,7 @@ class CommandOSAKill : public Command
 	{
 		if (SGLine->GetList().empty())
 		{
-			source.Reply(OPER_LIST_EMPTY);
+			source.Reply(_("AKILL list is empty."));
 			return MOD_CONT;
 		}
 
@@ -308,7 +309,8 @@ class CommandOSAKill : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_AKILL_LIST_HEADER);
+						source.Reply(_("Current AKILL list:\n"
+								"  Num   Mask                              Reason"));
 					}
 
 					AkillListCallback::DoList(source, x, i);
@@ -316,9 +318,9 @@ class CommandOSAKill : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_AKILL_NO_MATCH);
+				source.Reply(_("No matching entries on the AKILL list."));
 			else
-				source.Reply(END_OF_ANY_LIST, "Akill");
+				source.Reply(LanguageString::END_OF_ANY_LIST, "Akill");
 		}
 
 		return MOD_CONT;
@@ -328,7 +330,7 @@ class CommandOSAKill : public Command
 	{
 		if (SGLine->GetList().empty())
 		{
-			source.Reply(OPER_LIST_EMPTY);
+			source.Reply(_("AKILL list is empty."));
 			return MOD_CONT;
 		}
 
@@ -352,7 +354,7 @@ class CommandOSAKill : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_AKILL_VIEW_HEADER);
+						source.Reply(_("Current AKILL list:"));
 					}
 
 					AkillViewCallback::DoList(source, x, i);
@@ -360,7 +362,7 @@ class CommandOSAKill : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_AKILL_NO_MATCH);
+				source.Reply(_("No matching entries on the AKILL list."));
 		}
 
 		return MOD_CONT;
@@ -371,7 +373,7 @@ class CommandOSAKill : public Command
 		User *u = source.u;
 		FOREACH_MOD(I_OnDelAkill, OnDelAkill(u, NULL));
 		SGLine->Clear();
-		source.Reply(OPER_AKILL_CLEAR);
+		source.Reply(_("The AKILL list has been cleared."));
 
 		return MOD_CONT;
 	}
@@ -402,18 +404,59 @@ class CommandOSAKill : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_AKILL);
+		source.Reply(_("Syntax: \002AKILL ADD [+\037expiry\037] \037mask\037 \037reason\037\002\n"
+				"        \002AKILL DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002AKILL LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002AKILL VIEW [\037mask\037 | \037list\037]\002\n"
+				"        \002AKILL CLEAR\002\n"
+				" \n"
+				"Allows Services operators to manipulate the AKILL list. If\n"
+				"a user matching an AKILL mask attempts to connect, Services\n"
+				"will issue a KILL for that user and, on supported server\n"
+				"types, will instruct all servers to add a ban (K-line) for\n"
+				"the mask which the user matched.\n"
+				" \n"
+				"\002AKILL ADD\002 adds the given nick or user@host/ip mask to the AKILL\n"
+				"list for the given reason (which \002must\002 be given).\n"
+				"\037expiry\037 is specified as an integer followed by one of \037d\037 \n"
+				"(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as \n"
+				"\0371h30m\037) are not permitted. If a unit specifier is not \n"
+				"included, the default is days (so \037+30\037 by itself means 30 \n"
+				"days). To add an AKILL which does not expire, use \037+0\037. If the\n"
+				"usermask to be added starts with a \037+\037, an expiry time must\n"
+				"be given, even if it is the same as the default. The\n"
+				"current AKILL default expiry time can be found with the\n"
+				"\002STATS AKILL\002 command.\n"
+				" \n"
+				"The \002AKILL DEL\002 command removes the given mask from the\n"
+				"AKILL list if it is present.  If a list of entry numbers is \n"
+				"given, those entries are deleted.  (See the example for LIST \n"
+				"below.)\n"
+				" \n"
+				"The \002AKILL LIST\002 command displays the AKILL list.  \n"
+				"If a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002AKILL LIST 2-5,7-9\002\n"
+				"      Lists AKILL entries numbered 2 through 5 and 7 \n"
+				"      through 9.\n"
+				"      \n"
+				"\002AKILL VIEW\002 is a more verbose version of \002AKILL LIST\002, and \n"
+				"will show who added an AKILL, the date it was added, and when \n"
+				"it expires, as well as the user@host/ip mask and reason.\n"
+				" \n"
+				"\002AKILL CLEAR\002 clears all entries of the AKILL list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "AKILL", OPER_AKILL_SYNTAX);
+		SyntaxError(source, "AKILL", _("AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037nick\037 | \037mask\037 | \037entry-list\037} [\037reason\037]]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_AKILL);
+		source.Reply(_("    AKILL       Manipulate the AKILL list"));
 	}
 };
 
diff --git a/modules/core/os_chankill.cpp b/modules/core/os_chankill.cpp
index a61c799fe..6fffd8827 100644
--- a/modules/core/os_chankill.cpp
+++ b/modules/core/os_chankill.cpp
@@ -41,7 +41,7 @@ class CommandOSChanKill : public Command
 			expires *= 86400;
 		if (expires && expires < 60)
 		{
-			source.Reply(BAD_EXPIRY_TIME);
+			source.Reply(LanguageString::BAD_EXPIRY_TIME);
 			return MOD_CONT;
 		}
 		else if (expires > 0)
@@ -80,25 +80,28 @@ class CommandOSChanKill : public Command
 					ircdproto->SendGlobops(OperServ, "%s used CHANKILL on %s (%s)", u->nick.c_str(), channel.c_str(), realreason.c_str());
 			}
 			else
-				source.Reply(CHAN_X_NOT_IN_USE, channel.c_str());
+				source.Reply(LanguageString::CHAN_X_NOT_IN_USE, channel.c_str());
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_CHANKILL);
+		source.Reply(_("Syntax: \002CHANKILL [+\037expiry\037] \037channel\037 \037reason\037\002\n"
+				"Puts an AKILL for every nick on the specified channel. It\n"
+				"uses the entire and complete real ident@host for every nick,\n"
+				"then enforces the AKILL."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "CHANKILL", OPER_CHANKILL_SYNTAX);
+		SyntaxError(source, "CHANKILL", _("CHANKILL [+\037expiry\037] {\037#channel\037} [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_CHANKILL);
+		source.Reply(_("    CHANKILL    AKILL all users on a specific channel"));
 	}
 };
 
diff --git a/modules/core/os_chanlist.cpp b/modules/core/os_chanlist.cpp
index 4c2ade3f1..dbf36e44c 100644
--- a/modules/core/os_chanlist.cpp
+++ b/modules/core/os_chanlist.cpp
@@ -35,7 +35,8 @@ class CommandOSChanList : public Command
 
 		if (!pattern.empty() && (u2 = finduser(pattern)))
 		{
-			source.Reply(OPER_CHANLIST_HEADER_USER, u2->nick.c_str());
+			source.Reply(_("\002%s\002 channel list:\n"
+					"Name                 Users Modes   Topic"), u2->nick.c_str());
 
 			for (UChannelList::iterator uit = u2->chans.begin(), uit_end = u2->chans.end(); uit != uit_end; ++uit)
 			{
@@ -46,12 +47,13 @@ class CommandOSChanList : public Command
 						if (!cc->chan->HasMode(*it))
 							continue;
 
-				source.Reply(OPER_CHANLIST_RECORD, cc->chan->name.c_str(), cc->chan->users.size(), cc->chan->GetModes(true, true).c_str(), !cc->chan->topic.empty() ? cc->chan->topic.c_str() : "");
+				source.Reply(_("%-20s  %4d +%-6s %s"), cc->chan->name.c_str(), cc->chan->users.size(), cc->chan->GetModes(true, true).c_str(), !cc->chan->topic.empty() ? cc->chan->topic.c_str() : "");
 			}
 		}
 		else
 		{
-			source.Reply(OPER_CHANLIST_HEADER);
+			source.Reply(_("Channel list:\n"
+					"Name                 Users Modes   Topic"));
 
 			for (channel_map::const_iterator cit = ChannelList.begin(), cit_end = ChannelList.end(); cit != cit_end; ++cit)
 			{
@@ -64,23 +66,30 @@ class CommandOSChanList : public Command
 						if (!c->HasMode(*it))
 							continue;
 
-				source.Reply(OPER_CHANLIST_RECORD, c->name.c_str(), c->users.size(), c->GetModes(true, true).c_str(), !c->topic.empty() ? c->topic.c_str() : "");
+				source.Reply(_("%-20s  %4d +%-6s %s"), c->name.c_str(), c->users.size(), c->GetModes(true, true).c_str(), !c->topic.empty() ? c->topic.c_str() : "");
 			}
 		}
 
-		source.Reply(OPER_CHANLIST_END);
+		source.Reply(_("End of channel list."));
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_CHANLIST);
+		source.Reply(_("Syntax: \002CHANLIST [{\037pattern\037 | \037nick\037} [\037SECRET\037]]\002\n"
+				" \n"
+				"Lists all channels currently in use on the IRC network, whether they\n"
+				"are registered or not.\n"
+				"If \002pattern\002 is given, lists only channels that match it. If a nickname\n"
+				"is given, lists only the channels the user using it is on. If SECRET is\n"
+				"specified, lists only channels matching \002pattern\002 that have the +s or\n"
+				"+p mode."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_CHANLIST);
+		source.Reply(_("    CHANLIST    Lists all channel records"));
 	}
 };
 
diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp
index 69eeabe51..209fa4231 100644
--- a/modules/core/os_defcon.cpp
+++ b/modules/core/os_defcon.cpp
@@ -33,14 +33,14 @@ class DefConTimeout : public Timer
 			Config->DefConLevel = level;
 			FOREACH_MOD(I_OnDefconLevel, OnDefconLevel(level));
 			Log(OperServ, "operserv/defcon") << "Defcon level timeout, returning to level " << level;
-			ircdproto->SendGlobops(OperServ, GetString(OPER_DEFCON_WALL).c_str(), Config->s_OperServ.c_str(), level);
+			ircdproto->SendGlobops(OperServ, GetString(NULL, _("\002%s\002 Changed the DEFCON level to \002%d\002")).c_str(), Config->s_OperServ.c_str(), level);
 
 			if (Config->GlobalOnDefcon)
 			{
 				if (!Config->DefConOffMessage.empty())
 					oper_global("", "%s", Config->DefConOffMessage.c_str());
 				else
-					oper_global("", GetString(DEFCON_GLOBAL).c_str(), Config->DefConLevel);
+					oper_global("", GetString(NULL, _("The Defcon Level is now at Level: \002%d\002")).c_str(), Config->DefConLevel);
 
 				if (Config->GlobalOnDefconMore && Config->DefConOffMessage.empty())
 					oper_global("", "%s", Config->DefconMessage.c_str());
@@ -67,7 +67,7 @@ class CommandOSDefcon : public Command
 
 		if (lvl.empty())
 		{
-			source.Reply(OPER_DEFCON_CHANGED, Config->DefConLevel);
+			source.Reply(_("Services are now at DEFCON \002%d\002"), Config->DefConLevel);
 			defcon_sendlvls(source);
 			return MOD_CONT;
 		}
@@ -90,10 +90,10 @@ class CommandOSDefcon : public Command
 		if (Config->DefConTimeOut)
 			timeout = new DefConTimeout(5);
 
-		source.Reply(OPER_DEFCON_CHANGED, Config->DefConLevel);
+		source.Reply(_("Services are now at DEFCON \002%d\002"), Config->DefConLevel);
 		defcon_sendlvls(source);
 		Log(LOG_ADMIN, u, this) << "to change defcon level to " << newLevel;
-		ircdproto->SendGlobops(OperServ, GetString(OPER_DEFCON_WALL).c_str(), u->nick.c_str(), newLevel);
+		ircdproto->SendGlobops(OperServ, GetString(NULL, _("\002%s\002 Changed the DEFCON level to \002%d\002")).c_str(), u->nick.c_str(), newLevel);
 		/* Global notice the user what is happening. Also any Message that
 		   the Admin would like to add. Set in config file. */
 		if (Config->GlobalOnDefcon)
@@ -101,7 +101,7 @@ class CommandOSDefcon : public Command
 			if (Config->DefConLevel == 5 && !Config->DefConOffMessage.empty())
 				oper_global("", "%s", Config->DefConOffMessage.c_str());
 			else
-				oper_global("", GetString(DEFCON_GLOBAL).c_str(), Config->DefConLevel);
+				oper_global("", GetString(NULL, _("The Defcon Level is now at Level: \002%d\002")).c_str(), Config->DefConLevel);
 		}
 		if (Config->GlobalOnDefconMore)
 		{
@@ -115,18 +115,21 @@ class CommandOSDefcon : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_DEFCON);
+		source.Reply(_("Syntax: \002DEFCON\002 [\0021\002|\0022\002|\0023\002|\0024\002|\0025\002]\n"
+				"The defcon system can be used to implement a pre-defined\n"
+				"set of restrictions to services useful during an attempted\n"
+				"attack on the network."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "DEFCON", OPER_DEFCON_SYNTAX);
+		SyntaxError(source, "DEFCON", _("DEFCON [\0021\002|\0022\002|\0023\002|\0024\002|\0025\002]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_DEFCON);
+		source.Reply(_("    DEFCON      Manipulate the DefCon system"));
 	}
 };
 
@@ -211,7 +214,7 @@ class OSDefcon : public Module
 		if (!u->HasMode(UMODE_OPER) && (CheckDefCon(DEFCON_OPER_ONLY) || CheckDefCon(DEFCON_SILENT_OPER_ONLY)))
 		{
 			if (!CheckDefCon(DEFCON_SILENT_OPER_ONLY))
-				u->SendMessage(bi, OPER_DEFCON_DENIED);
+				u->SendMessage(bi, _("Services are in Defcon mode, Please try again later."));
 
 			return EVENT_STOP;
 		}
@@ -228,7 +231,7 @@ class OSDefcon : public Module
 			{
 				if (CheckDefCon(DEFCON_NO_NEW_NICKS))
 				{
-					source.Reply(OPER_DEFCON_DENIED);
+					source.Reply(_("Services are in Defcon mode, Please try again later."));
 					return EVENT_STOP;
 				}
 			}
@@ -239,7 +242,7 @@ class OSDefcon : public Module
 			{
 				if (!params.empty() && params[0].equals_ci("MLOCK") && CheckDefCon(DEFCON_NO_MLOCK_CHANGE))
 				{
-					source.Reply(OPER_DEFCON_DENIED);
+					source.Reply(_("Services are in Defcon mode, Please try again later."));
 					return EVENT_STOP;
 				}
 			}
@@ -247,7 +250,7 @@ class OSDefcon : public Module
 			{
 				if (CheckDefCon(DEFCON_NO_NEW_CHANNELS))
 				{
-					source.Reply(OPER_DEFCON_DENIED);
+					source.Reply(_("Services are in Defcon mode, Please try again later."));
 					return EVENT_STOP;
 				}
 			}
@@ -258,7 +261,7 @@ class OSDefcon : public Module
 			{
 				if (CheckDefCon(DEFCON_NO_NEW_MEMOS))
 				{
-					source.Reply(OPER_DEFCON_DENIED);
+					source.Reply(_("Services are in Defcon mode, Please try again later."));
 					return EVENT_STOP;
 				}
 			}
@@ -319,25 +322,25 @@ class OSDefcon : public Module
 void defcon_sendlvls(CommandSource &source)
 {
 	if (CheckDefCon(DEFCON_NO_NEW_CHANNELS))
-		source.Reply(OPER_HELP_DEFCON_NO_NEW_CHANNELS);
+		source.Reply(_("* No new channel registrations"));
 	if (CheckDefCon(DEFCON_NO_NEW_NICKS))
-		source.Reply(OPER_HELP_DEFCON_NO_NEW_NICKS);
+		source.Reply(_("* No new nick registrations"));
 	if (CheckDefCon(DEFCON_NO_MLOCK_CHANGE))
-		source.Reply(OPER_HELP_DEFCON_NO_MLOCK_CHANGE);
+		source.Reply(_("* No MLOCK changes"));
 	if (CheckDefCon(DEFCON_FORCE_CHAN_MODES) && !Config->DefConChanModes.empty())
-		source.Reply(OPER_HELP_DEFCON_FORCE_CHAN_MODES, Config->DefConChanModes.c_str());
+		source.Reply(_("* Force Chan Modes (%s) to be set on all channels"), Config->DefConChanModes.c_str());
 	if (CheckDefCon(DEFCON_REDUCE_SESSION))
-		source.Reply(OPER_HELP_DEFCON_REDUCE_SESSION, Config->DefConSessionLimit);
+		source.Reply(_("* Use the reduced session limit of %d"), Config->DefConSessionLimit);
 	if (CheckDefCon(DEFCON_NO_NEW_CLIENTS))
-		source.Reply(OPER_HELP_DEFCON_NO_NEW_CLIENTS);
+		source.Reply(_("* Kill any NEW clients connecting"));
 	if (CheckDefCon(DEFCON_OPER_ONLY))
-		source.Reply(OPER_HELP_DEFCON_OPER_ONLY);
+		source.Reply(_("* Ignore any non-opers with message"));
 	if (CheckDefCon(DEFCON_SILENT_OPER_ONLY))
-		source.Reply(OPER_HELP_DEFCON_SILENT_OPER_ONLY);
+		source.Reply(_("* Silently ignore non-opers"));
 	if (CheckDefCon(DEFCON_AKILL_NEW_CLIENTS))
-		source.Reply(OPER_HELP_DEFCON_AKILL_NEW_CLIENTS);
+		source.Reply(_("* AKILL any new clients connecting"));
 	if (CheckDefCon(DEFCON_NO_NEW_MEMOS))
-		source.Reply(OPER_HELP_DEFCON_NO_NEW_MEMOS);
+		source.Reply(_("* No new memos sent"));
 }
 
 void runDefCon()
diff --git a/modules/core/os_global.cpp b/modules/core/os_global.cpp
index 838446bd0..5d8bb39e4 100644
--- a/modules/core/os_global.cpp
+++ b/modules/core/os_global.cpp
@@ -33,18 +33,21 @@ class CommandOSGlobal : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_GLOBAL, Config->s_GlobalNoticer.c_str());
+		source.Reply(_("Syntax: \002GLOBAL \037message\037\002\n"
+				" \n"
+				"Allows Administrators to send messages to all users on the \n"
+				"network. The message will be sent from the nick \002%s\002."), Config->s_GlobalNoticer.c_str());
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "GLOBAL", OPER_GLOBAL_SYNTAX);
+		SyntaxError(source, "GLOBAL", _("GLOBAL \037message\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_GLOBAL);
+		source.Reply(_("    GLOBAL      Send a message to all users"));
 	}
 };
 
diff --git a/modules/core/os_help.cpp b/modules/core/os_help.cpp
index 9f0141940..31b62b349 100644
--- a/modules/core/os_help.cpp
+++ b/modules/core/os_help.cpp
@@ -29,11 +29,11 @@ class CommandOSHelp : public Command
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(OPER_HELP);
+		source.Reply(_("%S commands:"));
 		for (CommandMap::const_iterator it = OperServ->Commands.begin(), it_end = OperServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
-		source.Reply(OPER_HELP_LOGGED);
+		source.Reply(_("\002Notice:\002 All commands sent to %S are logged!"));
 	}
 };
 
diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp
index 332b42f9c..bf5538dd9 100644
--- a/modules/core/os_ignore.cpp
+++ b/modules/core/os_ignore.cpp
@@ -165,15 +165,15 @@ class CommandOSIgnore : public Command
 
 			if (t <= -1)
 			{
-				source.Reply(OPER_IGNORE_VALID_TIME);
+				source.Reply(_("You have to enter a valid number as time."));
 				return MOD_CONT;
 			}
 
 			ignore_service->AddIgnore(nick, source.u->nick, reason, t);
 			if (!t)
-				source.Reply(OPER_IGNORE_PERM_DONE, nick.c_str());
+				source.Reply(_("\002%s\002 will now permanently be ignored."), nick.c_str());
 			else
-				source.Reply(OPER_IGNORE_TIME_DONE, nick.c_str(), time.c_str());
+				source.Reply(_("\002%s\002 will now be ignored for \002%s\002."), nick.c_str(), time.c_str());
 		}
 
 		return MOD_CONT;
@@ -187,10 +187,11 @@ class CommandOSIgnore : public Command
 
 		const std::list<IgnoreData> &ignores = ignore_service->GetIgnores();
 		if (ignores.empty())
-			source.Reply(OPER_IGNORE_LIST_EMPTY);
+			source.Reply(_("Ignore list is empty."));
 		else
 		{
-			source.Reply(OPER_IGNORE_LIST);
+			source.Reply(_("Services ignore list:\n"
+					"  Mask        Creator      Reason      Expires"));
 			for (std::list<IgnoreData>::const_iterator ign = ignores.begin(), ign_end = ignores.end(); ign != ign_end; ++ign)
 			{
 				const IgnoreData &ignore = *ign;
@@ -212,9 +213,9 @@ class CommandOSIgnore : public Command
 		if (nick.empty())
 			this->OnSyntaxError(source, "DEL");
 		else if (ignore_service->DelIgnore(nick))
-			source.Reply(OPER_IGNORE_DEL_DONE, nick.c_str());
+			source.Reply(_("\002%s\002 will no longer be ignored."), nick.c_str());
 		else
-			source.Reply(OPER_IGNORE_LIST_NOMATCH, nick.c_str());
+			source.Reply(_("Nick \002%s\002 not found on ignore list."), nick.c_str());
 
 		return MOD_CONT;
 	}
@@ -226,7 +227,7 @@ class CommandOSIgnore : public Command
 			return MOD_CONT;
 
 		ignore_service->ClearIgnores();
-		source.Reply(OPER_IGNORE_LIST_CLEARED);
+		source.Reply(_("Ignore list has been cleared."));
 
 		return MOD_CONT;
 	}
@@ -256,18 +257,31 @@ class CommandOSIgnore : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_IGNORE);
+		source.Reply(_("Syntax: \002IGNORE {ADD|DEL|LIST|CLEAR} [\037time\037] [\037nick\037] [\037reason\037]\002\n"
+				" \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: \037s\037 for seconds, \037m\037 for minutes, \n"
+				"\037h\037 for hours and \037d\037 for days. \n"
+				"Combinations of these units are not permitted.\n"
+				"To make Services permanently ignore the	user, type 0 as time.\n"
+				"When adding a \037mask\037, it should be in the format user@host\n"
+				"or nick!user@host, everything else will be considered a nick.\n"
+				"Wildcards are permitted.\n"
+				" \n"
+				"Ignores will not be enforced on IRC Operators."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "IGNORE", OPER_IGNORE_SYNTAX);
+		SyntaxError(source, "IGNORE", _("IGNORE {ADD|DEL|LIST|CLEAR} [\037time\037] [\037nick\037] [\037reason\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_IGNORE);
+		source.Reply(_("    IGNORE      Modify the Services ignore list"));
 	}
 };
 
diff --git a/modules/core/os_jupe.cpp b/modules/core/os_jupe.cpp
index 81a1c4c94..5220bd04c 100644
--- a/modules/core/os_jupe.cpp
+++ b/modules/core/os_jupe.cpp
@@ -28,9 +28,9 @@ class CommandOSJupe : public Command
 		Server *server = Server::Find(jserver);
 
 		if (!isValidHost(jserver, 3))
-			source.Reply(OPER_JUPE_HOST_ERROR);
+			source.Reply(_("Please use a valid server name when juping"));
 		else if (server && (server == Me || server == Me->GetLinks().front()))
-			source.Reply(OPER_JUPE_INVALID_SERVER);
+			source.Reply(_("You can not jupe your services server or your uplink server."));
 		else
 		{
 			Anope::string rbuf = "Juped by " + u->nick + (!reason.empty() ? ": " + reason : "");
@@ -47,18 +47,27 @@ class CommandOSJupe : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_JUPE);
+		source.Reply(_("Syntax: \002JUPE \037server\037 [\037reason\037]\002\n"
+				" \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 \002SQUIT\002. If a reason is\n"
+				"given, it is placed in the server information field;\n"
+				"otherwise, the server information field will contain the\n"
+				"text \"Juped by <nick>\", showing the nickname of the\n"
+				"person who jupitered the server."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "JUPE", OPER_JUPE_SYNTAX);
+		SyntaxError(source, "JUPE", _("JUPE \037servername\037 [\037reason\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_JUPE);
+		source.Reply(_("    JUPE        \"Jupiter\" a server"));
 	}
 };
 
diff --git a/modules/core/os_kick.cpp b/modules/core/os_kick.cpp
index c68ac9fbb..5cdca38ce 100644
--- a/modules/core/os_kick.cpp
+++ b/modules/core/os_kick.cpp
@@ -31,17 +31,17 @@ class CommandOSKick : public Command
 
 		if (!(c = findchan(chan)))
 		{
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 			return MOD_CONT;
 		}
 		else if (c->bouncy_modes)
 		{
-			source.Reply(OPER_BOUNCY_MODES_U_LINE);
+			source.Reply(_("Services is unable to change modes. Are your servers' U:lines configured correctly?"));
 			return MOD_CONT;
 		}
 		else if (!(u2 = finduser(nick)))
 		{
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -53,18 +53,25 @@ class CommandOSKick : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_KICK);
+		source.Reply(_("Syntax: \002KICK \037channel\037 \037user\037 \037reason\037\002\n"
+				" \n"
+				"Allows staff to kick a user from any channel.\n"
+				"Parameters are the same as for the standard /KICK\n"
+				"command. The kick message will have the nickname of the\n"
+				"IRCop sending the KICK command prepended; for example:\n"
+				" \n"
+				"*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "KICK", OPER_KICK_SYNTAX);
+		SyntaxError(source, "KICK", _("KICK \037channel\037 \037user\037 \037reason\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_KICK);
+		source.Reply(_("    KICK        Kick a user from a channel"));
 	}
 };
 
diff --git a/modules/core/os_mode.cpp b/modules/core/os_mode.cpp
index 61a577ae3..ab2378052 100644
--- a/modules/core/os_mode.cpp
+++ b/modules/core/os_mode.cpp
@@ -28,9 +28,9 @@ class CommandOSMode : public Command
 		Channel *c;
 
 		if (!(c = findchan(chan)))
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
+			source.Reply(LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (c->bouncy_modes)
-			source.Reply(OPER_BOUNCY_MODES_U_LINE);
+			source.Reply(_("Services is unable to change modes. Are your servers' U:lines configured correctly?"));
 		else
 		{
 			c->SetModes(OperServ, false, modes.c_str());
@@ -43,18 +43,22 @@ class CommandOSMode : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_MODE);
+		source.Reply(_("Syntax: \002MODE \037channel\037 \037modes\037\002\n"
+				" \n"
+				"Allows Services operators to set channel modes for any\n"
+				"channel. Parameters are the same as for the standard /MODE\n"
+				"command."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "MODE", OPER_MODE_SYNTAX);
+		SyntaxError(source, "MODE", _("MODE \037channel\037 \037modes\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_MODE);
+		source.Reply(_("    MODE        Change a channel's modes"));
 	}
 };
 
diff --git a/modules/core/os_modinfo.cpp b/modules/core/os_modinfo.cpp
index 6cc3ebbeb..9ee5b65fd 100644
--- a/modules/core/os_modinfo.cpp
+++ b/modules/core/os_modinfo.cpp
@@ -29,7 +29,7 @@ class CommandOSModInfo : public Command
 
 			if (c->module && c->module->name.equals_ci(mod_name) && c->service)
 			{
-				source.Reply(OPER_MODULE_CMD_LIST, c->service->nick.c_str(), c->name.c_str());
+				source.Reply(_("Providing command: %\002%s %s\002"), c->service->nick.c_str(), c->name.c_str());
 				++display;
 			}
 		}
@@ -49,7 +49,7 @@ class CommandOSModInfo : public Command
 		Module *m = FindModule(file);
 		if (m)
 		{
-			source.Reply(OPER_MODULE_INFO_LIST, m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "?", do_strftime(m->created).c_str());
+			source.Reply(_("Module: \002%s\002 Version: \002%s\002 Author: \002%s\002 loaded: \002%s\002"), m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "?", do_strftime(m->created).c_str());
 
 			showModuleCmdLoaded(HostServ, m->name, source);
 			showModuleCmdLoaded(OperServ, m->name, source);
@@ -59,25 +59,27 @@ class CommandOSModInfo : public Command
 			showModuleCmdLoaded(MemoServ, m->name, source);
 		}
 		else
-			source.Reply(OPER_MODULE_NO_INFO, file.c_str());
+			source.Reply(_("No information about module \002%s\002 is available"), file.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_MODINFO);
+		source.Reply(_("Syntax: \002MODINFO\002 \002FileName\002\n"
+				" \n"
+				"This command lists information about the specified loaded module"));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "MODINFO", OPER_MODULE_INFO_SYNTAX);
+		SyntaxError(source, "MODINFO", _("MODINFO \037FileName\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_MODINFO);
+		source.Reply(_("    MODINFO     Info about a loaded module"));
 	}
 };
 
diff --git a/modules/core/os_modlist.cpp b/modules/core/os_modlist.cpp
index fa6c5e9a9..3a70e631a 100644
--- a/modules/core/os_modlist.cpp
+++ b/modules/core/os_modlist.cpp
@@ -129,7 +129,7 @@ class CommandOSModList : public Command
 			}
 		}
 
-		source.Reply(OPER_MODULE_LIST_HEADER);
+		source.Reply(_("Current Module list:"));
 
 		for (std::list<Module *>::iterator it = Modules.begin(), it_end = Modules.end(); it != it_end; ++it)
 		{
@@ -140,56 +140,56 @@ class CommandOSModList : public Command
 				case CORE:
 					if (showCore)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), core);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), core);
 						++count;
 					}
 					break;
 				case THIRD:
 					if (showThird)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), third);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), third);
 						++count;
 					}
 					break;
 				case PROTOCOL:
 					if (showProto)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), proto);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), proto);
 						++count;
 					}
 					break;
 				case SUPPORTED:
 					if (showSupported)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), supported);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), supported);
 						++count;
 					}
 					break;
 				case QATESTED:
 					if (showQA)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), qa);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), qa);
 						++count;
 					}
 					break;
 				case ENCRYPTION:
 					if (showEnc)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), enc);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), enc);
 						++count;
 					}
 					break;
 				case DATABASE:
 					if (showDB)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), db);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), db);
 						++count;
 					}
 					break;
 				case SOCKETENGINE:
 					if (showSocketEngine)
 					{
-						source.Reply(OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), socketengine);
+						source.Reply(_("Module: \002%s\002 [%s] [%s]"), m->name.c_str(), m->version.c_str(), socketengine);
 						++count;
 					}
 					break;
@@ -198,22 +198,24 @@ class CommandOSModList : public Command
 			}
 		}
 		if (!count)
-			source.Reply(OPER_MODULE_NO_LIST);
+			source.Reply(_("No modules currently loaded"));
 		else
-			source.Reply(OPER_MODULE_LIST_FOOTER, count);
+			source.Reply(_("%d Modules loaded."), count);
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_MODLIST);
+		source.Reply(_("Syntax: \002MODLIST\002 [Core|3rd|protocol|encryption|supported|qatested]\n"
+				" \n"
+				"Lists all currently loaded modules."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_MODLIST);
+		source.Reply(_("    MODLIST     List loaded modules"));
 	}
 };
 
diff --git a/modules/core/os_modload.cpp b/modules/core/os_modload.cpp
index 5009535ea..c655df683 100644
--- a/modules/core/os_modload.cpp
+++ b/modules/core/os_modload.cpp
@@ -28,7 +28,7 @@ class CommandOSModLoad : public Command
 		Module *m = FindModule(mname);
 		if (m)
 		{
-			source.Reply(OPER_MODULE_ALREADY_LOADED, mname.c_str());
+			source.Reply(_("Module \002%s\002 is already loaded."), mname.c_str());
 			return MOD_CONT;
 		}
 
@@ -36,7 +36,7 @@ class CommandOSModLoad : public Command
 		if (status == MOD_ERR_OK)
 		{
 			ircdproto->SendGlobops(OperServ, "%s loaded module %s", u->nick.c_str(), mname.c_str());
-			source.Reply(OPER_MODULE_LOADED, mname.c_str());
+			source.Reply(_("Module \002%s\002 loaded"), mname.c_str());
 
 			/* If a user is loading this module, then the core databases have already been loaded
 			 * so trigger the event manually
@@ -46,25 +46,28 @@ class CommandOSModLoad : public Command
 				m->OnPostLoadDatabases();
 		}
 		else
-			source.Reply(OPER_MODULE_LOAD_FAIL, mname.c_str());
+			source.Reply(_("Unable to load module \002%s\002"), mname.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_MODLOAD);
+		source.Reply(_("Syntax: \002MODLOAD\002 \002FileName\002\n"
+				" \n"
+				"This command loads the module named FileName from the modules\n"
+				"directory."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "MODLOAD", OPER_MODULE_LOAD_SYNTAX);
+		SyntaxError(source, "MODLOAD", _("MODLOAD \037FileName\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_MODLOAD);
+		source.Reply(_("    MODLOAD     Load a module"));
 	}
 };
 
diff --git a/modules/core/os_modreload.cpp b/modules/core/os_modreload.cpp
index e7882ed5e..10a4e1b07 100644
--- a/modules/core/os_modreload.cpp
+++ b/modules/core/os_modreload.cpp
@@ -28,19 +28,19 @@ class CommandOSModReLoad : public Command
 		Module *m = FindModule(mname);
 		if (!m)
 		{
-			source.Reply(OPER_MODULE_ISNT_LOADED, mname.c_str());
+			source.Reply(_("Module \002%s\002 isn't loaded."), mname.c_str());
 			return MOD_CONT;
 		}
 
 		if (!m->handle)
 		{
-			source.Reply(OPER_MODULE_REMOVE_FAIL, m->name.c_str());
+			source.Reply(_("Unable to remove module \002%s\002"), m->name.c_str());
 			return MOD_CONT;
 		}
 
 		if (m->GetPermanent())
 		{
-			source.Reply(OPER_MODULE_NO_UNLOAD);
+			source.Reply(_("Unable to remove module \002%s\002"));
 			return MOD_CONT;
 		}
 
@@ -50,7 +50,7 @@ class CommandOSModReLoad : public Command
 
 		if (status != MOD_ERR_OK)
 		{
-			source.Reply(OPER_MODULE_REMOVE_FAIL, mname.c_str());
+			source.Reply(_("Unable to remove module \002%s\002"), mname.c_str());
 			return MOD_CONT;
 		}
 
@@ -58,7 +58,7 @@ class CommandOSModReLoad : public Command
 		if (status == MOD_ERR_OK)
 		{
 			ircdproto->SendGlobops(OperServ, "%s reloaded module %s", u->nick.c_str(), mname.c_str());
-			source.Reply(OPER_MODULE_RELOADED, mname.c_str());
+			source.Reply(_("Module \002%s\002 reloaded"), mname.c_str());
 
 			/* If a user is loading this module, then the core databases have already been loaded
 			 * so trigger the event manually
@@ -72,7 +72,7 @@ class CommandOSModReLoad : public Command
 			if (fatal)
 				throw FatalException("Unable to reload module " + mname);
 			else
-				source.Reply(OPER_MODULE_LOAD_FAIL, mname.c_str());
+				source.Reply(_("Unable to load module \002%s\002"), mname.c_str());
 		}
 
 		return MOD_CONT;
@@ -80,18 +80,20 @@ class CommandOSModReLoad : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_MODRELOAD);
+		source.Reply(_("Syntax: \002MODRELOAD\002 \002FileName\002\n"
+				" \n"
+				"This command reloads the module named FileName."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "MODLOAD", OPER_MODULE_RELOAD_SYNTAX);
+		SyntaxError(source, "MODLOAD", _("MODRELOAD \037FileName\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_MODRELOAD);
+		source.Reply(_("    MODRELOAD   Reload a module"));
 	}
 };
 
diff --git a/modules/core/os_modunload.cpp b/modules/core/os_modunload.cpp
index 8efbc8bdf..9dc3f8d39 100644
--- a/modules/core/os_modunload.cpp
+++ b/modules/core/os_modunload.cpp
@@ -28,19 +28,19 @@ class CommandOSModUnLoad : public Command
 		Module *m = FindModule(mname);
 		if (!m)
 		{
-			source.Reply(OPER_MODULE_ISNT_LOADED, mname.c_str());
+			source.Reply(_("Module \002%s\002 isn't loaded."), mname.c_str());
 			return MOD_CONT;
 		}
 		
 		if (!m->handle)
 		{
-			source.Reply(OPER_MODULE_REMOVE_FAIL, m->name.c_str());
+			source.Reply(_("Unable to remove module \002%s\002"), m->name.c_str());
 			return MOD_CONT;
 		}
 	
 		if (m->GetPermanent() || m->type == PROTOCOL)
 		{
-			source.Reply(OPER_MODULE_NO_UNLOAD);
+			source.Reply(_("Unable to remove module \002%s\002"));
 			return MOD_CONT;
 		}
 
@@ -50,29 +50,32 @@ class CommandOSModUnLoad : public Command
 
 		if (status == MOD_ERR_OK)
 		{
-			source.Reply(OPER_MODULE_UNLOADED, mname.c_str());
+			source.Reply(_("Module \002%s\002 unloaded"), mname.c_str());
 			ircdproto->SendGlobops(OperServ, "%s unloaded module %s", u->nick.c_str(), mname.c_str());
 		}
 		else
-			source.Reply(OPER_MODULE_REMOVE_FAIL, mname.c_str());
+			source.Reply(_("Unable to remove module \002%s\002"), mname.c_str());
 
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_MODUNLOAD);
+		source.Reply(_("Syntax: \002MODUNLOAD\002 \002FileName\002\n"
+				" \n"
+				"This command unloads the module named FileName from the modules\n"
+				"directory."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "MODUNLOAD", OPER_MODULE_UNLOAD_SYNTAX);
+		SyntaxError(source, "MODUNLOAD", _("MODUNLOAD \037FileName\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_MODUNLOAD);
+		source.Reply(_("    MODUNLOAD   Un-Load a module"));
 	}
 };
 
diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp
index fe3788dfe..d8574e5de 100644
--- a/modules/core/os_news.cpp
+++ b/modules/core/os_news.cpp
@@ -33,54 +33,54 @@ enum
 
 struct NewsMessages msgarray[] = {
 	{NEWS_LOGON, "LOGON",
-	 {NEWS_LOGON_SYNTAX,
-	  NEWS_LOGON_LIST_HEADER,
-	  NEWS_LOGON_LIST_NONE,
-	  NEWS_LOGON_ADD_SYNTAX,
-	  NEWS_LOGON_ADDED,
-	  NEWS_LOGON_DEL_SYNTAX,
-	  NEWS_LOGON_DEL_NOT_FOUND,
-	  NEWS_LOGON_DELETED,
-	  NEWS_LOGON_DEL_NONE,
-	  NEWS_LOGON_DELETED_ALL}
+	 {_("LOGONNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"),
+	  _("Logon news items:"),
+	  _("There is no logon news."),
+	  _("Syntax: \002LOGONNEWS ADD \037text\037\002"),
+	  _("Added new logon news item (#%d)."),
+	  _("Syntax: \002LOGONNEWS DEL {\037num\037 | ALL}"),
+	  _("Logon news item #%d not found!"),
+	  _("LOGONNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"),
+	  _("No logon news items to delete!"),
+	  _("All logon news items deleted.")}
 	 },
 	{NEWS_OPER, "OPER",
-	 {NEWS_OPER_SYNTAX,
-	  NEWS_OPER_LIST_HEADER,
-	  NEWS_OPER_LIST_NONE,
-	  NEWS_OPER_ADD_SYNTAX,
-	  NEWS_OPER_ADDED,
-	  NEWS_OPER_DEL_SYNTAX,
-	  NEWS_OPER_DEL_NOT_FOUND,
-	  NEWS_OPER_DELETED,
-	  NEWS_OPER_DEL_NONE,
-	  NEWS_OPER_DELETED_ALL}
+	 {_("OPERNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"),
+	  _("Oper news items:"),
+	  _("There is no oper news."),
+	  _("Syntax: \002OPERNEWS ADD \037text\037\002"),
+	  _("Added new oper news item (#%d)."),
+	  _("Syntax: \002OPERNEWS DEL {\037num\037 | ALL}"),
+	  _("Oper news item #%d not found!"),
+	  _("Oper news item #%d deleted."),
+	  _("No oper news items to delete!"),
+	  _("All oper news items deleted.")}
 	 },
 	{NEWS_RANDOM, "RANDOM",
-	 {NEWS_RANDOM_SYNTAX,
-	  NEWS_RANDOM_LIST_HEADER,
-	  NEWS_RANDOM_LIST_NONE,
-	  NEWS_RANDOM_ADD_SYNTAX,
-	  NEWS_RANDOM_ADDED,
-	  NEWS_RANDOM_DEL_SYNTAX,
-	  NEWS_RANDOM_DEL_NOT_FOUND,
-	  NEWS_RANDOM_DELETED,
-	  NEWS_RANDOM_DEL_NONE,
-	  NEWS_RANDOM_DELETED_ALL}
+	 {_("RANDOMNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"),
+	  _("Random news items:"),
+	  _("There is no random news."),
+	  _("Syntax: \002RANDOMNEWS ADD \037text\037\002"),
+	  _("Added new random news item (#%d)."),
+	  _("Syntax: \002RANDOMNEWS DEL {\037num\037 | ALL}"),
+	  _("Random news item #%d not found!"),
+	  _("Random news item #%d deleted."),
+	  _("No random news items to delete!"),
+	  _("All random news items deleted.")}
 	 }
 };
 
 static void DisplayNews(User *u, NewsType Type)
 {
-	LanguageString msg;
 	static unsigned current_news = 0;
+	Anope::string msg;
 
 	if (Type == NEWS_LOGON)
-		msg = NEWS_LOGON_TEXT;
+		msg = _("[\002Logon News\002 - %s] %s");
 	else if (Type == NEWS_OPER)
-		msg = NEWS_OPER_TEXT;
+		msg = _("[\002Oper News\002 - %s] %s");
 	else if (Type == NEWS_RANDOM)
-		msg = NEWS_RANDOM_TEXT;
+		msg = _("[\002Random News\002 - %s] %s");
 	else
 		throw CoreException("news: Invalid type (" + stringify(Type) + ") to display_news()");
 
@@ -95,7 +95,7 @@ static void DisplayNews(User *u, NewsType Type)
 			if (Type == NEWS_RANDOM && i == current_news)
 				continue;
 
-			u->SendMessage(OperServ, msg, do_strftime(News[i]->time).c_str(), News[i]->Text.c_str());
+			u->SendMessage(OperServ, msg.c_str(), do_strftime(News[i]->time).c_str(), News[i]->Text.c_str());
 
 			++displayed;
 
@@ -152,7 +152,7 @@ static int del_newsitem(unsigned num, NewsType type)
 	return count;
 }
 
-static LanguageString *findmsgs(NewsType type, Anope::string &type_name)
+static const char **findmsgs(NewsType type, Anope::string &type_name)
 {
 	for (unsigned i = 0; i < lenof(msgarray); ++i)
 		if (msgarray[i].type == type)
@@ -166,7 +166,7 @@ static LanguageString *findmsgs(NewsType type, Anope::string &type_name)
 class NewsBase : public Command
 {
  protected:
-	CommandReturn DoList(CommandSource &source, NewsType type, LanguageString *msgs)
+	CommandReturn DoList(CommandSource &source, NewsType type, const char **msgs)
 	{
 		int count = 0;
 
@@ -175,18 +175,18 @@ class NewsBase : public Command
 			{
 				if (!count)
 					source.Reply(msgs[MSG_LIST_HEADER]);
-				source.Reply(NEWS_LIST_ENTRY, News[i]->num, do_strftime(News[i]->time).c_str(), !News[i]->who.empty() ? News[i]->who.c_str() : "<unknown>", News[i]->Text.c_str());
+				source.Reply(_("%5d (%s by %s)\n""    %s"), News[i]->num, do_strftime(News[i]->time).c_str(), !News[i]->who.empty() ? News[i]->who.c_str() : "<unknown>", News[i]->Text.c_str());
 				++count;
 			}
 		if (!count)
 			source.Reply(msgs[MSG_LIST_NONE]);
 		else
-			source.Reply(END_OF_ANY_LIST, "News");
+			source.Reply(LanguageString::END_OF_ANY_LIST, "News");
 
 		return MOD_CONT;
 	}
 
-	CommandReturn DoAdd(CommandSource &source, const std::vector<Anope::string> &params, NewsType type, LanguageString *msgs)
+	CommandReturn DoAdd(CommandSource &source, const std::vector<Anope::string> &params, NewsType type, const char **msgs)
 	{
 		const Anope::string text = params.size() > 1 ? params[1] : "";
 		int n;
@@ -197,12 +197,12 @@ class NewsBase : public Command
 		{
 			if (readonly)
 			{
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 				return MOD_CONT;
 			}
 			n = add_newsitem(source, text, type);
 			if (n < 0)
-				source.Reply(NEWS_ADD_FULL);
+				source.Reply(_("News list is full!"));
 			else
 				source.Reply(msgs[MSG_ADDED], n);
 		}
@@ -210,7 +210,7 @@ class NewsBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandReturn DoDel(CommandSource &source, const std::vector<Anope::string> &params, NewsType type, LanguageString *msgs)
+	CommandReturn DoDel(CommandSource &source, const std::vector<Anope::string> &params, NewsType type, const char **msgs)
 	{
 		const Anope::string &text = params.size() > 1 ? params[1] : "";
 		unsigned num;
@@ -221,7 +221,7 @@ class NewsBase : public Command
 		{
 			if (readonly)
 			{
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 				return MOD_CONT;
 			}
 			if (!text.equals_ci("ALL"))
@@ -254,7 +254,7 @@ class NewsBase : public Command
 		const Anope::string &cmd = params[0];
 		Anope::string type_name;
 
-		LanguageString *msgs = findmsgs(type, type_name);
+		const char **msgs = findmsgs(type, type_name);
 		if (!msgs)
 			throw CoreException("news: Invalid type to do_news()");
 
@@ -299,18 +299,29 @@ class CommandOSLogonNews : public NewsBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NEWS_HELP_LOGON, Config->NewsCount);
+		source.Reply(_("Syntax: \002LOGONNEWS ADD \037text\037\002\n"
+			"        \002LOGONNEWS DEL {\037num\037 | ALL}\002\n"
+			"        \002LOGONNEWS LIST\002\n"
+			" \n"
+			"Edits or displays the list of logon news messages.  When a\n"
+			"user connects to the network, these messages will be sent\n"
+			"to them.  (However, no more than \002%d\002 messages will be\n"
+			"sent in order to avoid flooding the user.  If there are\n"
+			"more news messages, only the most recent will be sent.)\n"
+			"NewsCount can be configured in services.conf.\n"
+			" \n"
+			"LOGONNEWS may only be used by Services Operators."), Config->NewsCount);
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "LOGONNEWS", NEWS_LOGON_SYNTAX);
+		SyntaxError(source, "LOGONNEWS", _("LOGONNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_LOGONNEWS);
+		source.Reply(_("    LOGONNEWS   Define messages to be shown to users at logon"));
 	}
 };
 
@@ -328,18 +339,29 @@ class CommandOSOperNews : public NewsBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NEWS_HELP_OPER, Config->NewsCount);
+		source.Reply(_("Syntax: \002OPERNEWS ADD \037text\037\002\n"
+				"        \002OPERNEWS DEL {\037num\037 | ALL}\002\n"
+				"        \002OPERNEWS LIST\002\n"
+				" \n"
+				"Edits or displays the list of oper news messages.  When a\n"
+				"user opers up (with the /OPER command), these messages will\n"
+				"be sent to them.  (However, no more than \002%d\002 messages will\n"
+				"be sent in order to avoid flooding the user.  If there are\n"
+				"more news messages, only the most recent will be sent.)\n"
+				"NewsCount can be configured in services.conf.\n"
+				" \n"
+				"OPERNEWS may only be used by Services Operators."), Config->NewsCount);
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "OPERNEWS", NEWS_OPER_SYNTAX);
+		SyntaxError(source, "OPERNEWS", _("OPERNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_OPERNEWS);
+		source.Reply(_("    OPERNEWS    Define messages to be shown to users who oper"));
 	}
 };
 
@@ -357,18 +379,27 @@ class CommandOSRandomNews : public NewsBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(NEWS_HELP_RANDOM);
+		source.Reply(_("Syntax: \002RANDOMNEWS ADD \037text\037\002\n"
+				"        \002RANDOMNEWS DEL {\037num\037 | ALL}\002\n"
+				"        \002RANDOMNEWS LIST\002\n"
+				" \n"
+				"Edits or displays the list of random news messages.  When a\n"
+				"user connects to the network, one (and only one) of the\n"
+				"random news will be randomly chosen and sent to them.\n"
+				" \n"
+				"RANDOMNEWS may only be used by Services Operators."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "RANDOMNEWS", NEWS_RANDOM_SYNTAX);
+		SyntaxError(source, "RANDOMNEWS", _("RANDOMNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_RANDOMNEWS);
+		source.Reply(_("    RANDOMNEWS  Define messages to be randomly shown to users \n"
+				"                at logon"));
 	}
 };
 
diff --git a/modules/core/os_noop.cpp b/modules/core/os_noop.cpp
index 49f29d2c9..ae6d1fda7 100644
--- a/modules/core/os_noop.cpp
+++ b/modules/core/os_noop.cpp
@@ -36,7 +36,7 @@ class CommandOSNOOP : public Command
 			reason = "NOOP command used by " + u->nick;
 			if (Config->WallOSNoOp)
 				ircdproto->SendGlobops(OperServ, "\2%s\2 used NOOP on \2%s\2", u->nick.c_str(), server.c_str());
-			source.Reply(OPER_NOOP_SET, server.c_str());
+			source.Reply(_("All O:lines of \002%s\002 have been removed."), server.c_str());
 
 			/* Kill all the IRCops of the server */
 			patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick);
@@ -52,7 +52,7 @@ class CommandOSNOOP : public Command
 		else if (cmd.equals_ci("REVOKE"))
 		{
 			ircdproto->SendSVSNOOP(server, 0);
-			source.Reply(OPER_NOOP_REVOKE, server.c_str());
+			source.Reply(_("All O:lines of \002%s\002 have been reset."), server.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "");
@@ -61,18 +61,29 @@ class CommandOSNOOP : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_NOOP);
+		source.Reply(_("Syntax: \002NOOP SET \037server\037\002\n"
+				"          \002NOOP REVOKE \037server\037\002\n"
+				"\n"
+				"\002NOOP SET\002 remove all O:lines of the given\n"
+				"\002server\002 and kill all IRCops currently on it to\n"
+				"prevent them from rehashing the server (because this\n"
+				"would just cancel the effect).\n"
+				"\002NOOP REVOKE\002 makes all removed O:lines available again\n"
+				"on the given \002server\002.\n"
+				"\002Note:\002 The \002server\002 is not checked at all by the\n"
+				"Services."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "NOOP", OPER_NOOP_SYNTAX);
+		SyntaxError(source, "NOOP", _("NOOP {SET|REVOKE} \037server\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_NOOP);
+		source.Reply(_("    NOOP        Temporarily remove all O:lines of a server \n"
+				"                remotely"));
 	}
 };
 
diff --git a/modules/core/os_oline.cpp b/modules/core/os_oline.cpp
index 39b75651f..833bf6ab9 100644
--- a/modules/core/os_oline.cpp
+++ b/modules/core/os_oline.cpp
@@ -29,40 +29,45 @@ class CommandOSOLine : public Command
 
 		/* let's check whether the user is online */
 		if (!(u2 = finduser(nick)))
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else if (u2 && flag[0] == '+')
 		{
 			ircdproto->SendSVSO(Config->s_OperServ, nick, flag);
 			u2->SetMode(OperServ, UMODE_OPER);
-			u2->SendMessage(OperServ, OPER_OLINE_IRCOP);
-			source.Reply(OPER_OLINE_SUCCESS, flag.c_str(), nick.c_str());
+			u2->SendMessage(OperServ, _("You are now an IRC Operator."));
+			source.Reply(_("Operflags \002%s\002 have been added for \002%s\002."), flag.c_str(), nick.c_str());
 			ircdproto->SendGlobops(OperServ, "\2%s\2 used OLINE for %s", u->nick.c_str(), nick.c_str());
 		}
 		else if (u2 && flag[0] == '-')
 		{
 			ircdproto->SendSVSO(Config->s_OperServ, nick, flag);
-			source.Reply(OPER_OLINE_SUCCESS, flag.c_str(), nick.c_str());
+			source.Reply(_("Operflags \002%s\002 have been added for \002%s\002."), flag.c_str(), nick.c_str());
 			ircdproto->SendGlobops(OperServ, "\2%s\2 used OLINE for %s", u->nick.c_str(), nick.c_str());
 		}
 		else
 			this->OnSyntaxError(source, "");
+
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_OLINE);
+		source.Reply(_("Syntax: \002OLINE \037user\037 \037flags\037\002\n"
+				" \n"
+				"Allows Services Opers 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."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "OLINE", OPER_OLINE_SYNTAX);
+		SyntaxError(source, "OLINE", _("OLINE \037nick\037 \037flags\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_OLINE);
+		source.Reply(_("    OLINE       Give Operflags to a certain user"));
 	}
 };
 
diff --git a/modules/core/os_quit.cpp b/modules/core/os_quit.cpp
index edf654334..c06236bd1 100644
--- a/modules/core/os_quit.cpp
+++ b/modules/core/os_quit.cpp
@@ -34,13 +34,19 @@ class CommandOSQuit : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_QUIT);
+		source.Reply(_("Syntax: \002QUIT\002\n"
+				" \n"
+				"Causes Services to do an immediate shutdown; databases are\n"
+				"\002not\002 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.  For normal shutdowns, use the\n"
+				"\002SHUTDOWN\002 command."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_QUIT);
+		source.Reply(_("    QUIT        Terminate the Services program with no save"));
 	}
 };
 
diff --git a/modules/core/os_reload.cpp b/modules/core/os_reload.cpp
index a5b392ec2..f1ec14949 100644
--- a/modules/core/os_reload.cpp
+++ b/modules/core/os_reload.cpp
@@ -34,19 +34,23 @@ class CommandOSReload : public Command
 			Log() << "Error reloading configuration file: " << ex.GetReason();
 		}
 
-		source.Reply(OPER_RELOAD);
+		source.Reply(_("Services' configuration file has been reloaded."));
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_RELOAD);
+		source.Reply(_("Syntax: \002RELOAD\002\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.)"));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_RELOAD);
+		source.Reply(_("    RELOAD      Reload services' configuration file"));
 	}
 };
 
diff --git a/modules/core/os_restart.cpp b/modules/core/os_restart.cpp
index 1f611f0ab..e0c2bde45 100644
--- a/modules/core/os_restart.cpp
+++ b/modules/core/os_restart.cpp
@@ -34,13 +34,16 @@ class CommandOSRestart : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_RESTART);
+		source.Reply(_("Syntax: \002RESTART\002\n"
+				" \n"
+				"Causes Services to save all databases and then restart\n"
+				"(i.e. exit and immediately re-run the executable)."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_RESTART);
+		source.Reply(_("    RESTART     Save databases and restart Services"));
 	}
 };
 
diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp
index 712603fa4..e5f26d548 100644
--- a/modules/core/os_session.cpp
+++ b/modules/core/os_session.cpp
@@ -26,11 +26,11 @@ class ExceptionDelCallback : public NumberList
 	~ExceptionDelCallback()
 	{
 		if (!Deleted)
-			source.Reply(OPER_EXCEPTION_NO_MATCH);
+			source.Reply(_("No matching entries on session-limit exception list."));
 		else if (Deleted == 1)
-			source.Reply(OPER_EXCEPTION_DELETED_ONE);
+			source.Reply(_("Deleted 1 entry from session-limit exception list."));
 		else
-			source.Reply(OPER_EXCEPTION_DELETED_SEVERAL, Deleted);
+			source.Reply(_("Deleted %d entries from session-limit exception list."), Deleted);
 	}
 
 	virtual void HandleNumber(unsigned Number)
@@ -70,8 +70,8 @@ class ExceptionListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_EXCEPTION_LIST_HEADER);
-			source.Reply(OPER_EXCEPTION_LIST_COLHEAD);
+			source.Reply(_("Current Session Limit Exception list:"));
+			source.Reply(_("Num  Limit  Host"));
 		}
 
 		DoList(source, Number - 1);
@@ -82,7 +82,7 @@ class ExceptionListCallback : public NumberList
 		if (index >= exceptions.size())
 			return;
 
-		source.Reply(OPER_EXCEPTION_LIST_FORMAT, index + 1, exceptions[index]->limit, exceptions[index]->mask.c_str());
+		source.Reply(_("%3d  %4d   %s"), index + 1, exceptions[index]->limit, exceptions[index]->mask.c_str());
 	}
 };
 
@@ -101,7 +101,7 @@ class ExceptionViewCallback : public ExceptionListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_EXCEPTION_LIST_HEADER);
+			source.Reply(_("Current Session Limit Exception list:"));
 		}
 
 		DoList(source, Number - 1);
@@ -114,7 +114,7 @@ class ExceptionViewCallback : public ExceptionListCallback
 
 		Anope::string expirebuf = expire_left(source.u->Account(), exceptions[index]->expires);
 
-		source.Reply(OPER_EXCEPTION_VIEW_FORMAT, index + 1, exceptions[index]->mask.c_str(), !exceptions[index]->who.empty() ? exceptions[index]->who.c_str() : "<unknown>", do_strftime((exceptions[index]->time ? exceptions[index]->time : Anope::CurTime)).c_str(), expirebuf.c_str(), exceptions[index]->limit, exceptions[index]->reason.c_str());
+		source.Reply(_("%3d.  %s  (by %s on %s; %s)\n " "    Limit: %-4d  - %s"), index + 1, exceptions[index]->mask.c_str(), !exceptions[index]->who.empty() ? exceptions[index]->who.c_str() : "<unknown>", do_strftime((exceptions[index]->time ? exceptions[index]->time : Anope::CurTime)).c_str(), expirebuf.c_str(), exceptions[index]->limit, exceptions[index]->reason.c_str());
 	}
 };
 
@@ -128,18 +128,18 @@ class CommandOSSession : public Command
 		unsigned mincount = param.is_pos_number_only() ? convertTo<unsigned>(param) : 0;
 
 		if (mincount <= 1)
-			source.Reply(OPER_SESSION_INVALID_THRESHOLD);
+			source.Reply(_("Invalid threshold value. It must be a valid integer greater than 1."));
 		else
 		{
-			source.Reply(OPER_SESSION_LIST_HEADER, mincount);
-			source.Reply(OPER_SESSION_LIST_COLHEAD);
+			source.Reply(_("Hosts with at least \002%d\002 sessions:"), mincount);
+			source.Reply(_("Sessions  Host"));
 
 			for (patricia_tree<Session *>::iterator it(SessionList); it.next();)
 			{
 				Session *session = *it;
 
 				if (session->count >= mincount)
-					source.Reply(OPER_SESSION_LIST_FORMAT, session->count, session->host.c_str());
+					source.Reply(_("%6d    %s"), session->count, session->host.c_str());
 			}
 		}
 
@@ -152,11 +152,11 @@ class CommandOSSession : public Command
 		Session *session = findsession(param);
 
 		if (!session)
-			source.Reply(OPER_SESSION_NOT_FOUND, param.c_str());
+			source.Reply(_("\002%s\002 not found on session list."), param.c_str());
 		else
 		{
 			Exception *exception = find_host_exception(param);
-			source.Reply(OPER_SESSION_VIEW_FORMAT, param.c_str(), session->count, exception ? exception-> limit : Config->DefSessionLimit);
+			source.Reply(_("The host \002%s\002 currently has \002%d\002 sessions with a limit of \002%d\002."), param.c_str(), session->count, exception ? exception-> limit : Config->DefSessionLimit);
 		}
 
 		return MOD_CONT;
@@ -172,7 +172,7 @@ class CommandOSSession : public Command
 
 		if (!Config->LimitSessions)
 		{
-			source.Reply(OPER_EXCEPTION_DISABLED);
+			source.Reply(_("Session limiting is disabled."));
 			return MOD_CONT;
 		}
 
@@ -188,18 +188,31 @@ class CommandOSSession : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SESSION);
+		source.Reply(_("Syntax: \002SESSION LIST \037threshold\037\002\n"
+				"        \002SESSION VIEW \037host\037\002\n"
+				" \n"
+				"Allows Services Operators to view the session list.\n"
+				"\002SESSION LIST\002 lists hosts with at least \037threshold\037 sessions.\n"
+				"The threshold must be a number greater than 1. This is to \n"
+				"prevent accidental listing of the large number of single \n"
+				"session hosts.\n"
+				"\002SESSION VIEW\002 displays detailed information about a specific\n"
+				"host - including the current session count and session limit.\n"
+				"The \037host\037 value may not include wildcards.\n"
+				"See the \002EXCEPTION\002 help for more information about session\n"
+				"limiting and how to set session limits specific to certain\n"
+				"hosts and groups thereof."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SESSION", OPER_SESSION_LIST_SYNTAX);
+		SyntaxError(source, "SESSION", _("SESSION LIST \037limit\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SESSION);
+		source.Reply(_("    SESSION     View the list of host sessions"));
 	}
 };
 
@@ -241,7 +254,7 @@ class CommandOSException : public Command
 		time_t expires = !expiry.empty() ? dotime(expiry) : Config->ExceptionExpiry;
 		if (expires < 0)
 		{
-			source.Reply(BAD_EXPIRY_TIME);
+			source.Reply(LanguageString::BAD_EXPIRY_TIME);
 			return MOD_CONT;
 		}
 		else if (expires > 0)
@@ -251,24 +264,24 @@ class CommandOSException : public Command
 
 		if (limit < 0 || limit > static_cast<int>(Config->MaxSessionLimit))
 		{
-			source.Reply(OPER_EXCEPTION_INVALID_LIMIT, Config->MaxSessionLimit);
+			source.Reply(_("Invalid session limit. It must be a valid integer greater than or equal to zero and less than \002%d\002."), Config->MaxSessionLimit);
 			return MOD_CONT;
 		}
 		else
 		{
 			if (mask.find('!') != Anope::string::npos || mask.find('@') != Anope::string::npos)
 			{
-				source.Reply(OPER_EXCEPTION_INVALID_HOSTMASK);
+				source.Reply(_("Invalid hostmask. Only real hostmasks are valid as exceptions are not matched against nicks or usernames."));
 				return MOD_CONT;
 			}
 
 			x = exception_add(u, mask, limit, reason, u->nick, expires);
 
 			if (x == 1)
-				source.Reply(OPER_EXCEPTION_ADDED, mask.c_str(), limit);
+				source.Reply(_("Session limit for \002%s\002 set to \002%d\002."), mask.c_str(), limit);
 
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 		}
 
 		return MOD_CONT;
@@ -296,15 +309,15 @@ class CommandOSException : public Command
 				if (mask.equals_ci(exceptions[i]->mask))
 				{
 					ExceptionDelCallback::DoDel(source, i);
-					source.Reply(OPER_EXCEPTION_DELETED, mask.c_str());
+					source.Reply(_("\002%s\002 deleted from session-limit exception list."), mask.c_str());
 					break;
 				}
 			if (i == end)
-				source.Reply(OPER_EXCEPTION_NOT_FOUND, mask.c_str());
+				source.Reply(_("\002%s\002 not found on session-limit exception list."), mask.c_str());
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		return MOD_CONT;
 	}
@@ -330,10 +343,10 @@ class CommandOSException : public Command
 			exceptions[n1] = exceptions[n2];
 			exceptions[n2] = temp;
 
-			source.Reply(OPER_EXCEPTION_MOVED, exceptions[n1]->mask.c_str(), n1 + 1, n2 + 1);
+			source.Reply(_("Exception for \002%s\002 (#%d) moved to position \002%d\002."), exceptions[n1]->mask.c_str(), n1 + 1, n2 + 1);
 
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 		}
 		else
 			this->OnSyntaxError(source, "MOVE");
@@ -361,15 +374,15 @@ class CommandOSException : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_EXCEPTION_LIST_HEADER);
-						source.Reply(OPER_EXCEPTION_LIST_COLHEAD);
+						source.Reply(_("Current Session Limit Exception list:"));
+						source.Reply(_("Num  Limit  Host"));
 					}
 
 					ExceptionListCallback::DoList(source, i);
 				}
 
 			if (!SentHeader)
-				source.Reply(OPER_EXCEPTION_NO_MATCH);
+				source.Reply(_("No matching entries on session-limit exception list."));
 		}
 
 		return MOD_CONT;
@@ -395,14 +408,14 @@ class CommandOSException : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_EXCEPTION_LIST_HEADER);
+						source.Reply(_("Current Session Limit Exception list:"));
 					}
 
 					ExceptionViewCallback::DoList(source, i);
 				}
 
 			if (!SentHeader)
-				source.Reply(OPER_EXCEPTION_NO_MATCH);
+				source.Reply(_("No matching entries on session-limit exception list."));
 		}
 
 		return MOD_CONT;
@@ -418,7 +431,7 @@ class CommandOSException : public Command
 
 		if (!Config->LimitSessions)
 		{
-			source.Reply(OPER_EXCEPTION_DISABLED);
+			source.Reply(_("Session limiting is disabled."));
 			return MOD_CONT;
 		}
 
@@ -440,18 +453,54 @@ class CommandOSException : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_EXCEPTION);
+		source.Reply(_("Syntax: \002EXCEPTION ADD [\037+expiry\037] \037mask\037 \037limit\037 \037reason\037\002\n"
+				"        \002EXCEPTION DEL {\037mask\037 | \037list\037}\002\n"
+				"        \002EXCEPTION MOVE \037num\037 \037position\037\002\n"
+				"        \002EXCEPTION LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002EXCEPTION VIEW [\037mask\037 | \037list\037]\002\n"
+				" \n"
+				"Allows Services Operators to manipulate the list of hosts that\n"
+				"have specific session limits - allowing certain machines, \n"
+				"such as shell servers, to carry more than the default number\n"
+				"of clients at a time. Once a host reaches its session limit,\n"
+				"all clients attempting to connect from that host will be\n"
+				"killed. Before the user is killed, they are notified, via a\n"
+				"/NOTICE from %S, of a source of help regarding session\n"
+				"limiting. The content of this notice is a config setting.\n"
+				" \n"
+				"\002EXCEPTION ADD\002 adds the given host mask to the exception list.\n"
+				"Note that \002nick!user@host\002 and \002user@host\002 masks are invalid!\n"
+				"Only real host masks, such as \002box.host.dom\002 and \002*.host.dom\002,\n"
+				"are allowed because sessions limiting does not take nick or\n"
+				"user names into account. \037limit\037 must be a number greater than\n"
+				"or equal to zero. This determines how many sessions this host\n"
+				"may carry at a time. A value of zero means the host has an\n"
+				"unlimited session limit. See the \002AKILL\002 help for details about\n"
+				"the format of the optional \037expiry\037 parameter.\n"
+				"\002EXCEPTION DEL\002 removes the given mask from the exception list.\n"
+				"\002EXCEPTION MOVE\002 moves exception \037num\037 to \037position\037. The\n"
+				"exceptions inbetween will be shifted up or down to fill the gap.\n"
+				"\002EXCEPTION LIST\002 and \002EXCEPTION VIEW\002 show all current\n"
+				"exceptions; if the optional mask is given, the list is limited\n"
+				"to those exceptions matching the mask. The difference is that\n"
+				"\002EXCEPTION VIEW\002 is more verbose, displaying the name of the\n"
+				"person who added the exception, its session limit, reason, \n"
+				"host mask and the expiry date and time.\n"
+				" \n"
+				"Note that a connecting client will \"use\" the first exception\n"
+				"their host matches. Large exception lists and widely matching\n"
+				"exception masks are likely to degrade services' performance."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "EXCEPTION", OPER_EXCEPTION_SYNTAX);
+		SyntaxError(source, "EXCEPTION", _("EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [\037params\037]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_EXCEPTION);
+		source.Reply(_("    EXCEPTION   Modify the session-limit exception list"));
 	}
 };
 
diff --git a/modules/core/os_set.cpp b/modules/core/os_set.cpp
index 9a693c143..17841279a 100644
--- a/modules/core/os_set.cpp
+++ b/modules/core/os_set.cpp
@@ -20,14 +20,14 @@ class CommandOSSet : public Command
 	{
 		Log(LOG_ADMIN, source.u, this);
 
-		LanguageString index;
+		Anope::string index;
 
-		index = readonly ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF;
-		source.Reply(index, "READONLY");
-		index = debug ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF;
-		source.Reply(index, "DEBUG");
-		index = noexpire ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF;
-		source.Reply(index, "NOEXPIRE");
+		index = readonly ? _("%s is enabled") : _("%s is disabled");
+		source.Reply(index.c_str(), "READONLY");
+		index = debug ? _("%s is enabled") : _("%s is disabled");
+		source.Reply(index.c_str(), "DEBUG");
+		index = noexpire ? _("%s is enabled") : _("%s is disabled");
+		source.Reply(index.c_str(), "NOEXPIRE");
 
 		return MOD_CONT;
 	}
@@ -47,16 +47,16 @@ class CommandOSSet : public Command
 		{
 			readonly = true;
 			Log(LOG_ADMIN, u, this) << "READONLY ON";
-			source.Reply(OPER_SET_READONLY_ON);
+			source.Reply(_("Services are now in \002read-only\002 mode."));
 		}
 		else if (setting.equals_ci("OFF"))
 		{
 			readonly = false;
 			Log(LOG_ADMIN, u, this) << "READONLY OFF";
-			source.Reply(OPER_SET_READONLY_OFF);
+			source.Reply(_("Services are now in \002read-write\002 mode."));
 		}
 		else
-			source.Reply(OPER_SET_READONLY_ERROR);
+			source.Reply(_("Setting for READONLY must be \002\002 or \002\002."));
 
 		return MOD_CONT;
 	}
@@ -78,23 +78,23 @@ class CommandOSSet : public Command
 		 * Rob
 		 **/
 		if (!Config->SuperAdmin)
-			source.Reply(OPER_SUPER_ADMIN_NOT_ENABLED);
+			source.Reply(_("SuperAdmin setting not enabled in services.conf"));
 		else if (setting.equals_ci("ON"))
 		{
 			u->isSuperAdmin = 1;
-			source.Reply(OPER_SUPER_ADMIN_ON);
+			source.Reply(_("You are now a SuperAdmin"));
 			Log(LOG_ADMIN, u, this) << "SUPERADMIN ON";
-			ircdproto->SendGlobops(OperServ, GetString(OPER_SUPER_ADMIN_WALL_ON).c_str(), u->nick.c_str());
+			ircdproto->SendGlobops(OperServ, GetString(NULL, _("%s is now a Super-Admin")).c_str(), u->nick.c_str());
 		}
 		else if (setting.equals_ci("OFF"))
 		{
 			u->isSuperAdmin = 0;
-			source.Reply(OPER_SUPER_ADMIN_OFF);
+			source.Reply(_("You are no longer a SuperAdmin"));
 			Log(LOG_ADMIN, u, this) << "SUPERADMIN OFF";
-			ircdproto->SendGlobops(OperServ, GetString(OPER_SUPER_ADMIN_WALL_OFF).c_str(), u->nick.c_str());
+			ircdproto->SendGlobops(OperServ, GetString(NULL, _("%s is no longer a Super-Admin")).c_str(), u->nick.c_str());
 		}
 		else
-			source.Reply(OPER_SUPER_ADMIN_SYNTAX);
+			source.Reply(_("Setting for SuperAdmin must be \002\002 or \002\002 (must be enabled in services.conf)"));
 
 		return MOD_CONT;
 	}
@@ -114,22 +114,22 @@ class CommandOSSet : public Command
 		{
 			debug = 1;
 			Log(LOG_ADMIN, u, this) << "DEBUG ON";
-			source.Reply(OPER_SET_DEBUG_ON);
+			source.Reply(_("Services are now in debug mode."));
 		}
 		else if (setting.equals_ci("OFF") || (setting[0] == '0' && setting.is_number_only() && !convertTo<int>(setting)))
 		{
 			Log(LOG_ADMIN, u, this) << "DEBUG OFF";
 			debug = 0;
-			source.Reply(OPER_SET_DEBUG_OFF);
+			source.Reply(_("Services are now in non-debug mode."));
 		}
 		else if (setting.is_number_only() && convertTo<int>(setting) > 0)
 		{
 			debug = convertTo<int>(setting);
 			Log(LOG_ADMIN, u, this) << "DEBUG " << debug;
-			source.Reply(OPER_SET_DEBUG_LEVEL, debug);
+			source.Reply(_("Services are now in debug mode (level %d)."), debug);
 		}
 		else
-			source.Reply(OPER_SET_DEBUG_ERROR);
+			source.Reply(_("Setting for DEBUG must be \002\002, \002\002, or a positive number."));
 
 		return MOD_CONT;
 	}
@@ -149,16 +149,16 @@ class CommandOSSet : public Command
 		{
 			noexpire = true;
 			Log(LOG_ADMIN, u, this) << "NOEXPIRE ON";
-			source.Reply(OPER_SET_NOEXPIRE_ON);
+			source.Reply(_("Services are now in \002no expire\002 mode."));
 		}
 		else if (setting.equals_ci("OFF"))
 		{
 			noexpire = false;
 			Log(LOG_ADMIN, u, this) << "NOEXPIRE OFF";
-			source.Reply(OPER_SET_NOEXPIRE_OFF);
+			source.Reply(_("Services are now in \002expire\002 mode."));
 		}
 		else
-			source.Reply(OPER_SET_NOEXPIRE_ERROR);
+			source.Reply(_("Setting for NOEXPIRE must be \002\002 or \002\002."));
 
 		return MOD_CONT;
 	}
@@ -182,7 +182,7 @@ class CommandOSSet : public Command
 		else if (option.equals_ci("NOEXPIRE"))
 			return this->DoSetNoExpire(source, params);
 		else
-			source.Reply(OPER_SET_UNKNOWN_OPTION, option.c_str());
+			source.Reply(_("Unknown option \002%s\002."), option.c_str());
 
 		return MOD_CONT;
 	}
@@ -190,29 +190,57 @@ class CommandOSSet : public Command
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
 		if (subcommand.empty())
-			source.Reply(OPER_HELP_SET);
+			source.Reply(_("Syntax: \002SET \037option\037 \037setting\037\002\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"
+					"    NOEXPIRE   Activate or deactivate no expire mode\n"
+					"    SUPERADMIN Activate or deactivate super-admin mode\n"
+					"    LIST       List the options"));
 		else if (subcommand.equals_ci("LIST"))
-			source.Reply(OPER_HELP_SET_LIST);
+			source.Reply(_("Syntax: \002SET LIST\n"
+					"Display the various %S settings"));
 		else if (subcommand.equals_ci("READONLY"))
-			source.Reply(OPER_HELP_SET_READONLY);
+			source.Reply(_("Syntax: \002SET READONLY {ON | OFF}\002\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"
+					"including channel and nickname access lists, etc.  IRCops\n"
+					"with sufficient Services privileges will be able to modify\n"
+					"Services' AKILL list and drop or forbid nicknames and\n"
+					"channels, but any such changes will not be saved unless\n"
+					"read-only mode is deactivated before Services is terminated\n"
+					"or restarted.\n"
+					" \n"
+					"This option is equivalent to the command-line option\n"
+					"\002-readonly\002."));
 		else if (subcommand.equals_ci("NOEXPIRE"))
-			source.Reply(OPER_HELP_SET_NOEXPIRE);
+			source.Reply(_("Syntax: \002SET NOEXPIRE {ON | OFF}\002\n"
+					"Sets no expire mode on or off. In no expire mode, nicks,\n"
+					"channels, akills and exceptions won't expire until the\n"
+					"option is unset.\n"
+					"This option is equivalent to the command-line option\n"
+					"\002-noexpire\002."));
 		else if (subcommand.equals_ci("SUPERADMIN"))
-			source.Reply(OPER_HELP_SET_SUPERADMIN);
+			source.Reply(_("Syntax: \002SET SUPERADMIN {ON | OFF}\002\n"
+					"Setting this will grant you extra privileges such as the\n"
+					"ability to be \"founder\" on all channel's etc...\n"
+					"This option is \002not\002 persistent, and should only be used when\n"
+					"needed, and set back to OFF when no longer needed."));
 		else
 			return false;
-
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SET", OPER_SET_SYNTAX);
+		SyntaxError(source, "SET", _("SET \037option\037 \037setting\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SET);
+		source.Reply(_("    SET         Set various global Services options"));
 	}
 };
 
diff --git a/modules/core/os_shutdown.cpp b/modules/core/os_shutdown.cpp
index 45eb205d1..7f15d5169 100644
--- a/modules/core/os_shutdown.cpp
+++ b/modules/core/os_shutdown.cpp
@@ -33,13 +33,15 @@ class CommandOSShutdown : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SHUTDOWN);
+		source.Reply(_("Syntax: \002SHUTDOWN\002\n"
+				" \n"
+				"Causes Services to save all databases and then shut down."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SHUTDOWN);
+		source.Reply(_("    SHUTDOWN    Terminate the Services program with save"));
 	}
 };
 
diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp
index 9ea88ec5e..97d1911d7 100644
--- a/modules/core/os_snline.cpp
+++ b/modules/core/os_snline.cpp
@@ -26,11 +26,11 @@ class SNLineDelCallback : public NumberList
 	~SNLineDelCallback()
 	{
 		if (!Deleted)
-			source.Reply(OPER_SNLINE_NO_MATCH);
+			source.Reply(_("No matching entries on the SNLINE list."));
 		else if (Deleted == 1)
-			source.Reply(OPER_SNLINE_DELETED_ONE);
+			source.Reply(_("Deleted 1 entry from the SNLINE list."));
 		else
-			source.Reply(OPER_SNLINE_DELETED_SEVERAL, Deleted);
+			source.Reply(_("Deleted %d entries from the SNLINE list."), Deleted);
 	}
 
 	void HandleNumber(unsigned Number)
@@ -66,7 +66,7 @@ class SNLineListCallback : public NumberList
 	~SNLineListCallback()
 	{
 		if (!SentHeader)
-			source.Reply(OPER_SNLINE_NO_MATCH);
+			source.Reply(_("No matching entries on the SNLINE list."));
 	}
 
 	virtual void HandleNumber(unsigned Number)
@@ -82,7 +82,7 @@ class SNLineListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_SNLINE_LIST_HEADER);
+			source.Reply(_("Current SNLINE list:\n  Num   Mask                              Reason"));
 		}
 
 		DoList(source, x, Number - 1);
@@ -90,7 +90,7 @@ class SNLineListCallback : public NumberList
 
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
-		source.Reply(OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -114,7 +114,7 @@ class SNLineViewCallback : public SNLineListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_SNLINE_VIEW_HEADER);
+			source.Reply(_("Current SNLINE list:"));
 		}
 
 		DoList(source, x, Number - 1);
@@ -123,7 +123,7 @@ class SNLineViewCallback : public SNLineListCallback
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
 		Anope::string expirebuf = expire_left(source.u->Account(), x->Expires);
-		source.Reply(OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -154,7 +154,7 @@ class CommandOSSNLine : public Command
 		/* Do not allow less than a minute expiry time */
 		if (expires && expires < 60)
 		{
-			source.Reply(BAD_EXPIRY_TIME);
+			source.Reply(LanguageString::BAD_EXPIRY_TIME);
 			return MOD_CONT;
 		}
 		else if (expires > 0)
@@ -197,7 +197,7 @@ class CommandOSSNLine : public Command
 
 			if (percent > 95)
 			{
-				source.Reply(USERHOST_MASK_TOO_WIDE, mask.c_str());
+				source.Reply(LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 				Log(LOG_ADMIN, u, this) << "tried to SNLine " << percent << "% of the network (" << affected << " users)";
 				return MOD_CONT;
 			}
@@ -207,7 +207,7 @@ class CommandOSSNLine : public Command
 			if (!x)
 				return MOD_CONT;
 
-			source.Reply(OPER_SNLINE_ADDED, mask.c_str());
+			source.Reply(_("\002%s\002 added to the SNLINE list."), mask.c_str());
 
 			if (Config->WallOSSNLine)
 			{
@@ -243,7 +243,7 @@ class CommandOSSNLine : public Command
 			}
 
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 
 		}
 		else
@@ -258,7 +258,7 @@ class CommandOSSNLine : public Command
 
 		if (SNLine->GetList().empty())
 		{
-			source.Reply(OPER_SNLINE_LIST_EMPTY);
+			source.Reply(_("SNLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -281,18 +281,18 @@ class CommandOSSNLine : public Command
 
 			if (!x)
 			{
-				source.Reply(OPER_SNLINE_NOT_FOUND, mask.c_str());
+				source.Reply(_("\002%s\002 not found on the SNLINE list."), mask.c_str());
 				return MOD_CONT;
 			}
 
 			FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, x, X_SNLINE));
 
 			SNLineDelCallback::DoDel(source, x);
-			source.Reply(OPER_SNLINE_DELETED, mask.c_str());
+			source.Reply(_("\002%s\002 deleted from the SNLINE list."), mask.c_str());
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		return MOD_CONT;
 	}
@@ -301,7 +301,7 @@ class CommandOSSNLine : public Command
 	{
 		if (SNLine->GetList().empty())
 		{
-			source.Reply(OPER_SNLINE_LIST_EMPTY);
+			source.Reply(_("SNLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -325,7 +325,7 @@ class CommandOSSNLine : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_SNLINE_LIST_HEADER);
+						source.Reply(_("Current SNLINE list:\n  Num   Mask                              Reason"));
 					}
 
 					SNLineListCallback::DoList(source, x, i);
@@ -333,9 +333,9 @@ class CommandOSSNLine : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_SNLINE_NO_MATCH);
+				source.Reply(_("No matching entries on the SNLINE list."));
 			else
-				source.Reply(END_OF_ANY_LIST, "SNLine");
+				source.Reply(LanguageString::END_OF_ANY_LIST, "SNLine");
 		}
 
 		return MOD_CONT;
@@ -345,7 +345,7 @@ class CommandOSSNLine : public Command
 	{
 		if (SNLine->GetList().empty())
 		{
-			source.Reply(OPER_SNLINE_LIST_EMPTY);
+			source.Reply(_("SNLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -369,7 +369,7 @@ class CommandOSSNLine : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_SNLINE_VIEW_HEADER);
+						source.Reply(_("Current SNLINE list:"));
 					}
 
 					SNLineViewCallback::DoList(source, x, i);
@@ -377,7 +377,7 @@ class CommandOSSNLine : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_SNLINE_NO_MATCH);
+				source.Reply(_("No matching entries on the SNLINE list."));
 		}
 
 		return MOD_CONT;
@@ -388,7 +388,7 @@ class CommandOSSNLine : public Command
 		User *u = source.u;
 		FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SNLINE));
 		SNLine->Clear();
-		source.Reply(OPER_SNLINE_CLEAR);
+		source.Reply(_("The SNLINE list has been cleared."));
 
 		return MOD_CONT;
 	}
@@ -419,18 +419,60 @@ class CommandOSSNLine : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SNLINE);
+		source.Reply(_("Syntax: \002SNLINE ADD [+\037expiry\037] \037mask\037:\037reason\037\002\n"
+				"        \002SNLINE DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002SNLINE LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002SNLINE VIEW [\037mask\037 | \037list\037]\002\n"
+				"        \002SNLINE CLEAR\002\n"
+				" \n"
+				"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"
+				"session.\n"
+				" \n"
+				"\002SNLINE ADD\002 adds the given realname mask to the SNLINE\n"
+				"list for the given reason (which \002must\002 be given).\n"
+				"\037expiry\037 is specified as an integer followed by one of \037d\037 \n"
+				"(days), \037h\037 (hours), or \037m\037 (minutes).  Combinations (such as \n"
+				"\0371h30m\037) are not permitted.  If a unit specifier is not \n"
+				"included, the default is days (so \037+30\037 by itself means 30 \n"
+				"days).  To add an SNLINE which does not expire, use \037+0\037.  If the\n"
+				"realname mask to be added starts with a \037+\037, an expiry time must\n"
+				"be given, even if it is the same as the default.  The\n"
+				"current SNLINE default expiry time can be found with the\n"
+				"\002STATS AKILL\002 command.\n"
+				"Note: because the realname mask may contain spaces, the\n"
+				"separator between it and the reason is a colon.\n"
+				" \n"
+				"The \002SNLINE DEL\002 command removes the given mask from the\n"
+				"SNLINE list if it is present.  If a list of entry numbers is \n"
+				"given, those entries are deleted.  (See the example for LIST \n"
+				"below.)\n"
+				" \n"
+				"The \002SNLINE LIST\002 command displays the SNLINE list.  \n"
+				"If a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed.  If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002SNLINE LIST 2-5,7-9\002\n"
+				"      Lists SNLINE entries numbered 2 through 5 and 7 \n"
+				"      through 9.\n"
+				" \n"
+				"\002SNLINE VIEW\002 is a more verbose version of \002SNLINE LIST\002, and \n"
+				"will show who added an SNLINE, the date it was added, and when \n"
+				"it expires, as well as the realname mask and reason.\n"
+				" \n"
+				"\002SNLINE CLEAR\002 clears all entries of the SNLINE list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SNLINE", OPER_SNLINE_SYNTAX);
+		SyntaxError(source, "SNLINE", _("SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037mask\037 | \037entry-list\037}[:\037reason\037]]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SNLINE);
+		source.Reply(_("    SNLINE      Manipulate the SNLINE list"));
 	}
 };
 
diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp
index dbf6dcbe4..4117ebf57 100644
--- a/modules/core/os_sqline.cpp
+++ b/modules/core/os_sqline.cpp
@@ -25,11 +25,11 @@ class SQLineDelCallback : public NumberList
 	~SQLineDelCallback()
 	{
 		if (!Deleted)
-			source.Reply(OPER_SQLINE_NO_MATCH);
+			source.Reply(_("No matching entries on the SQLINE list."));
 		else if (Deleted == 1)
-			source.Reply(OPER_SQLINE_DELETED_ONE);
+			source.Reply(_("Deleted 1 entry from the SQLINE list."));
 		else
-			source.Reply(OPER_SQLINE_DELETED_SEVERAL, Deleted);
+			source.Reply(_("Deleted %d entries from the SQLINE list."), Deleted);
 	}
 
 	void HandleNumber(unsigned Number)
@@ -65,7 +65,7 @@ class SQLineListCallback : public NumberList
 	~SQLineListCallback()
 	{
 		if (!SentHeader)
-			source.Reply(OPER_SQLINE_NO_MATCH);
+			source.Reply(_("No matching entries on the SQLINE list."));
 	}
 
 	virtual void HandleNumber(unsigned Number)
@@ -81,7 +81,7 @@ class SQLineListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_SQLINE_LIST_HEADER);
+			source.Reply(_("Current SQLINE list:\n  Num   Mask                              Reason"));
 		}
 
 		DoList(source, x, Number - 1);
@@ -89,7 +89,7 @@ class SQLineListCallback : public NumberList
 
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
-		source.Reply(OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -113,7 +113,7 @@ class SQLineViewCallback : public SQLineListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_SQLINE_VIEW_HEADER);
+			source.Reply(_("Current SQLINE list:"));
 		}
 
 		DoList(source, x, Number);
@@ -122,7 +122,7 @@ class SQLineViewCallback : public SQLineListCallback
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
 		Anope::string expirebuf = expire_left(source.u->Account(), x->Expires);
-		source.Reply(OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -153,7 +153,7 @@ class CommandOSSQLine : public Command
 		/* Do not allow less than a minute expiry time */
 		if (expires && expires < 60)
 		{
-			source.Reply(BAD_EXPIRY_TIME);
+			source.Reply(LanguageString::BAD_EXPIRY_TIME);
 			return MOD_CONT;
 		}
 		else if (expires > 0)
@@ -178,7 +178,7 @@ class CommandOSSQLine : public Command
 
 			if (percent > 95)
 			{
-				source.Reply(USERHOST_MASK_TOO_WIDE, mask.c_str());
+				source.Reply(LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 				Log(LOG_ADMIN, u, this) << "tried to SQLine " << percent << "% of the network (" << affected << " users)";
 				return MOD_CONT;
 			}
@@ -187,7 +187,7 @@ class CommandOSSQLine : public Command
 			if (!x)
 				return MOD_CONT;
 
-			source.Reply(OPER_SQLINE_ADDED, mask.c_str());
+			source.Reply(_("\002%s\002 added to the SQLINE list."), mask.c_str());
 
 			if (Config->WallOSSQLine)
 			{
@@ -223,7 +223,7 @@ class CommandOSSQLine : public Command
 			}
 
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 
 		}
 		else
@@ -238,7 +238,7 @@ class CommandOSSQLine : public Command
 
 		if (SQLine->GetList().empty())
 		{
-			source.Reply(OPER_SQLINE_LIST_EMPTY);
+			source.Reply(_("SQLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -261,18 +261,18 @@ class CommandOSSQLine : public Command
 
 			if (!x)
 			{
-				source.Reply(OPER_SQLINE_NOT_FOUND, mask.c_str());
+				source.Reply(_("\002%s\002 not found on the SQLINE list."), mask.c_str());
 				return MOD_CONT;
 			}
 
 			FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, x, X_SQLINE));
 
 			SQLineDelCallback::DoDel(source, x);
-			source.Reply(OPER_SQLINE_DELETED, mask.c_str());
+			source.Reply(_("\002%s\002 deleted from the SQLINE list."), mask.c_str());
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		return MOD_CONT;
 	}
@@ -281,7 +281,7 @@ class CommandOSSQLine : public Command
 	{
 		if (SQLine->GetList().empty())
 		{
-			source.Reply(OPER_SQLINE_LIST_EMPTY);
+			source.Reply(_("SQLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -305,7 +305,7 @@ class CommandOSSQLine : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_SQLINE_LIST_HEADER);
+						source.Reply(_("Current SQLINE list:\n  Num   Mask                              Reason"));
 					}
 
 					SQLineListCallback::DoList(source, x, i);
@@ -313,9 +313,9 @@ class CommandOSSQLine : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_SQLINE_NO_MATCH);
+				source.Reply(_("No matching entries on the SQLINE list."));
 			else
-				source.Reply(END_OF_ANY_LIST, "SQLine");
+				source.Reply(LanguageString::END_OF_ANY_LIST, "SQLine");
 		}
 
 		return MOD_CONT;
@@ -325,7 +325,7 @@ class CommandOSSQLine : public Command
 	{
 		if (SQLine->GetList().empty())
 		{
-			source.Reply(OPER_SQLINE_LIST_EMPTY);
+			source.Reply(_("SQLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -349,7 +349,7 @@ class CommandOSSQLine : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_SQLINE_VIEW_HEADER);
+						source.Reply(_("Current SQLINE list:"));
 					}
 
 					SQLineViewCallback::DoList(source, x, i);
@@ -357,7 +357,7 @@ class CommandOSSQLine : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_SQLINE_NO_MATCH);
+				source.Reply(_("No matching entries on the SQLINE list."));
 		}
 
 		return MOD_CONT;
@@ -368,7 +368,7 @@ class CommandOSSQLine : public Command
 		User *u = source.u;
 		FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SQLINE));
 		SQLine->Clear();
-		source.Reply(OPER_SQLINE_CLEAR);
+		source.Reply(_("The SQLINE list has been cleared."));
 
 		return MOD_CONT;
 	}
@@ -398,18 +398,61 @@ class CommandOSSQLine : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SQLINE);
+		source.Reply(_("Syntax: \002SQLINE ADD [+\037expiry\037] \037mask\037 \037reason\037\002\n"
+				"        \002SQLINE DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002SQLINE LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002SQLINE VIEW [\037mask\037 | \037list\037]\002\n"
+				"        \002SQLINE CLEAR\002\n"
+				" \n"
+				"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"
+				"session.\n"
+				"If the first character of the mask is #, services will \n"
+				"prevent the use of matching channels (on IRCds that \n"
+				"support it).\n"
+				" \n"
+				"\002SQLINE ADD\002 adds the given (nick's) mask to the SQLINE\n"
+				"list for the given reason (which \002must\002 be given).\n"
+				"\037expiry\037 is specified as an integer followed by one of \037d\037 \n"
+				"(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as \n"
+				"\0371h30m\037) are not permitted. If a unit specifier is not \n"
+				"included, the default is days (so \037+30\037 by itself means 30 \n"
+				"days). To add an SQLINE which does not expire, use \037+0\037. \n"
+				"If the mask to be added starts with a \037+\037, an expiry time \n"
+				"must be given, even if it is the same as the default. The\n"
+				"current SQLINE default expiry time can be found with the\n"
+				"\002STATS AKILL\002 command.\n"
+				" \n"
+				"The \002SQLINE DEL\002 command removes the given mask from the\n"
+				"SQLINE list if it is present. If a list of entry numbers is \n"
+				"given, those entries are deleted. (See the example for LIST \n"
+				"below.)\n"
+				" \n"
+				"The \002SQLINE LIST\002 command displays the SQLINE list. \n"
+				"If a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed. If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002SQLINE LIST 2-5,7-9\002\n"
+				"      Lists SQLINE entries numbered 2 through 5 and 7 \n"
+				"      through 9.\n"
+				" \n"
+				"\002SQLINE VIEW\002 is a more verbose version of \002SQLINE LIST\002, and \n"
+				"will show who added an SQLINE, the date it was added, and when \n"
+				"it expires, as well as the mask and reason.\n"
+				" \n"
+				"\002SQLINE CLEAR\002 clears all entries of the SQLINE list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SQLINE", OPER_SQLINE_SYNTAX);
+		SyntaxError(source, "SQLINE", _("SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037nick\037 | \037mask\037 | \037entry-list\037} [\037reason\037]]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SQLINE);
+		source.Reply(_("    SQLINE      Manipulate the SQLINE list"));
 	}
 };
 
diff --git a/modules/core/os_staff.cpp b/modules/core/os_staff.cpp
index 5b1af9ae1..1f6b60eb3 100644
--- a/modules/core/os_staff.cpp
+++ b/modules/core/os_staff.cpp
@@ -22,7 +22,7 @@ class CommandOSStaff : public Command
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		source.Reply(OPER_STAFF_LIST_HEADER);
+		source.Reply(_("On Level Nick"));
 
 		for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it)
 		{
@@ -37,28 +37,30 @@ class CommandOSStaff : public Command
 					User *u2 = *uit;
 
 					if (na->nick.equals_ci(u2->nick))
-						source.Reply(OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str());
+						source.Reply(_(" %c %s  %s"), '*', type.c_str(), u2->nick.c_str());
 					else
-						source.Reply(OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str());
+						source.Reply(_(" %c %s  %s [%s]"), '*', type.c_str(), na->nick.c_str(), u2->nick.c_str());
 				}
 				if (nc->Users.empty())
-					source.Reply(OPER_STAFF_FORMAT, ' ', type.c_str(), na->nick.c_str());
+					source.Reply(_(" %c %s  %s"), ' ', type.c_str(), na->nick.c_str());
 			}
 		}
 
-		source.Reply(END_OF_ANY_LIST, "Staff");
+		source.Reply(LanguageString::END_OF_ANY_LIST, "Staff");
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_STAFF);
+		source.Reply(_("Syntax: \002STAFF\002\n"
+				"Displays all Services Staff nicks along with level\n"
+				"and on-line status."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_STAFF);
+		source.Reply(_("    STAFF       Display Services staff and online status"));
 	}
 };
 
diff --git a/modules/core/os_stats.cpp b/modules/core/os_stats.cpp
index cf972b7a6..96d0bcb75 100644
--- a/modules/core/os_stats.cpp
+++ b/modules/core/os_stats.cpp
@@ -41,81 +41,81 @@ class CommandOSStats : public Command
 	{
 		int timeout;
 		/* AKILLs */
-		source.Reply(OPER_STATS_AKILL_COUNT, SGLine->GetCount());
+		source.Reply(_("Current number of AKILLs: \002%d\002"), SGLine->GetCount());
 		timeout = Config->AutokillExpiry + 59;
 		if (timeout >= 172800)
-			source.Reply(OPER_STATS_AKILL_EXPIRE_DAYS, timeout / 86400);
+			source.Reply(_("Default AKILL expiry time: \002%d days\002"), timeout / 86400);
 		else if (timeout >= 86400)
-			source.Reply(OPER_STATS_AKILL_EXPIRE_DAY);
+			source.Reply(_("Default AKILL expiry time: \0021 day\002"));
 		else if (timeout >= 7200)
-			source.Reply(OPER_STATS_AKILL_EXPIRE_HOURS, timeout / 3600);
+			source.Reply(_("Default AKILL expiry time: \002%d hours\002"), timeout / 3600);
 		else if (timeout >= 3600)
-			source.Reply(OPER_STATS_AKILL_EXPIRE_HOUR);
+			source.Reply(_("Default AKILL expiry time: \0021 hour\002"));
 		else if (timeout >= 120)
-			source.Reply(OPER_STATS_AKILL_EXPIRE_MINS, timeout / 60);
+			source.Reply(_("Default AKILL expiry time: \002%d minutes\002"), timeout / 60);
 		else if (timeout >= 60)
-			source.Reply(OPER_STATS_AKILL_EXPIRE_MIN);
+			source.Reply(_("Default AKILL expiry time: \0021 minute\002"));
 		else
-			source.Reply(OPER_STATS_AKILL_EXPIRE_NONE);
+			source.Reply(_("Default AKILL expiry time: \002No expiration\002"));
 		if (ircd->snline)
 		{
 			/* SNLINEs */
-			source.Reply(OPER_STATS_SNLINE_COUNT, SNLine->GetCount());
+			source.Reply(_("Current number of SNLINEs: \002%d\002"), SNLine->GetCount());
 			timeout = Config->SNLineExpiry + 59;
 			if (timeout >= 172800)
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_DAYS, timeout / 86400);
+				source.Reply(_("Default SNLINE expiry time: \002%d days\002"), timeout / 86400);
 			else if (timeout >= 86400)
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_DAY);
+				source.Reply(_("Default SNLINE expiry time: \0021 day\002"));
 			else if (timeout >= 7200)
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_HOURS, timeout / 3600);
+				source.Reply(_("Default SNLINE expiry time: \002%d hours\002"), timeout / 3600);
 			else if (timeout >= 3600)
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_HOUR);
+				source.Reply(_("Default SNLINE expiry time: \0021 hour\002"));
 			else if (timeout >= 120)
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_MINS, timeout / 60);
+				source.Reply(_("Default SNLINE expiry time: \002%d minutes\002"), timeout / 60);
 			else if (timeout >= 60)
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_MIN);
+				source.Reply(_("Default SNLINE expiry time: \0021 minute\002"));
 			else
-				source.Reply(OPER_STATS_SNLINE_EXPIRE_NONE);
+				source.Reply(_("Default SNLINE expiry time: \002No expiration\002"));
 		}
 		if (ircd->sqline)
 		{
 			/* SQLINEs */
-			source.Reply(OPER_STATS_SQLINE_COUNT, SQLine->GetCount());
+			source.Reply(_("Current number of SQLINEs: \002%d\002"), SQLine->GetCount());
 			timeout = Config->SQLineExpiry + 59;
 			if (timeout >= 172800)
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_DAYS, timeout / 86400);
+				source.Reply(_("Default SQLINE expiry time: \002%d days\002"), timeout / 86400);
 			else if (timeout >= 86400)
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_DAY);
+				source.Reply(_("Default SQLINE expiry time: \0021 day\002"));
 			else if (timeout >= 7200)
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_HOURS, timeout / 3600);
+				source.Reply(_("Default SQLINE expiry time: \002%d hours\002"), timeout / 3600);
 			else if (timeout >= 3600)
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_HOUR);
+				source.Reply(_("Default SQLINE expiry time: \0021 hour\002"));
 			else if (timeout >= 120)
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_MINS, timeout / 60);
+				source.Reply(_("Default SQLINE expiry time: \002%d minutes\002"), timeout / 60);
 			else if (timeout >= 60)
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_MIN);
+				source.Reply(_("Default SQLINE expiry time: \0021 minute\002"));
 			else
-				source.Reply(OPER_STATS_SQLINE_EXPIRE_NONE);
+				source.Reply(_("Default SQLINE expiry time: \002No expiration\002"));
 		}
 		if (ircd->szline)
 		{
 			/* SZLINEs */
-			source.Reply(OPER_STATS_SZLINE_COUNT, SZLine->GetCount());
+			source.Reply(_("Current number of SZLINEs: \002%d\002"), SZLine->GetCount());
 			timeout = Config->SZLineExpiry + 59;
 			if (timeout >= 172800)
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_DAYS, timeout / 86400);
+				source.Reply(_("Default SZLINE expiry time: \002%d days\002"), timeout / 86400);
 			else if (timeout >= 86400)
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_DAY);
+				source.Reply(_("Default SZLINE expiry time: \0021 day\002"));
 			else if (timeout >= 7200)
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_HOURS, timeout / 3600);
+				source.Reply(_("Default SZLINE expiry time: \002%d hours\002"), timeout / 3600);
 			else if (timeout >= 3600)
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_HOUR);
+				source.Reply(_("Default SZLINE expiry time: \0021 hour\002"));
 			else if (timeout >= 120)
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_MINS, timeout / 60);
+				source.Reply(_("Default SZLINE expiry time: \002%d minutes\002"), timeout / 60);
 			else if (timeout >= 60)
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_MIN);
+				source.Reply(_("Default SZLINE expiry time: \0021 minute\002"));
 			else
-				source.Reply(OPER_STATS_SZLINE_EXPIRE_NONE);
+				source.Reply(_("Default SZLINE expiry time: \002No expiration\002"));
 		}
 		return MOD_CONT;
 	}
@@ -123,7 +123,7 @@ class CommandOSStats : public Command
 	CommandReturn DoStatsReset(CommandSource &source)
 	{
 		maxusercnt = usercnt;
-		source.Reply(OPER_STATS_RESET);
+		source.Reply(_("Statistics reset."));
 		return MOD_CONT;
 	}
 
@@ -131,43 +131,43 @@ class CommandOSStats : public Command
 	{
 		time_t uptime = Anope::CurTime - start_time;
 		int days = uptime / 86400, hours = (uptime / 3600) % 24, mins = (uptime / 60) % 60, secs = uptime % 60;
-		source.Reply(OPER_STATS_CURRENT_USERS, usercnt, opcnt);
-		source.Reply(OPER_STATS_MAX_USERS, maxusercnt, do_strftime(maxusertime).c_str());
+		source.Reply(_("Current users: \002%d\002 (\002%d\002 ops)"), usercnt, opcnt);
+		source.Reply(_("Maximum users: \002%d\002 (%s)"), maxusercnt, do_strftime(maxusertime).c_str());
 		if (days > 1)
-			source.Reply(OPER_STATS_UPTIME_DHMS, days, hours, mins, secs);
+			source.Reply(_("Services up \002%d\002 days, \002%02d:%02d\002"), days, hours, mins, secs);
 		else if (days == 1)
-			source.Reply(OPER_STATS_UPTIME_1DHMS, days, hours, mins, secs);
+			source.Reply(_("Services up OPER_STATS_UPTIME_1\002%dOPER_STATS_UPTIME_1\002 day, OPER_STATS_UPTIME_1\002%02d:%02dOPER_STATS_UPTIME_1\002"), days, hours, mins, secs);
 		else
 		{
 			if (hours > 1)
 			{
 				if (mins != 1)
-					source.Reply(OPER_STATS_UPTIME_HMS, hours, mins);
+					source.Reply(_("Services up \002%d\002 hours, \002%d\002 minutes"), hours, mins);
 				else
-					source.Reply(OPER_STATS_UPTIME_H1MS, hours, mins, secs);
+					source.Reply(_("Services up OPER_STATS_UPTIME_H1\002%dOPER_STATS_UPTIME_H1\002 hours, OPER_STATS_UPTIME_H1\002%dOPER_STATS_UPTIME_H1\002 minute"), hours, mins, secs);
 			}
 			else if (hours == 1)
 			{
 				if (mins != 1)
-					source.Reply(OPER_STATS_UPTIME_1HMS, hours, mins, secs);
+					source.Reply(_("Services up OPER_STATS_UPTIME_1\002%dOPER_STATS_UPTIME_1\002 hour, OPER_STATS_UPTIME_1\002%dOPER_STATS_UPTIME_1\002 minutes"), hours, mins, secs);
 				else
-					source.Reply(OPER_STATS_UPTIME_1H1MS, hours, mins, secs);
+					source.Reply(_("Services up OPER_STATS_UPTIME_1H1\002%dOPER_STATS_UPTIME_1H1\002 hour, OPER_STATS_UPTIME_1H1\002%dOPER_STATS_UPTIME_1H1\002 minute"), hours, mins, secs);
 			}
 			else
 			{
 				if (mins != 1)
 				{
 					if (secs != 1)
-						source.Reply(OPER_STATS_UPTIME_MS, mins, secs);
+						source.Reply(_("Services up \002%d\002 minutes, \002%d\002 seconds"), mins, secs);
 					else
-						source.Reply(OPER_STATS_UPTIME_M1S, mins, secs);
+						source.Reply(_("Services up OPER_STATS_UPTIME_M1\002%dOPER_STATS_UPTIME_M1\002 minutes, OPER_STATS_UPTIME_M1\002%dOPER_STATS_UPTIME_M1\002 second"), mins, secs);
 				}
 				else
 				{
 					if (secs != 1)
-						source.Reply(OPER_STATS_UPTIME_1MS, mins, secs);
+						source.Reply(_("Services up OPER_STATS_UPTIME_1\002%dOPER_STATS_UPTIME_1\002 minute, OPER_STATS_UPTIME_1\002%dOPER_STATS_UPTIME_1\002 seconds"), mins, secs);
 					else
-						source.Reply(OPER_STATS_UPTIME_1M1S, mins, secs);
+						source.Reply(_("Services up OPER_STATS_UPTIME_1M1\002%dOPER_STATS_UPTIME_1M1\002 minute, OPER_STATS_UPTIME_1M1\002%dOPER_STATS_UPTIME_1M1\002 second"), mins, secs);
 				}
 			}
 		}
@@ -186,9 +186,9 @@ class CommandOSStats : public Command
 		if (!buf.empty())
 			buf.erase(buf.begin());
 
-		source.Reply(OPER_STATS_UPLINK_SERVER, Me->GetLinks().front()->GetName().c_str());
-		source.Reply(OPER_STATS_UPLINK_CAPAB, buf.c_str());
-		source.Reply(OPER_STATS_UPLINK_SERVER_COUNT, stats_count_servers(Me->GetLinks().front()));
+		source.Reply(_("Uplink server: %s"), Me->GetLinks().front()->GetName().c_str());
+		source.Reply(_("Uplink capab: %s"), buf.c_str());
+		source.Reply(_("Servers found: %d"), stats_count_servers(Me->GetLinks().front()));
 		return MOD_CONT;
 	}
 
@@ -196,33 +196,33 @@ class CommandOSStats : public Command
 	{
 		long count, mem;
 
-		source.Reply(OPER_STATS_BYTES_READ, TotalRead / 1024);
-		source.Reply(OPER_STATS_BYTES_WRITTEN, TotalWritten / 1024);
+		source.Reply(_("Bytes read    : %5d kB"), TotalRead / 1024);
+		source.Reply(_("Bytes written : %5d kB"), TotalWritten / 1024);
 
 		get_user_stats(count, mem);
-		source.Reply(OPER_STATS_USER_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("User          : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		get_channel_stats(&count, &mem);
-		source.Reply(OPER_STATS_CHANNEL_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("Channel       : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		get_core_stats(count, mem);
-		source.Reply(OPER_STATS_GROUPS_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("NS Groups     : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		get_aliases_stats(count, mem);
-		source.Reply(OPER_STATS_ALIASES_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("NS Aliases    : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		get_chanserv_stats(&count, &mem);
-		source.Reply(OPER_STATS_CHANSERV_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("ChanServ      : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		if (!Config->s_BotServ.empty())
 		{
 			get_botserv_stats(&count, &mem);
-			source.Reply(OPER_STATS_BOTSERV_MEM, count, (mem + 512) / 1024);
+			source.Reply(_("BotServ       : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		}
 		if (!Config->s_HostServ.empty())
 		{
 			get_hostserv_stats(&count, &mem);
-			source.Reply(OPER_STATS_HOSTSERV_MEM, count, (mem + 512) / 1024);
+			source.Reply(_("HostServ      : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		}
 		get_operserv_stats(&count, &mem);
-		source.Reply(OPER_STATS_OPERSERV_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("OperServ      : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 		get_session_stats(count, mem);
-		source.Reply(OPER_STATS_SESSIONS_MEM, count, (mem + 512) / 1024);
+		source.Reply(_("Sessions      : \002%6d\002 records, \002%5d\002 kB"), count, (mem + 512) / 1024);
 
 		return MOD_CONT;
 	}
@@ -242,7 +242,7 @@ class CommandOSStats : public Command
 			else if (extra.equals_ci("RESET"))
 				return this->DoStatsReset(source);
 			else if (!extra.equals_ci("MEMORY") && !extra.equals_ci("UPLINK"))
-				source.Reply(OPER_STATS_UNKNOWN_OPTION, extra.c_str());
+				source.Reply(_("Unknown STATS option \002%s\002."), extra.c_str());
 		}
 
 		if (extra.empty() || (!extra.equals_ci("MEMORY") && !extra.equals_ci("UPLINK")))
@@ -259,13 +259,34 @@ class CommandOSStats : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_STATS);
+		source.Reply(_("Syntax: \002STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\002\n"
+				" \n"
+				"Without any option, shows the current number of users and\n"
+				"IRCops online (excluding Services), the highest number of\n"
+				"users online since Services was started, and the length of\n"
+				"time Services has been running.\n"
+				" \n"
+				"With the \002AKILL\002 option, displays the current size of the\n"
+				"AKILL list and the current default expiry time.\n"
+				" \n"
+				"The \002RESET\002 option currently resets the maximum user count\n"
+				"to the number of users currently present on the network.\n"
+				" \n"
+				"The \002MEMORY\002 option displays information on the memory\n"
+				"usage of Services. Using this option can freeze Services for\n"
+				"a short period of time on large networks; don't overuse it!\n"
+				" \n"
+				"The \002UPLINK\002 option displays information about the current\n"
+				"server Anope uses as an uplink to the network.\n"
+				" \n"
+				"The \002ALL\002 displays the user and uptime statistics, and\n"
+				"everything you'd see with \002MEMORY\002 and \002UPLINK\002 options."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_STATS);
+		source.Reply(_("    STATS       Show status of Services and network"));
 	}
 };
 
diff --git a/modules/core/os_svsnick.cpp b/modules/core/os_svsnick.cpp
index 1e59aea2e..30a06310a 100644
--- a/modules/core/os_svsnick.cpp
+++ b/modules/core/os_svsnick.cpp
@@ -32,33 +32,33 @@ class CommandOSSVSNick : public Command
 		/* Truncate long nicknames to NICKMAX-2 characters */
 		if (newnick.length() > Config->NickLen)
 		{
-			source.Reply(NICK_X_TRUNCATED, newnick.c_str(), Config->NickLen, newnick.c_str());
+			source.Reply(_("Nick \002%s\002 was truncated to %d characters."), newnick.c_str(), Config->NickLen, newnick.c_str());
 			newnick = params[1].substr(0, Config->NickLen);
 		}
 
 		/* Check for valid characters */
 		if (newnick[0] == '-' || isdigit(newnick[0]))
 		{
-			source.Reply(NICK_X_ILLEGAL, newnick.c_str());
+			source.Reply(_("Nick \002%s\002 is an illegal nickname and cannot be used."), newnick.c_str());
 			return MOD_CONT;
 		}
 		for (unsigned i = 0, end = newnick.length(); i < end; ++i)
 			if (!isvalidnick(newnick[i]))
 			{
-				source.Reply(NICK_X_ILLEGAL, newnick.c_str());
+				source.Reply(_("Nick \002%s\002 is an illegal nickname and cannot be used."), newnick.c_str());
 				return MOD_CONT;
 			}
 
 		/* Check for a nick in use or a forbidden/suspended nick */
 		if (!(u2 = finduser(nick)))
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else if (finduser(newnick))
-			source.Reply(NICK_X_IN_USE, newnick.c_str());
+			source.Reply(_("Nick \002%s\002 is currently in use."), newnick.c_str());
 		else if ((na = findnick(newnick)) && na->HasFlag(NS_FORBIDDEN))
-			source.Reply(NICK_X_FORBIDDEN, newnick.c_str());
+			source.Reply(LanguageString::NICK_X_FORBIDDEN, newnick.c_str());
 		else
 		{
-			source.Reply(OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str());
+			source.Reply(_("The nick \002%s\002 is now being changed to \002%s\002."), nick.c_str(), newnick.c_str());
 			ircdproto->SendGlobops(OperServ, "%s used SVSNICK to change %s to %s", u->nick.c_str(), nick.c_str(), newnick.c_str());
 			ircdproto->SendForceNickChange(u2, newnick, Anope::CurTime);
 		}
@@ -67,18 +67,20 @@ class CommandOSSVSNick : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SVSNICK);
+		source.Reply(_("Syntax: \002SVSNICK \037nick\037 \037newnick\037\002\n"
+				" \n"
+				"Forcefully changes a user's nickname from nick to newnick."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SVSNICK", OPER_SVSNICK_SYNTAX);
+		SyntaxError(source, "SVSNICK", _("SVSNICK \037nick\037 \037newnick\037 "));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SVSNICK);
+		source.Reply(_("    SVSNICK     Forcefully change a user's nickname"));
 	}
 };
 
diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp
index 4535335ed..5cc219291 100644
--- a/modules/core/os_szline.cpp
+++ b/modules/core/os_szline.cpp
@@ -25,11 +25,11 @@ class SZLineDelCallback : public NumberList
 	~SZLineDelCallback()
 	{
 		if (!Deleted)
-			source.Reply(OPER_SZLINE_NO_MATCH);
+			source.Reply(_("No matching entries on the SZLINE list."));
 		else if (Deleted == 1)
-			source.Reply(OPER_SZLINE_DELETED_ONE);
+			source.Reply(_("Deleted 1 entry from the SZLINE list."));
 		else
-			source.Reply(OPER_SZLINE_DELETED_SEVERAL, Deleted);
+			source.Reply(_("Deleted %d entries from the SZLINE list."), Deleted);
 	}
 
 	void HandleNumber(unsigned Number)
@@ -65,7 +65,7 @@ class SZLineListCallback : public NumberList
 	~SZLineListCallback()
 	{
 		if (!SentHeader)
-			source.Reply(OPER_SZLINE_NO_MATCH);
+			source.Reply(_("No matching entries on the SZLINE list."));
 	}
 
 	virtual void HandleNumber(unsigned Number)
@@ -81,7 +81,7 @@ class SZLineListCallback : public NumberList
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_SZLINE_LIST_HEADER);
+			source.Reply(_("Current SZLINE list:\n  Num   Mask                              Reason"));
 		}
 
 		DoList(source, x, Number - 1);
@@ -89,7 +89,7 @@ class SZLineListCallback : public NumberList
 
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
-		source.Reply(OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -113,7 +113,7 @@ class SZLineViewCallback : public SZLineListCallback
 		if (!SentHeader)
 		{
 			SentHeader = true;
-			source.Reply(OPER_SZLINE_VIEW_HEADER);
+			source.Reply(_("Current SZLINE list:"));
 		}
 
 		DoList(source, x, Number - 1);
@@ -122,7 +122,7 @@ class SZLineViewCallback : public SZLineListCallback
 	static void DoList(CommandSource &source, XLine *x, unsigned Number)
 	{
 		Anope::string expirebuf = expire_left(source.u->Account(), x->Expires);
-		source.Reply(OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str());
+		source.Reply(LanguageString::OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str());
 	}
 };
 
@@ -153,7 +153,7 @@ class CommandOSSZLine : public Command
 		/* Do not allow less than a minute expiry time */
 		if (expires && expires < 60)
 		{
-			source.Reply(BAD_EXPIRY_TIME);
+			source.Reply(LanguageString::BAD_EXPIRY_TIME);
 			return MOD_CONT;
 		}
 		else if (expires > 0)
@@ -181,7 +181,7 @@ class CommandOSSZLine : public Command
 
 			if (percent > 95)
 			{
-				source.Reply(USERHOST_MASK_TOO_WIDE, mask.c_str());
+				source.Reply(LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 				Log(LOG_ADMIN, u, this) << "tried to SZLine " << percent << "% of the network (" << affected << " users)";
 				return MOD_CONT;
 			}
@@ -191,7 +191,7 @@ class CommandOSSZLine : public Command
 			if (!x)
 				return MOD_CONT;
 
-			source.Reply(OPER_SZLINE_ADDED, mask.c_str());
+			source.Reply(_("\002%s\002 added to the SZLINE list."), mask.c_str());
 
 			if (Config->WallOSSZLine)
 			{
@@ -227,7 +227,7 @@ class CommandOSSZLine : public Command
 			}
 
 			if (readonly)
-				source.Reply(READ_ONLY_MODE);
+				source.Reply(LanguageString::READ_ONLY_MODE);
 
 		}
 		else
@@ -242,7 +242,7 @@ class CommandOSSZLine : public Command
 
 		if (SZLine->GetList().empty())
 		{
-			source.Reply(OPER_SZLINE_LIST_EMPTY);
+			source.Reply(_("SZLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -265,18 +265,18 @@ class CommandOSSZLine : public Command
 
 			if (!x)
 			{
-				source.Reply(OPER_SZLINE_NOT_FOUND, mask.c_str());
+				source.Reply(_("\002%s\002 not found on the SZLINE list."), mask.c_str());
 				return MOD_CONT;
 			}
 
 			FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, x, X_SZLINE));
 
 			SZLineDelCallback::DoDel(source, x);
-			source.Reply(OPER_SZLINE_DELETED, mask.c_str());
+			source.Reply(_("\002%s\002 deleted from the SZLINE list."), mask.c_str());
 		}
 
 		if (readonly)
-			source.Reply(READ_ONLY_MODE);
+			source.Reply(LanguageString::READ_ONLY_MODE);
 
 		return MOD_CONT;
 	}
@@ -285,7 +285,7 @@ class CommandOSSZLine : public Command
 	{
 		if (SZLine->GetList().empty())
 		{
-			source.Reply(OPER_SZLINE_LIST_EMPTY);
+			source.Reply(_("SZLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -309,7 +309,7 @@ class CommandOSSZLine : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_SZLINE_LIST_HEADER);
+						source.Reply(_("Current SZLINE list:\n  Num   Mask                              Reason"));
 					}
 
 					SZLineListCallback::DoList(source, x, i);
@@ -317,7 +317,7 @@ class CommandOSSZLine : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_SZLINE_NO_MATCH);
+				source.Reply(_("No matching entries on the SZLINE list."));
 		}
 
 		return MOD_CONT;
@@ -327,7 +327,7 @@ class CommandOSSZLine : public Command
 	{
 		if (SZLine->GetList().empty())
 		{
-			source.Reply(OPER_SZLINE_LIST_EMPTY);
+			source.Reply(_("SZLINE list is empty."));
 			return MOD_CONT;
 		}
 
@@ -351,7 +351,7 @@ class CommandOSSZLine : public Command
 					if (!SentHeader)
 					{
 						SentHeader = true;
-						source.Reply(OPER_SZLINE_VIEW_HEADER);
+						source.Reply(_("Current SZLINE list:"));
 					}
 
 					SZLineViewCallback::DoList(source, x, i);
@@ -359,7 +359,7 @@ class CommandOSSZLine : public Command
 			}
 
 			if (!SentHeader)
-				source.Reply(OPER_SZLINE_NO_MATCH);
+				source.Reply(_("No matching entries on the SZLINE list."));
 		}
 
 		return MOD_CONT;
@@ -370,7 +370,7 @@ class CommandOSSZLine : public Command
 		User *u = source.u;
 		FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SZLINE));
 		SZLine->Clear();
-		source.Reply(OPER_SZLINE_CLEAR);
+		source.Reply(_("The SZLINE list has been cleared."));
 
 		return MOD_CONT;
 	}
@@ -401,18 +401,58 @@ class CommandOSSZLine : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SZLINE);
+		source.Reply(_("Syntax: \002SZLINE ADD [+\037expiry\037] \037mask\037 \037reason\037\002\n"
+				"        \002SZLINE DEL {\037mask\037 | \037entry-num\037 | \037list\037}\002\n"
+				"        \002SZLINE LIST [\037mask\037 | \037list\037]\002\n"
+				"        \002SZLINE VIEW [\037mask\037 | \037list\037]\002\n"
+				"        \002SZLINE CLEAR\002\n"
+				" \n"
+				"Allows Services operators to manipulate the SZLINE list.  If\n"
+				"a user with an IP matching an SZLINE mask attempts to \n"
+				"connect, Services will not allow it to pursue his IRC\n"
+				"session (and this, whether the IP has a PTR RR or not).\n"
+				" \n"
+				"\002SZLINE ADD\002 adds the given (nick's) IP mask to the SZLINE\n"
+				"list for the given reason (which \002must\002 be given).\n"
+				"\037expiry\037 is specified as an integer followed by one of \037d\037 \n"
+				"(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as \n"
+				"\0371h30m\037) are not permitted. If a unit specifier is not \n"
+				"included, the default is days (so \037+30\037 by itself means 30 \n"
+				"days). To add an SZLINE which does not expire, use \037+0\037. If the\n"
+				"realname mask to be added starts with a \037+\037, an expiry time must\n"
+				"be given, even if it is the same as the default. The\n"
+				"current SZLINE default expiry time can be found with the\n"
+				"\002STATS AKILL\002 command.\n"
+				" \n"
+				"The \002SZLINE DEL\002 command removes the given mask from the\n"
+				"SZLINE list if it is present. If a list of entry numbers is \n"
+				"given, those entries are deleted. (See the example for LIST \n"
+				"below.)\n"
+				" \n"
+				"The \002SZLINE LIST\002 command displays the SZLINE list.\n"
+				"If a wildcard mask is given, only those entries matching the\n"
+				"mask are displayed. If a list of entry numbers is given,\n"
+				"only those entries are shown; for example:\n"
+				"   \002SZLINE LIST 2-5,7-9\002\n"
+				"      Lists SZLINE entries numbered 2 through 5 and 7 \n"
+				"      through 9.\n"
+				" \n"
+				"\002SZLINE VIEW\002 is a more verbose version of \002SZLINE LIST\002, and \n"
+				"will show who added an SZLINE, the date it was added, and when\n"
+				"it expires, as well as the IP mask and reason.\n"
+				" \n"
+				"\002SZLINE CLEAR\002 clears all entries of the SZLINE list."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "SZLINE", OPER_SZLINE_SYNTAX);
+		SyntaxError(source, "SZLINE", _("SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037nick\037 | \037mask\037 | \037entry-list\037} [\037reason\037]]"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SZLINE);
+		source.Reply(_("    SZLINE      Manipulate the SZLINE list"));
 	}
 };
 
diff --git a/modules/core/os_umode.cpp b/modules/core/os_umode.cpp
index 106a9c4e4..046ec670b 100644
--- a/modules/core/os_umode.cpp
+++ b/modules/core/os_umode.cpp
@@ -38,13 +38,13 @@ class CommandOSUMode : public Command
 			return MOD_CONT;
 		}
 		if (!(u2 = finduser(nick)))
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+			source.Reply(LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else
 		{
 			u2->SetModes(OperServ, "%s", modes.c_str());
 
-			source.Reply(OPER_UMODE_SUCCESS, nick.c_str());
-			u2->SendMessage(OperServ, OPER_UMODE_CHANGED, u->nick.c_str());
+			source.Reply(_("Changed usermodes of \002%s\002."), nick.c_str());
+			u2->SendMessage(OperServ, _("\002%s\002 changed your usermodes."), u->nick.c_str());
 
 			if (Config->WallOSMode)
 				ircdproto->SendGlobops(OperServ, "\2%s\2 used UMODE on %s", u->nick.c_str(), nick.c_str());
@@ -54,18 +54,22 @@ class CommandOSUMode : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_UMODE);
+		source.Reply(_("Syntax: \002UMODE \037user\037 \037modes\037\002\n"
+				" \n"
+				"Allows Services Opers to set user modes for any user.\n"
+				"Parameters are the same as for the standard /MODE\n"
+				"command."));
 		return true;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(source, "UMODE", OPER_UMODE_SYNTAX);
+		SyntaxError(source, "UMODE", _("UMODE \037nick\037 \037modes\037"));
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_UMODE);
+		source.Reply(_("    UMODE       Change a user's modes"));
 	}
 };
 
diff --git a/modules/core/os_update.cpp b/modules/core/os_update.cpp
index 414b7e973..1ea6d090b 100644
--- a/modules/core/os_update.cpp
+++ b/modules/core/os_update.cpp
@@ -22,20 +22,24 @@ class CommandOSUpdate : public Command
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		source.Reply(OPER_UPDATING);
+		source.Reply(_("Updating databases."));
 		save_data = true;
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_UPDATE);
+		source.Reply(_("Syntax: \002UPDATE\002\n"
+				" \n"
+				"Causes Services to update all database files as soon as you\n"
+				"send the command."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_UPDATE);
+		source.Reply(_("    UPDATE      Force the Services databases to be\n"
+				"                updated on disk immediately"));
 	}
 };
 
diff --git a/modules/core/os_userlist.cpp b/modules/core/os_userlist.cpp
index 4f5c9d0f9..a4dac7a41 100644
--- a/modules/core/os_userlist.cpp
+++ b/modules/core/os_userlist.cpp
@@ -32,7 +32,8 @@ class CommandOSUserList : public Command
 
 		if (!pattern.empty() && (c = findchan(pattern)))
 		{
-			source.Reply(OPER_USERLIST_HEADER_CHAN, pattern.c_str());
+			source.Reply(_("\002%s\002 users list:\n"
+					"Nick                 Mask"), pattern.c_str());
 
 			for (CUserList::iterator cuit = c->users.begin(), cuit_end = c->users.end(); cuit != cuit_end; ++cuit)
 			{
@@ -43,12 +44,13 @@ class CommandOSUserList : public Command
 						if (!uc->user->HasMode(*it))
 							continue;
 
-				source.Reply(OPER_USERLIST_RECORD, uc->user->nick.c_str(), uc->user->GetIdent().c_str(), uc->user->GetDisplayedHost().c_str());
+				source.Reply(_("%-20s %s@%s"), uc->user->nick.c_str(), uc->user->GetIdent().c_str(), uc->user->GetDisplayedHost().c_str());
 			}
 		}
 		else
 		{
-			source.Reply(OPER_USERLIST_HEADER);
+			source.Reply(_("Users list:\n"
+					"Nick                 Mask"));
 
 			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 			{
@@ -64,23 +66,31 @@ class CommandOSUserList : public Command
 							if (!u2->HasMode(*mit))
 								continue;
 				}
-				source.Reply(OPER_USERLIST_RECORD, u2->nick.c_str(), u2->GetIdent().c_str(), u2->GetDisplayedHost().c_str());
+				source.Reply(_("%-20s %s@%s"), u2->nick.c_str(), u2->GetIdent().c_str(), u2->GetDisplayedHost().c_str());
 			}
 		}
 
-		source.Reply(OPER_USERLIST_END);
+		source.Reply(_("End of users list."));
 		return MOD_CONT;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_USERLIST);
+		source.Reply(_("Syntax: \002USERLIST [{\037pattern | channel\037} [\037INVISIBLE\037]]\002\n"
+				" \n"
+				"Lists all users currently online on the IRC network, whether their\n"
+				"nick is registered or not.\n"
+				" \n"
+				"If \002pattern\002 is given, lists only users that match it (it must be in\n"
+				"the format nick!user@host). If \002channel\002 is given, lists only users\n"
+				"that are on the given channel. If INVISIBLE is specified, only users\n"
+				"with the +i flag will be listed."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_USERLIST);
+		source.Reply(_("    USERLIST    Lists all user records"));
 	}
 };
 
diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp
index 8124aa535..c8c641876 100644
--- a/modules/extra/cs_appendtopic.cpp
+++ b/modules/extra/cs_appendtopic.cpp
@@ -59,9 +59,9 @@ class CommandCSAppendTopic : public Command
 		Channel *c = ci->c;
 
 		if (!c)
-			u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, ci->name.c_str());
+			u->SendMessage(ChanServ, LanguageString::CHAN_X_NOT_IN_USE, ci->name.c_str());
 		else if (!check_access(u, ci, CA_TOPIC))
-			u->SendMessage(ChanServ, ACCESS_DENIED);
+			u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
 		else
 		{
 			Anope::string topic;
diff --git a/modules/extra/cs_enforce.cpp b/modules/extra/cs_enforce.cpp
index 568d0b17f..c5a2ee590 100644
--- a/modules/extra/cs_enforce.cpp
+++ b/modules/extra/cs_enforce.cpp
@@ -89,7 +89,7 @@ class CommandCSEnforce : public Command
 			if (check_access(uc->user, ci, CA_NOJOIN))
 			{
 				get_idealban(ci, uc->user, mask);
-				Anope::string reason = GetString(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
+				Anope::string reason = GetString(uc->user->Account(), LanguageString::CHAN_NOT_ALLOWED_TO_JOIN);
 				c->SetMode(NULL, CMODE_BAN, mask);
 				c->Kick(NULL, uc->user, "%s", reason.c_str());
 			}
@@ -113,7 +113,7 @@ class CommandCSEnforce : public Command
 			if (!uc->user->IsIdentified())
 			{
 				get_idealban(ci, uc->user, mask);
-				Anope::string reason = GetString(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
+				Anope::string reason = GetString(uc->user->Account(), LanguageString::CHAN_NOT_ALLOWED_TO_JOIN);
 				if (!c->HasMode(CMODE_REGISTERED))
 					c->SetMode(NULL, CMODE_BAN, mask);
 				c->Kick(NULL, uc->user, "%s", reason.c_str());
@@ -134,9 +134,9 @@ class CommandCSEnforce : public Command
 		Channel *c = ci->c;
 
 		if (!c)
-			u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, ci->name.c_str());
+			u->SendMessage(ChanServ, LanguageString::CHAN_X_NOT_IN_USE, ci->name.c_str());
 		else if (!check_access(u, ci, CA_AKICK))
-			u->SendMessage(ChanServ, ACCESS_DENIED);
+			u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
 		else
 		{
 			if (what.empty() || what.equals_ci("SET"))
diff --git a/modules/extra/cs_entrymsg.cpp b/modules/extra/cs_entrymsg.cpp
index 3edeef84c..b32937847 100644
--- a/modules/extra/cs_entrymsg.cpp
+++ b/modules/extra/cs_entrymsg.cpp
@@ -33,40 +33,40 @@ unsigned EntryMsg::MaxEntries = 0;
 class CommandEntryMessage : public Command
 {
  private:
-	void DoList(User *u, ChannelInfo *ci)
+	void DoList(CommandSource &source, ChannelInfo *ci)
 	{
 		std::vector<EntryMsg> messages;
 		if (ci->GetExtRegular("cs_entrymsg", messages))
 		{
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_LIST_HEADER, ci->name.c_str());
+			source.Reply(_("Entry message list for \2%s\2:"), ci->name.c_str());
 			for (unsigned i = 0; i < messages.size(); ++i)
-				u->SendMessage(ChanServ, CHAN_ENTRYMSG_LIST_ENTRY, i + 1, messages[i].message.c_str(), messages[i].creator.c_str(), do_strftime(messages[i].when).c_str());
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_LIST_END);
+				source.Reply(LanguageString::CHAN_LIST_ENTRY, i + 1, messages[i].message.c_str(), messages[i].creator.c_str(), do_strftime(messages[i].when).c_str());
+			source.Reply(_("End of entry message list."));
 		}
 		else
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("Entry message list for \2%s\2 is empty."), ci->name.c_str());
 	}
 		
-	void DoAdd(User *u, ChannelInfo *ci, const Anope::string &message)
+	void DoAdd(CommandSource &source, ChannelInfo *ci, const Anope::string &message)
 	{
 		std::vector<EntryMsg> messages;
 		ci->GetExtRegular("cs_entrymsg", messages);
 
 		if (EntryMsg::MaxEntries && messages.size() >= EntryMsg::MaxEntries)
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_LIST_FULL, ci->name.c_str());
+			source.Reply(_("The entry message list for \2%s\2 is full."), ci->name.c_str());
 		else
 		{
-			messages.push_back(EntryMsg(u->nick, message));
+			messages.push_back(EntryMsg(source.u->nick, message));
 			ci->Extend("cs_entrymsg", new ExtensibleItemRegular<std::vector<EntryMsg> >(messages));
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_ADDED, ci->name.c_str());
+			source.Reply(_("Entry message added to \2%s\2"), ci->name.c_str());
 		}
 	}
 
-	void DoDel(User *u, ChannelInfo *ci, const Anope::string &message)
+	void DoDel(CommandSource &source, ChannelInfo *ci, const Anope::string &message)
 	{
 		std::vector<EntryMsg> messages;
 		if (!message.is_pos_number_only())
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_NOT_FOUND, message.c_str(), ci->name.c_str());
+			source.Reply(("Entry message \002%s\002 not found on channel \002%s\002."), message.c_str(), ci->name.c_str());
 		else if (ci->GetExtRegular("cs_entrymsg", messages))
 		{
 			unsigned i = convertTo<unsigned>(message);
@@ -74,19 +74,19 @@ class CommandEntryMessage : public Command
 			{
 				messages.erase(messages.begin() + i - 1);
 				ci->Extend("cs_entrymsg", new ExtensibleItemRegular<std::vector<EntryMsg> >(messages));
-				u->SendMessage(ChanServ, CHAN_ENTRYMSG_DELETED, i, ci->name.c_str());
+				source.Reply(_("Entry message \2%i\2 for \2%s\2 deleted."), i, ci->name.c_str());
 			}
 			else
-				u->SendMessage(ChanServ, CHAN_ENTRYMSG_NOT_FOUND, message.c_str(), ci->name.c_str());
+				source.Reply(_("Entry message \2%s\2 not found on channel \2%s\2."), message.c_str(), ci->name.c_str());
 		}
 		else
-			u->SendMessage(ChanServ, CHAN_ENTRYMSG_LIST_EMPTY, ci->name.c_str());
+			source.Reply(_("Entry message list for \2%s\2 is empty."), ci->name.c_str());
 	}
 
-	void DoClear(User *u, ChannelInfo *ci)
+	void DoClear(CommandSource &source, ChannelInfo *ci)
 	{
 		ci->Shrink("cs_entrymsg");
-		u->SendMessage(ChanServ, CHAN_ENTRYMSG_CLEARED, ci->name.c_str());
+		source.Reply(_("Entry messages for \2%s\2 have been cleared."), ci->name.c_str());
 	}
 
  public:
@@ -103,18 +103,18 @@ class CommandEntryMessage : public Command
 		{
 			bool success = true;
 			if (params[1].equals_ci("LIST"))
-				this->DoList(u, ci);
+				this->DoList(source, ci);
 			else if (params[1].equals_ci("CLEAR"))
-				this->DoClear(u, ci);
+				this->DoClear(source, ci);
 			else if (params.size() < 3)
 			{
 				success = false;
 				this->OnSyntaxError(source, "");
 			}
 			else if (params[1].equals_ci("ADD"))
-				this->DoAdd(u, ci, params[2]);
+				this->DoAdd(source, ci, params[2]);
 			else if (params[1].equals_ci("DEL"))
-				this->DoDel(u, ci, params[2]);
+				this->DoDel(source, ci, params[2]);
 			else
 			{
 				success = false;
@@ -125,7 +125,7 @@ class CommandEntryMessage : public Command
 		}
 		else
 		{
-			u->SendMessage(ChanServ, ACCESS_DENIED);
+			u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
 		}
 
 		return MOD_CONT;
@@ -133,18 +133,20 @@ class CommandEntryMessage : public Command
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "ENTRYMSG", CHAN_ENTRYMSG_SYNTAX);
+		SyntaxError(source, "ENTRYMSG", _("ENTRYMSG \037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]"));
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(CHAN_HELP_ENTRYMSG);
+		source.Reply(_("Syntax: \002ENTRYMSG \037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]\002\n"
+				" \n"
+				"Controls what messages will be sent to users when they join the channel."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(CHAN_HELP_CMD_ENTRYMSG);
+		source.Reply(_("    ENTRYMSG   Manage the channel's entrymsgs"));
 	}
 };
 
diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp
index 1a21b66d5..e91f32860 100644
--- a/modules/extra/cs_set_misc.cpp
+++ b/modules/extra/cs_set_misc.cpp
@@ -31,17 +31,17 @@ class CommandCSSetMisc : public Command
 		if (params.size() > 1)
 		{
 			ci->Extend("chanserv:" + this->name, new ExtensibleItemRegular<Anope::string>(params[1]));
-			u->SendMessage(ChanServ, CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str());
+			u->SendMessage(ChanServ, LanguageString::CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str());
 		}
 		else
-			u->SendMessage(ChanServ, CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str());
+			u->SendMessage(ChanServ, LanguageString::CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str());
 
 		return MOD_CONT;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
@@ -59,7 +59,7 @@ class CommandCSSASetMisc : public CommandCSSetMisc
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX);
 	}
 };
 
diff --git a/modules/extra/cs_tban.cpp b/modules/extra/cs_tban.cpp
index 35757ff1e..6e54da6be 100644
--- a/modules/extra/cs_tban.cpp
+++ b/modules/extra/cs_tban.cpp
@@ -40,11 +40,11 @@ static bool CanBanUser(Channel *c, User *u, User *u2)
 	ChannelInfo *ci = c->ci;
 	bool ok = false;
 	if (!check_access(u, ci, CA_BAN))
-		u->SendMessage(ChanServ, ACCESS_DENIED);
+		u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
 	else if (matches_list(c, u2, CMODE_EXCEPT))
-		u->SendMessage(ChanServ, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
+		u->SendMessage(ChanServ, LanguageString::CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
 	else if (u2->IsProtected())
-		u->SendMessage(ChanServ, ACCESS_DENIED);
+		u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
 	else
 		ok = true;
 
@@ -70,9 +70,9 @@ class CommandCSTBan : public Command
 
 		User *u2;
 		if (!c)
-			u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str());
+			u->SendMessage(ChanServ, LanguageString::CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!(u2 = finduser(nick)))
-			u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, nick.c_str());
+			u->SendMessage(ChanServ, LanguageString::NICK_X_NOT_IN_USE, nick.c_str());
 		else
 			if (CanBanUser(c, u, u2))
 			{
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
index 180b66463..03515d239 100644
--- a/modules/extra/db_mysql.cpp
+++ b/modules/extra/db_mysql.cpp
@@ -129,13 +129,17 @@ class CommandSQLSync : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		source.Reply(OPER_HELP_SYNC);
+		source.Reply(_("Syntax: \002SQLSYNC\002\n"
+				" \n"
+				"This command syncs your databases with SQL. You should\n"
+				"only have to execute this command once, when you initially\n"
+				"import your databases into SQL."));
 		return true;
 	}
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(OPER_HELP_CMD_SQLSYNC);
+		source.Reply(_("    SQLSYNC     Import your databases to SQL"));
 	}
 };
 
@@ -1393,7 +1397,7 @@ CommandReturn CommandSQLSync::Execute(CommandSource &source, const std::vector<A
 {
 	User *u = source.u;
 	SaveDatabases();
-	u->SendMessage(OperServ, OPER_SYNC_UPDATED);
+	u->SendMessage(OperServ, _("Updating MySQL."));
 	return MOD_CONT;
 }
 
diff --git a/modules/extra/db_mysql_live.cpp b/modules/extra/db_mysql_live.cpp
index bf5a1e6f7..55e891623 100644
--- a/modules/extra/db_mysql_live.cpp
+++ b/modules/extra/db_mysql_live.cpp
@@ -42,7 +42,7 @@ class CommandMutex : public Thread
 
 		if (!command->permission.empty() && !u->Account()->HasCommand(command->permission))
 		{
-			u->SendMessage(bi, ACCESS_DENIED);
+			u->SendMessage(bi, LanguageString::ACCESS_DENIED);
 			Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command;
 		}
 		else
diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp
index 6f9111b5e..3a1237328 100644
--- a/modules/extra/hs_request.cpp
+++ b/modules/extra/hs_request.cpp
@@ -67,19 +67,19 @@ class CommandHSRequest : public Command
 			}
 			if (vIdent.length() > Config->UserLen)
 			{
-				source.Reply(HOST_SET_IDENTTOOLONG, Config->UserLen);
+				source.Reply(LanguageString::HOST_SET_IDENTTOOLONG, Config->UserLen);
 				return MOD_CONT;
 			}
 			else
 				for (Anope::string::iterator s = vIdent.begin(), s_end = vIdent.end(); s != s_end; ++s)
 					if (!isvalidchar(*s))
 					{
-						source.Reply(HOST_SET_IDENT_ERROR);
+						source.Reply(LanguageString::HOST_SET_IDENT_ERROR);
 						return MOD_CONT;
 					}
 			if (!ircd->vident)
 			{
-				source.Reply(HOST_NO_VIDENT);
+				source.Reply(LanguageString::HOST_NO_VIDENT);
 				return MOD_CONT;
 			}
 		}
@@ -87,13 +87,13 @@ class CommandHSRequest : public Command
 			hostmask = rawhostmask;
 		else
 		{
-			source.Reply(HOST_SET_TOOLONG, Config->HostLen);
+			source.Reply(LanguageString::HOST_SET_TOOLONG, Config->HostLen);
 			return MOD_CONT;
 		}
 
 		if (!isValidHost(hostmask, 3))
 		{
-			source.Reply(HOST_SET_ERROR);
+			source.Reply(LanguageString::HOST_SET_ERROR);
 			return MOD_CONT;
 		}
 
@@ -167,7 +167,7 @@ class CommandHSActivate : public Command
 				me->SendMessage(source, _("No request for nick %s found."), nick.c_str());
 		}
 		else
-			u->SendMessage(HostServ, NICK_X_NOT_REGISTERED, nick.c_str());
+			u->SendMessage(HostServ, LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
 
 		return MOD_CONT;
 	}
@@ -222,7 +222,7 @@ class CommandHSReject : public Command
 				if (!reason.empty())
 					snprintf(message, sizeof(message), _("[auto memo] Your requested vHost has been rejected. Reason: %s"), reason.c_str());
 				else
-					snprintf(message, sizeof(message), _("[auto memo] Your requested vHost has been rejected."));
+					snprintf(message, sizeof(message), "%s", _("[auto memo] Your requested vHost has been rejected."));
 
 				memo_send(source, nick, message, 2);
 			}
@@ -269,13 +269,13 @@ class HSListBase : public Command
 			{
 				++display_counter;
 				if (!hr->ident.empty())
-					u->SendMessage(HostServ, HOST_IDENT_ENTRY, counter, it->first.c_str(), hr->ident.c_str(), hr->host.c_str(), it->first.c_str(), do_strftime(hr->time).c_str());
+					u->SendMessage(HostServ, _("#%d Nick:\002%s\002, vhost:\002%s\002@\002%s\002 (%s - %s)"), counter, it->first.c_str(), hr->ident.c_str(), hr->host.c_str(), it->first.c_str(), do_strftime(hr->time).c_str());
 				else
-					u->SendMessage(HostServ, HOST_ENTRY, counter, it->first.c_str(), hr->host.c_str(), it->first.c_str(), do_strftime(hr->time).c_str());
+					u->SendMessage(HostServ, _("#%d Nick:\002%s\002, vhost:\002%s\002 (%s - %s)"), counter, it->first.c_str(), hr->host.c_str(), it->first.c_str(), do_strftime(hr->time).c_str());
 			}
 			++counter;
 		}
-		u->SendMessage(HostServ, HOST_LIST_FOOTER, display_counter);
+		u->SendMessage(HostServ, _("Displayed all records (Count: \002%d\002)"), display_counter);
 
 		return MOD_CONT;
 	}
diff --git a/modules/extra/language/CMakeLists.txt b/modules/extra/language/CMakeLists.txt
new file mode 100644
index 000000000..af4dd90a6
--- /dev/null
+++ b/modules/extra/language/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Only do this if gettext is installed
+if(GETTEXT_FOUND)
+  # Get all of the .po files
+  file(GLOB LANG_SRCS_PO RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.*.po")
+  sort_list(LANG_SRCS_PO)
+
+  foreach(LANG_PO ${LANG_SRCS_PO})
+    # Get the domain for this language file
+    string(LENGTH ${LANG_PO} LANG_PO_LENGTH)
+    math(EXPR DOMAIN_LENGTH "${LANG_PO_LENGTH} - 9")
+    string(SUBSTRING ${LANG_PO} 0 ${DOMAIN_LENGTH} LANG_DOMAIN)
+
+    # Get the language for this language file
+    math(EXPR DOMAIN_LENGTH "${LANG_PO_LENGTH} - 8")
+    string(SUBSTRING ${LANG_PO} ${DOMAIN_LENGTH} 5 LANG_LANG)
+
+    # Get the .mo file name
+    string(REGEX REPLACE "\\.po$" ".mo" LANG_MO ${LANG_PO})
+    # Add the .mo file to a list for use later with add_custom_target
+    set(LANG_SRCS_MO ${LANG_SRCS_MO} ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO})
+    # Run msgfmt on the language file, depends on the .po file
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO}
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c ${CMAKE_CURRENT_SOURCE_DIR}/${LANG_PO} -o ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO}
+      MAIN_DEPENDENCY ${LANG_PO}
+    )
+    # Add to cpack ignored files if not on Windows.
+    if(NOT WIN32)
+      add_to_cpack_ignored_files("${LANG_MO}")
+    endif(NOT WIN32)
+
+    # Install the new language file
+    install(CODE "FILE(MAKE_DIRECTORY \${CMAKE_INSTALL_PREFIX}/data/languages/${LANG_LANG}/LC_MESSAGES/)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO} DESTINATION data/languages/${LANG_LANG}/LC_MESSAGES RENAME ${LANG_DOMAIN}.mo PERMISSIONS ${PERMS})
+  endforeach(LANG_PO)
+
+  # Generate languages, depends on the mo files
+  add_custom_target(module_language DEPENDS ${LANG_SRCS_MO})
+endif(GETTEXT_FOUND)
diff --git a/lang/cs_appendtopic.de_DE.po b/modules/extra/language/cs_appendtopic.de_DE.po
index bd6a6764f..8e5111d5d 100644
--- a/lang/cs_appendtopic.de_DE.po
+++ b/modules/extra/language/cs_appendtopic.de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 20:53-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 20:57-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: German\n"
@@ -17,20 +17,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_appendtopic.cpp:105
+#: ../cs_appendtopic.cpp:106
 msgid "   APPENDTOPIC Add text to a channels topic"
 msgstr "   APPENDTOPIC Fügt einen Text zu einem Channel-Topic hinzu."
 
-#: cs_appendtopic.cpp:89 cs_appendtopic.cpp:100
+#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
 msgid "Syntax: APPENDTOPIC channel text"
 msgstr "Syntax: APPENDTOPIC Channel Text"
 
-#: cs_appendtopic.cpp:91
+#: ../cs_appendtopic.cpp:92
 msgid ""
 "This command allows users to append text to a currently set\n"
 "channel topic. When TOPICLOCK is on, the topic is updated and\n"
 "the new, updated topic is locked."
 msgstr ""
-"Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-Topic\n"
+"Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-"
+"Topic\n"
 "hinzuzufügen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n"
 "und das neue, aktualisierte Topic wird gesperrt."
diff --git a/lang/cs_appendtopic.it_IT.po b/modules/extra/language/cs_appendtopic.it_IT.po
index eb5ab6712..827fe5bd6 100644
--- a/lang/cs_appendtopic.it_IT.po
+++ b/modules/extra/language/cs_appendtopic.it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 20:53-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:04-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -17,20 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_appendtopic.cpp:105
+#: ../cs_appendtopic.cpp:106
 msgid "   APPENDTOPIC Add text to a channels topic"
 msgstr "   APPENDTOPIC Aggiunge del testo al topic di un canale"
 
-#: cs_appendtopic.cpp:89 cs_appendtopic.cpp:100
+#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
 msgid "Syntax: APPENDTOPIC channel text"
 msgstr "Sintassi: APPENDTOPIC canale testo"
 
-#: cs_appendtopic.cpp:91
+#: ../cs_appendtopic.cpp:92
 msgid ""
 "This command allows users to append text to a currently set\n"
 "channel topic. When TOPICLOCK is on, the topic is updated and\n"
 "the new, updated topic is locked."
 msgstr ""
-"Questo comando permette agli utenti di aggiungere del testo ad un topic di un canale\n"
-"già impostato. Se TOPICLOCK è attivato, il topic viene aggiornato e il nuovo topic\n"
+"Questo comando permette agli utenti di aggiungere del testo ad un topic di "
+"un canale\n"
+"già impostato. Se TOPICLOCK è attivato, il topic viene aggiornato e il nuovo "
+"topic\n"
 "viene bloccato."
diff --git a/lang/cs_appendtopic.nl_NL.po b/modules/extra/language/cs_appendtopic.nl_NL.po
index efb9b60e0..15e857506 100644
--- a/lang/cs_appendtopic.nl_NL.po
+++ b/modules/extra/language/cs_appendtopic.nl_NL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 20:53-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 20:55-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_appendtopic.cpp:105
+#: ../cs_appendtopic.cpp:106
 msgid "   APPENDTOPIC Add text to a channels topic"
 msgstr "   APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe"
 
-#: cs_appendtopic.cpp:89 cs_appendtopic.cpp:100
+#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
 msgid "Syntax: APPENDTOPIC channel text"
 msgstr "Gebruik: APPENDTOPIC kanaal tekst"
 
-#: cs_appendtopic.cpp:91
+#: ../cs_appendtopic.cpp:92
 msgid ""
 "This command allows users to append text to a currently set\n"
 "channel topic. When TOPICLOCK is on, the topic is updated and\n"
diff --git a/lang/cs_appendtopic.pot b/modules/extra/language/cs_appendtopic.pot
index dcf842079..4c37b8d37 100644
--- a/lang/cs_appendtopic.pot
+++ b/modules/extra/language/cs_appendtopic.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 20:53-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cs_appendtopic.cpp:105
+#: ../cs_appendtopic.cpp:106
 msgid "   APPENDTOPIC Add text to a channels topic"
 msgstr ""
 
-#: cs_appendtopic.cpp:89 cs_appendtopic.cpp:100
+#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
 msgid "Syntax: APPENDTOPIC channel text"
 msgstr ""
 
-#: cs_appendtopic.cpp:91
+#: ../cs_appendtopic.cpp:92
 msgid ""
 "This command allows users to append text to a currently set\n"
 "channel topic. When TOPICLOCK is on, the topic is updated and\n"
diff --git a/lang/cs_appendtopic.pt_PT.po b/modules/extra/language/cs_appendtopic.pt_PT.po
index c62d6b573..853f0502c 100644
--- a/lang/cs_appendtopic.pt_PT.po
+++ b/modules/extra/language/cs_appendtopic.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 20:53-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:00-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_appendtopic.cpp:105
+#: ../cs_appendtopic.cpp:106
 msgid "   APPENDTOPIC Add text to a channels topic"
 msgstr "   APPENDTOPIC Adiciona texto ao tópico de um canal"
 
-#: cs_appendtopic.cpp:89 cs_appendtopic.cpp:100
+#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
 msgid "Syntax: APPENDTOPIC channel text"
 msgstr "Sintaxe: APPENDTOPIC canal texto"
 
-#: cs_appendtopic.cpp:91
+#: ../cs_appendtopic.cpp:92
 msgid ""
 "This command allows users to append text to a currently set\n"
 "channel topic. When TOPICLOCK is on, the topic is updated and\n"
diff --git a/lang/cs_appendtopic.ru_RU.po b/modules/extra/language/cs_appendtopic.ru_RU.po
index c609c4df3..89e0a19b3 100644
--- a/lang/cs_appendtopic.ru_RU.po
+++ b/modules/extra/language/cs_appendtopic.ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 20:53-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:02-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -18,20 +18,23 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: cs_appendtopic.cpp:105
+#: ../cs_appendtopic.cpp:106
 msgid "   APPENDTOPIC Add text to a channels topic"
 msgstr "   APPENDTOPIC Äîáàâëÿåò òåêñò ê òîïèêó êàíàëà"
 
-#: cs_appendtopic.cpp:89 cs_appendtopic.cpp:100
+#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
 msgid "Syntax: APPENDTOPIC channel text"
 msgstr "Ñèíòàêñèñ: APPENDTOPIC #êàíàë òåêñò"
 
-#: cs_appendtopic.cpp:91
+#: ../cs_appendtopic.cpp:92
 msgid ""
 "This command allows users to append text to a currently set\n"
 "channel topic. When TOPICLOCK is on, the topic is updated and\n"
 "the new, updated topic is locked."
 msgstr ""
-"Äàííàÿ êîìàíäà ïîçâîëÿåò äîáàâèòü òåêñò ê òîïèêó, êîòîðûé óñòàíîâëåí íà óêàçàííîì\n"
-"êàíàëå. Åñëè àêòèâèðîâàí ðåæèì TOPICLOCK, òîïèê áóäåò îáíîâëåí è çàáëîêèðîâàí.\n"
-"Ïðèìå÷àíèå: òåêñò áóäåò ÄÎÁÀÂËÅÍ ê òîïèêó, òî åñòü ñòàðûé òîïèê óäàëåí ÍÅ ÁÓÄÅÒ."
+"Äàííàÿ êîìàíäà ïîçâîëÿåò äîáàâèòü òåêñò ê òîïèêó, êîòîðûé óñòàíîâëåí íà "
+"óêàçàííîì\n"
+"êàíàëå. Åñëè àêòèâèðîâàí ðåæèì TOPICLOCK, òîïèê áóäåò îáíîâëåí è "
+"çàáëîêèðîâàí.\n"
+"Ïðèìå÷àíèå: òåêñò áóäåò ÄÎÁÀÂËÅÍ ê òîïèêó, òî åñòü ñòàðûé òîïèê óäàëåí ÍÅ "
+"ÁÓÄÅÒ."
diff --git a/lang/cs_enforce.de_DE.po b/modules/extra/language/cs_enforce.de_DE.po
index 76dc57021..40eddc19c 100644
--- a/lang/cs_enforce.de_DE.po
+++ b/modules/extra/language/cs_enforce.de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 21:11-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:12-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: German\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_enforce.cpp:215
+#: ../cs_enforce.cpp:213
 msgid "    ENFORCE    Enforce various channel modes and set options"
 msgstr "    ENFORCE    Erzwingt verschieden Modes und SET Optionen"
 
-#: cs_enforce.cpp:180
+#: ../cs_enforce.cpp:178
 msgid ""
 "Enforce various channel modes and set options. The channel\n"
 "option indicates what channel to enforce the modes and options\n"
@@ -35,37 +35,37 @@ msgid ""
 "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
 "if it's not enabled."
 msgstr ""
-"Erzwingt verschieden Modes und SET Optionen. Die \037Channel\037\n"
+"Erzwingt verschieden Modes und SET Optionen. Die Channel\n"
 "Option zeigt dir den Channel an, indem Modes und Optionen\n"
-"zu erzwingen sind. Die \037was\037 Option zeigt dir welche Modes\n"
+"zu erzwingen sind. Die was Option zeigt dir welche Modes\n"
 "und Optionen zu erzwingen sind. Die können nur SET, SECUREOPS,\n"
 "RESTRICTED, MODES oder +R sein.Default ist SET.\n"
 " \n"
-"Wenn \037was\037 SET ist, wird SECUREOPS und RESTRICTED\n"
+"Wenn was SET ist, wird SECUREOPS und RESTRICTED\n"
 "auf die User die z.Z.in Channel sind erzwungen, wenn sie AN sind.\n"
 "Benutze SECUREOPS oder RESTRICTED , um die Optionen einzeln\n"
 "zu erzwingen, also wenn sie nicht eingeschaltet sind."
 
-#: cs_enforce.cpp:147 cs_enforce.cpp:152 cs_enforce.cpp:157 cs_enforce.cpp:162
-#: cs_enforce.cpp:167
+#: ../cs_enforce.cpp:145 ../cs_enforce.cpp:150 ../cs_enforce.cpp:155
+#: ../cs_enforce.cpp:160 ../cs_enforce.cpp:165
 #, c-format
 msgid "Enforced %s"
 msgstr "Erzwungen %s"
 
-#: cs_enforce.cpp:193
+#: ../cs_enforce.cpp:191
 msgid ""
 "If what is MODES, it will enforce channelmode +R if it is\n"
 "set. If +R is specified for what, the +R channelmode will\n"
 "also be enforced, but even if it is not set. If it is not set,\n"
 "users will be banned to ensure they don't just rejoin."
 msgstr ""
-"Wenn \037was\037 MODES ist, wird das ChannelMode +R erzwungen\n"
-"falls an. Wenn \037was\037 +R ist, wird +R erzwungen aber eben\n"
+"Wenn was MODES ist, wird das ChannelMode +R erzwungen\n"
+"falls an. Wenn was +R ist, wird +R erzwungen aber eben\n"
 "wenn noch nicht als Channel-Mode ist. Wenn +R noch nicht als\n"
 "Channel-Mode war werden alle User aus den Channel gebannt um\n"
 "sicher zu sein das sie nicht rejoinen."
 
-#: cs_enforce.cpp:198
+#: ../cs_enforce.cpp:196
 msgid ""
 "If what is MODES, nothing will be enforced, since it would\n"
 "enforce modes that the current ircd does not support. If +R is\n"
@@ -74,12 +74,12 @@ msgid ""
 "but have not identified for their nickname will be kicked and\n"
 "banned from the channel."
 msgstr ""
-"Wenn \037was\037 MODES ist, wird nichts erzwungen weil es MODES seine\n"
-"können die dein IRCD nicht unterstützt. Wenn \037was\037 +R ist\n"
+"Wenn was MODES ist, wird nichts erzwungen weil es MODES seine\n"
+"können die dein IRCD nicht unterstützt. Wenn was +R ist\n"
 "oder ein Modes was auf ein anderen IRCD gleich +R ist, wird es\n"
 "erzwungen. Alle User die nicht für deren Nicknamen identifiziert\n"
 "sind werden aus den Channel gekickt und gebannt."
 
-#: cs_enforce.cpp:178 cs_enforce.cpp:210
+#: ../cs_enforce.cpp:176 ../cs_enforce.cpp:208
 msgid "Syntax: ENFORCE channel [what]"
-msgstr "Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002"
+msgstr "Syntax: ENFORCE Channel [was]"
diff --git a/lang/cs_enforce.it_IT.po b/modules/extra/language/cs_enforce.it_IT.po
index 292166afe..98605397c 100644
--- a/lang/cs_enforce.it_IT.po
+++ b/modules/extra/language/cs_enforce.it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 21:11-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:55-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_enforce.cpp:215
+#: ../cs_enforce.cpp:213
 msgid "    ENFORCE    Enforce various channel modes and set options"
 msgstr "    ENFORCE    Forza diversi modi di canale ed opzioni SET"
 
-#: cs_enforce.cpp:180
+#: ../cs_enforce.cpp:178
 msgid ""
 "Enforce various channel modes and set options. The channel\n"
 "option indicates what channel to enforce the modes and options\n"
@@ -35,37 +35,37 @@ msgid ""
 "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
 "if it's not enabled."
 msgstr ""
-"Forza diversi modi di canale ed opzioni SET. Il parametro \037canale\037\n"
+"Forza diversi modi di canale ed opzioni SET. Il parametro canale\n"
 "indica il canale sul quale forzare i modi e le opzioni. Il parametro\n"
-"\037cosa\037 indica i modi e le opzioni da forzare, e possono essere\n"
+"cosa indica i modi e le opzioni da forzare, e possono essere\n"
 "qualsiasi delle opzioni SET, SECUREOPS, RESTRICTED, MODES, o +R.\n"
 "Se non specificato, viene sottointeso SET.\n"
 " \n"
-"Se \037cosa\037 è SET, forzerà SECUREOPS e RESTRICTED sugli utenti\n"
+"Se cosa è SET, forzerà SECUREOPS e RESTRICTED sugli utenti\n"
 "attualmente nel canale, se sono impostati. Specifica SECUREOPS per\n"
 "forzare l'opzione SECUREOPS, anche se non è attivata. Specifica\n"
 "RESTRICTED per forzare l'opzione RESTRICTED, anche se non è\n"
 "attivata."
 
-#: cs_enforce.cpp:147 cs_enforce.cpp:152 cs_enforce.cpp:157 cs_enforce.cpp:162
-#: cs_enforce.cpp:167
+#: ../cs_enforce.cpp:145 ../cs_enforce.cpp:150 ../cs_enforce.cpp:155
+#: ../cs_enforce.cpp:160 ../cs_enforce.cpp:165
 #, c-format
 msgid "Enforced %s"
 msgstr "Forzato %s"
 
-#: cs_enforce.cpp:193
+#: ../cs_enforce.cpp:191
 msgid ""
 "If what is MODES, it will enforce channelmode +R if it is\n"
 "set. If +R is specified for what, the +R channelmode will\n"
 "also be enforced, but even if it is not set. If it is not set,\n"
 "users will be banned to ensure they don't just rejoin."
 msgstr ""
-"Se \037cosa\037 è MODES, forzerà il modo del canale +R se è impostato.\n"
-"Se +R è specificato per \037cosa\037, il modo del canale +R verrà\n"
+"Se cosa è MODES, forzerà il modo del canale +R se è impostato.\n"
+"Se +R è specificato per cosa, il modo del canale +R verrà\n"
 "forzato, anche se non è impostato. Se non è impostato, gli utenti\n"
 "verranno bannati per assicurare che non rientrino semplicemente."
 
-#: cs_enforce.cpp:198
+#: ../cs_enforce.cpp:196
 msgid ""
 "If what is MODES, nothing will be enforced, since it would\n"
 "enforce modes that the current ircd does not support. If +R is\n"
@@ -74,12 +74,12 @@ msgid ""
 "but have not identified for their nickname will be kicked and\n"
 "banned from the channel."
 msgstr ""
-"Se \037cosa\037 è MODES, niente verrà forzato, siccome forzerebbe\n"
+"Se cosa è MODES, niente verrà forzato, siccome forzerebbe\n"
 "dei modi che l'ircd in uso non supporterebbe. Se +R è specificato\n"
-"per \037cosa\037, un modo equivalente a +R sui altri ircd verrà\n"
+"per cosa, un modo equivalente a +R sui altri ircd verrà\n"
 "forzato. Tutti gli utenti presenti nel canale ma non identificati\n"
 "per il loro nickname verranno bannati ed espulsi dal canale."
 
-#: cs_enforce.cpp:178 cs_enforce.cpp:210
+#: ../cs_enforce.cpp:176 ../cs_enforce.cpp:208
 msgid "Syntax: ENFORCE channel [what]"
-msgstr "Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002"
+msgstr "Sintassi: ENFORCE canale [cosa]"
diff --git a/lang/cs_enforce.nl_NL.po b/modules/extra/language/cs_enforce.nl_NL.po
index 39ec0f84a..e791db46d 100644
--- a/lang/cs_enforce.nl_NL.po
+++ b/modules/extra/language/cs_enforce.nl_NL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 21:06-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:07-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_enforce.cpp:215
+#: ../cs_enforce.cpp:213
 msgid "    ENFORCE    Enforce various channel modes and set options"
 msgstr "    ENFORCE    Forceer enkele kanaalmodes en set-opties"
 
-#: cs_enforce.cpp:180
+#: ../cs_enforce.cpp:178
 msgid ""
 "Enforce various channel modes and set options. The channel\n"
 "option indicates what channel to enforce the modes and options\n"
@@ -35,39 +35,39 @@ msgid ""
 "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
 "if it's not enabled."
 msgstr ""
-"Forceer enkele kannalmodes en set-opties. De \037kanaal\037 optie\n"
+"Forceer enkele kannalmodes en set-opties. De kanaal optie\n"
 "geeft aan op welk kanaal de modes en opties geforceerd moeten\n"
-"worden. De \037wat\037 optie geeft aan welke modes en opties\n"
+"worden. De wat optie geeft aan welke modes en opties\n"
 "geforceerd moeten worden; dit kan SET, SECUREOPS, RESTRICTED,\n"
 "MODES, of +R zijn. Indien weggelaten is dit standaard SET.\n"
 " \n"
-"Als er voor \037wat\037 SET wordt ingevuld, zullen SECUREOPS en\n"
+"Als er voor wat SET wordt ingevuld, zullen SECUREOPS en\n"
 "RESTRICTED geforceerd worden op de gebruikers in het kanaal,\n"
 "maar alleen als die opties aangezet zijn voor het kanaal. Als\n"
-"SECUREOPS of RESTRICTED wordt gegeven voor \037wat\037 zal die optie\n"
+"SECUREOPS of RESTRICTED wordt gegeven voor wat zal die optie\n"
 "altijd geforceerd worden, ook als die niet is aangezet."
 
-#: cs_enforce.cpp:147 cs_enforce.cpp:152 cs_enforce.cpp:157 cs_enforce.cpp:162
-#: cs_enforce.cpp:167
+#: ../cs_enforce.cpp:145 ../cs_enforce.cpp:150 ../cs_enforce.cpp:155
+#: ../cs_enforce.cpp:160 ../cs_enforce.cpp:165
 #, c-format
 msgid "Enforced %s"
 msgstr ""
 
-#: cs_enforce.cpp:193
+#: ../cs_enforce.cpp:191
 msgid ""
 "If what is MODES, it will enforce channelmode +R if it is\n"
 "set. If +R is specified for what, the +R channelmode will\n"
 "also be enforced, but even if it is not set. If it is not set,\n"
 "users will be banned to ensure they don't just rejoin."
 msgstr ""
-"Als er voor \037wat\037 MODES wordt ingevuld, zal kanaalmode +R worden\n"
+"Als er voor wat MODES wordt ingevuld, zal kanaalmode +R worden\n"
 "geforceerd, als die op het kanaal aan staat. Als +R wordt ingevuld,\n"
-"zal kanaalmode +R worden geforceerd, maar ook als die niet aan"
-"staat voor het kanaal. Als +R niet aan staat, zullen alle ook\n"
+"zal kanaalmode +R worden geforceerd, maar ook als die niet aanstaat voor het "
+"kanaal. Als +R niet aan staat, zullen alle ook\n"
 "gebanned worden om te zorgen dat ze niet opnieuw het kanaal binnen\n"
 "kunnen komen."
 
-#: cs_enforce.cpp:198
+#: ../cs_enforce.cpp:196
 msgid ""
 "If what is MODES, nothing will be enforced, since it would\n"
 "enforce modes that the current ircd does not support. If +R is\n"
@@ -76,13 +76,13 @@ msgid ""
 "but have not identified for their nickname will be kicked and\n"
 "banned from the channel."
 msgstr ""
-"Als er voor \037wat\037 MODES wordt ingevuld, zal er niks gebeuren.\n"
+"Als er voor wat MODES wordt ingevuld, zal er niks gebeuren.\n"
 "Normaal gesproken wordt er een kanaalmode geforceerd die op deze\n"
-"server niet ondersteund wordt. Als +R wordt ingevuld voor \037wat\037\n"
+"server niet ondersteund wordt. Als +R wordt ingevuld voor wat\n"
 "zullen alle gebruikers die in het kanaal zitten maar zich niet\n"
 "hebben geidentificeerd voor hun nick uit het kanaal gekicked en\n"
 "verbannen worden."
 
-#: cs_enforce.cpp:178 cs_enforce.cpp:210
+#: ../cs_enforce.cpp:176 ../cs_enforce.cpp:208
 msgid "Syntax: ENFORCE channel [what]"
-msgstr "Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002"
+msgstr "Syntax: ENFORCE kanaal [wat]"
diff --git a/lang/cs_enforce.pot b/modules/extra/language/cs_enforce.pot
index 82f5d4dc4..e3604eb44 100644
--- a/lang/cs_enforce.pot
+++ b/modules/extra/language/cs_enforce.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 21:11-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cs_enforce.cpp:215
+#: ../cs_enforce.cpp:213
 msgid "    ENFORCE    Enforce various channel modes and set options"
 msgstr ""
 
-#: cs_enforce.cpp:180
+#: ../cs_enforce.cpp:178
 msgid ""
 "Enforce various channel modes and set options. The channel\n"
 "option indicates what channel to enforce the modes and options\n"
@@ -35,13 +35,13 @@ msgid ""
 "if it's not enabled."
 msgstr ""
 
-#: cs_enforce.cpp:147 cs_enforce.cpp:152 cs_enforce.cpp:157 cs_enforce.cpp:162
-#: cs_enforce.cpp:167
+#: ../cs_enforce.cpp:145 ../cs_enforce.cpp:150 ../cs_enforce.cpp:155
+#: ../cs_enforce.cpp:160 ../cs_enforce.cpp:165
 #, c-format
 msgid "Enforced %s"
 msgstr ""
 
-#: cs_enforce.cpp:193
+#: ../cs_enforce.cpp:191
 msgid ""
 "If what is MODES, it will enforce channelmode +R if it is\n"
 "set. If +R is specified for what, the +R channelmode will\n"
@@ -49,7 +49,7 @@ msgid ""
 "users will be banned to ensure they don't just rejoin."
 msgstr ""
 
-#: cs_enforce.cpp:198
+#: ../cs_enforce.cpp:196
 msgid ""
 "If what is MODES, nothing will be enforced, since it would\n"
 "enforce modes that the current ircd does not support. If +R is\n"
@@ -59,6 +59,6 @@ msgid ""
 "banned from the channel."
 msgstr ""
 
-#: cs_enforce.cpp:178 cs_enforce.cpp:210
+#: ../cs_enforce.cpp:176 ../cs_enforce.cpp:208
 msgid "Syntax: ENFORCE channel [what]"
 msgstr ""
diff --git a/lang/cs_enforce.pt_PT.po b/modules/extra/language/cs_enforce.pt_PT.po
index fae96736f..864db1f96 100644
--- a/lang/cs_enforce.pt_PT.po
+++ b/modules/extra/language/cs_enforce.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 21:11-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:24-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,11 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_enforce.cpp:215
+#: ../cs_enforce.cpp:213
 msgid "    ENFORCE    Enforce various channel modes and set options"
-msgstr "    ENFORCE    Verifica o cumprimento de vários modos de canal e opções ajustadas"
+msgstr ""
+"    ENFORCE    Verifica o cumprimento de vários modos de canal e opções "
+"ajustadas"
 
-#: cs_enforce.cpp:180
+#: ../cs_enforce.cpp:178
 msgid ""
 "Enforce various channel modes and set options. The channel\n"
 "option indicates what channel to enforce the modes and options\n"
@@ -35,36 +37,37 @@ msgid ""
 "if it's not enabled."
 msgstr ""
 "Verifica o cumprimento de vários modos de canal e opções ajustadas.\n"
-"O campo \037canal\037 indica qual canal deve ter os modos e opções verificadas\n"
-"O campo \037opção\037 indica quais modos e opções devem ser verificadas,\n"
+"O campo canal indica qual canal deve ter os modos e opções verificadas\n"
+"O campo opção indica quais modos e opções devem ser verificadas,\n"
 "e pode ser: SET, SECUREOPS, RESTRICTED, MODES ou +R\n"
 "Quando deixado em branco, o padrão é SET.\n"
 " \n"
-"Se \037opção\037 for SET, serão verificadas as opções SECUREOPS e RESTRICTED\n"
+"Se opção for SET, serão verificadas as opções SECUREOPS e RESTRICTED\n"
 "para usuários que estiverem no canal, caso elas estejam ativadas. Use\n"
-"SECUREOPS para verificar a opção SECUREOPS, mesmo que ela não esteja ativada\n"
+"SECUREOPS para verificar a opção SECUREOPS, mesmo que ela não esteja "
+"ativada\n"
 "Use RESTRICTED para verificar a opção RESTRICTED, mesmo que ela não esteja\n"
 "ativada."
 
-#: cs_enforce.cpp:147 cs_enforce.cpp:152 cs_enforce.cpp:157 cs_enforce.cpp:162
-#: cs_enforce.cpp:167
+#: ../cs_enforce.cpp:145 ../cs_enforce.cpp:150 ../cs_enforce.cpp:155
+#: ../cs_enforce.cpp:160 ../cs_enforce.cpp:165
 #, c-format
 msgid "Enforced %s"
 msgstr "Verificado %s"
 
-#: cs_enforce.cpp:193
+#: ../cs_enforce.cpp:191
 msgid ""
 "If what is MODES, it will enforce channelmode +R if it is\n"
 "set. If +R is specified for what, the +R channelmode will\n"
 "also be enforced, but even if it is not set. If it is not set,\n"
 "users will be banned to ensure they don't just rejoin."
 msgstr ""
-"Se \037opção\037 for MODES, será verificado o modo de canal +R caso ele\n"
-"esteja ativado. Se +R for especificado para \037opção\037, o modo de canal\n"
+"Se opção for MODES, será verificado o modo de canal +R caso ele\n"
+"esteja ativado. Se +R for especificado para opção, o modo de canal\n"
 "+R também será verificado, mesmo que ele não esteja ativado. Se ele não\n"
 "estiver ativado, os usuários serão banidos para evitar que reentrem no canal."
 
-#: cs_enforce.cpp:198
+#: ../cs_enforce.cpp:196
 msgid ""
 "If what is MODES, nothing will be enforced, since it would\n"
 "enforce modes that the current ircd does not support. If +R is\n"
@@ -73,12 +76,12 @@ msgid ""
 "but have not identified for their nickname will be kicked and\n"
 "banned from the channel."
 msgstr ""
-"Se \037opção\037 for MODES, nada será verificado, visto que isto poderia\n"
+"Se opção for MODES, nada será verificado, visto que isto poderia\n"
 "verificar modos que o IRCd atual não suporta. Se +R for especificado\n"
-"para \037opção\037, um equivalente ao modo de canal +R em outros IRCds\n"
+"para opção, um equivalente ao modo de canal +R em outros IRCds\n"
 "será verificado. Todos os usuários que estão no canal, mas não estejam\n"
 "identificados para seus nicks serão kickados e banidos do canal."
 
-#: cs_enforce.cpp:178 cs_enforce.cpp:210
+#: ../cs_enforce.cpp:176 ../cs_enforce.cpp:208
 msgid "Syntax: ENFORCE channel [what]"
-msgstr "Sintaxe: \002ENFORCE \037canal\037 [\037opção\037]\002"
+msgstr "Sintaxe: ENFORCE canal [opção]"
diff --git a/lang/cs_enforce.ru_RU.po b/modules/extra/language/cs_enforce.ru_RU.po
index 15a5055b3..67032f069 100644
--- a/lang/cs_enforce.ru_RU.po
+++ b/modules/extra/language/cs_enforce.ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 21:11-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 21:38-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -18,11 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: cs_enforce.cpp:215
+#: ../cs_enforce.cpp:213
 msgid "    ENFORCE    Enforce various channel modes and set options"
-msgstr "    ENFORCE    Ïåðåïðîâåðêà è óñòàíîâêà ðàçëè÷íûõ ðåæèìîâ è îïöèé êàíàëà"
+msgstr ""
+"    ENFORCE    Ïåðåïðîâåðêà è óñòàíîâêà ðàçëè÷íûõ ðåæèìîâ è îïöèé êàíàëà"
 
-#: cs_enforce.cpp:180
+#: ../cs_enforce.cpp:178
 msgid ""
 "Enforce various channel modes and set options. The channel\n"
 "option indicates what channel to enforce the modes and options\n"
@@ -37,35 +38,37 @@ msgid ""
 "if it's not enabled."
 msgstr ""
 "Ïåðåïðîâåðêà è óñòàíîâêà ðàçëè÷íûõ ðåæèìîâ è îïöèé êàíàëà.\n"
-"\037Ïàðàìåòð\037 óêàçûâàåò êàêèå îïöèè èëè ðåæèìû êàíàëà äîëæíû áûòü\n"
+"Ïàðàìåòð óêàçûâàåò êàêèå îïöèè èëè ðåæèìû êàíàëà äîëæíû áûòü\n"
 "ïåðåïðîâåðåíû.  êà÷åñòâå ïàðàìåòðà ìîãóò áûòü óêàçàíû: SET, SECUREOPS,\n"
 "RESTRICTED, MODES, èëè +R. Åñëè ïàðàìåòð íå óêàçàí, ïî-óìîë÷àíèþ áóäåò SET.\n"
 " \n"
-"Åñëè â êà÷åñòâå \037ïàðàìåòðà\037 óêàçàíî SET, áóäóò ïåðåïðîâåðåíû îïöèè\n"
+"Åñëè â êà÷åñòâå ïàðàìåòðà óêàçàíî SET, áóäóò ïåðåïðîâåðåíû îïöèè\n"
 "SECUREOPS è RESTRICTED îòíîñèòåëüíî ïîëüçîâàòåëåé íà óêàçàííîì êàíàëå\n"
 "(ïðè óñëîâèè, ÷òî îïöèè âêëþ÷åíû). Îòäåëüíî óêàçàííûé ïàðàìåòð SECUREOPS\n"
-"ïðèìåíèò îïöèþ SECUREOPS (äàæå åñëè îíà \037ÍÅ\037 óñòàíîâëåíà). Ïàðàìåòð\n"
-"RESTRICTED ïðèìåíèò îïöèþ RESTRICTED (äàæå åñëè îíà \037ÍÅ\037 óñòàíîâëåíà)"
+"ïðèìåíèò îïöèþ SECUREOPS (äàæå åñëè îíà ÍÅ óñòàíîâëåíà). Ïàðàìåòð\n"
+"RESTRICTED ïðèìåíèò îïöèþ RESTRICTED (äàæå åñëè îíà ÍÅ óñòàíîâëåíà)"
 
-#: cs_enforce.cpp:147 cs_enforce.cpp:152 cs_enforce.cpp:157 cs_enforce.cpp:162
-#: cs_enforce.cpp:167
+#: ../cs_enforce.cpp:145 ../cs_enforce.cpp:150 ../cs_enforce.cpp:155
+#: ../cs_enforce.cpp:160 ../cs_enforce.cpp:165
 #, c-format
 msgid "Enforced %s"
 msgstr "Ïåðåïðîâåðåíî: %s"
 
-#: cs_enforce.cpp:193
+#: ../cs_enforce.cpp:191
 msgid ""
 "If what is MODES, it will enforce channelmode +R if it is\n"
 "set. If +R is specified for what, the +R channelmode will\n"
 "also be enforced, but even if it is not set. If it is not set,\n"
 "users will be banned to ensure they don't just rejoin."
 msgstr ""
-"Åñëè â êà÷åñòâå \037ïàðàìåòðà\037 óêàçàíî MODES, áóäåò ïåðåïðîâåðåí ðåæèì +R\n"
-"(åñëè îí óñòàíîâëåí). Îòäåëüíî óêàçàííûé ïàðàìåòð \037+R\037 ïðèìåíèò\n"
-"êàíàëüíûé ðåæèì +R, äàæå åñëè îí íå óñòàíîâëåí, è çàáàíèò âñåõ ïîëüçîâàòåëåé,\n"
-"êîòîðûå íå èäåíòèôèöèðîâàëèñü ê ñâîåìó íèêó èëè íå èìåþò çàðåãèñòðèðîâàííîãî íèêà."
+"Åñëè â êà÷åñòâå ïàðàìåòðà óêàçàíî MODES, áóäåò ïåðåïðîâåðåí ðåæèì +R\n"
+"(åñëè îí óñòàíîâëåí). Îòäåëüíî óêàçàííûé ïàðàìåòð +R ïðèìåíèò\n"
+"êàíàëüíûé ðåæèì +R, äàæå åñëè îí íå óñòàíîâëåí, è çàáàíèò âñåõ "
+"ïîëüçîâàòåëåé,\n"
+"êîòîðûå íå èäåíòèôèöèðîâàëèñü ê ñâîåìó íèêó èëè íå èìåþò çàðåãèñòðèðîâàííîãî "
+"íèêà."
 
-#: cs_enforce.cpp:198
+#: ../cs_enforce.cpp:196
 msgid ""
 "If what is MODES, nothing will be enforced, since it would\n"
 "enforce modes that the current ircd does not support. If +R is\n"
@@ -74,12 +77,13 @@ msgid ""
 "but have not identified for their nickname will be kicked and\n"
 "banned from the channel."
 msgstr ""
-"Åñëè â êà÷åñòâå \037ïàðàìåòðà\037 óêàçàíî MODES, ïåðåïðîâåðêà îñóùåñòâëåíà\n"
+"Åñëè â êà÷åñòâå ïàðàìåòðà óêàçàíî MODES, ïåðåïðîâåðêà îñóùåñòâëåíà\n"
 "ÍÅ ÁÓÄÅÒ, òàê êàê òåêóùèé IRCD íå ïîääåðæèâàåò íåîáõîäèìûå ðåæèìû.\n"
-"Îòäåëüíî óêàçàííûé ïàðàìåòð \037+R\037 ïðèìåíèò êàíàëüíûé ðåæèì, ýêâèâàëåíòíûé\n"
-"ðåæèìó +R è çàáàíèò âñåõ ïîëüçîâàòåëåé, êîòîðûå íå èäåíòèôèöèðîâàëèñü ê ñâîåìó\n"
+"Îòäåëüíî óêàçàííûé ïàðàìåòð +R ïðèìåíèò êàíàëüíûé ðåæèì, ýêâèâàëåíòíûé\n"
+"ðåæèìó +R è çàáàíèò âñåõ ïîëüçîâàòåëåé, êîòîðûå íå èäåíòèôèöèðîâàëèñü ê "
+"ñâîåìó\n"
 "íèêó èëè íå èìåþò çàðåãèñòðèðîâàííîãî íèêà."
 
-#: cs_enforce.cpp:178 cs_enforce.cpp:210
+#: ../cs_enforce.cpp:176 ../cs_enforce.cpp:208
 msgid "Syntax: ENFORCE channel [what]"
-msgstr "Ñèíòàêñèñ: \002ENFORCE \037#êàíàë\037 \037ïàðàìåòð\037\002"
+msgstr "Ñèíòàêñèñ: ENFORCE #êàíàë ïàðàìåòð"
diff --git a/modules/extra/language/cs_entrymsg.pot b/modules/extra/language/cs_entrymsg.pot
new file mode 100644
index 000000000..756bb439c
--- /dev/null
+++ b/modules/extra/language/cs_entrymsg.pot
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../cs_entrymsg.cpp:149
+msgid "    ENTRYMSG   Manage the channel's entrymsgs"
+msgstr ""
+
+#: ../cs_entrymsg.cpp:136
+msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
+msgstr ""
+
+#: ../cs_entrymsg.cpp:44
+msgid "End of entry message list."
+msgstr ""
+
+#: ../cs_entrymsg.cpp:77
+#, c-format
+msgid "Entry message %i for %s deleted."
+msgstr ""
+
+#: ../cs_entrymsg.cpp:80
+#, c-format
+msgid "Entry message %s not found on channel %s."
+msgstr ""
+
+#: ../cs_entrymsg.cpp:61
+#, c-format
+msgid "Entry message added to %s"
+msgstr ""
+
+#: ../cs_entrymsg.cpp:47 ../cs_entrymsg.cpp:83
+#, c-format
+msgid "Entry message list for %s is empty."
+msgstr ""
+
+#: ../cs_entrymsg.cpp:41
+#, c-format
+msgid "Entry message list for %s:"
+msgstr ""
+
+#: ../cs_entrymsg.cpp:89
+#, c-format
+msgid "Entry messages for %s have been cleared."
+msgstr ""
+
+#: ../cs_entrymsg.cpp:141
+msgid ""
+"Syntax: ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]\n"
+" \n"
+"Controls what messages will be sent to users when they join the channel."
+msgstr ""
+
+#: ../cs_entrymsg.cpp:56
+#, c-format
+msgid "The entry message list for %s is full."
+msgstr ""
diff --git a/lang/cs_tban.de_DE.po b/modules/extra/language/cs_tban.de_DE.po
index b27ce5a6a..56980dee0 100644
--- a/lang/cs_tban.de_DE.po
+++ b/modules/extra/language/cs_tban.de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-26 00:14-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:16-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: German\n"
@@ -17,16 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_tban.cpp:104
+#: ../cs_tban.cpp:106
 msgid "    TBAN       Bans the user for a given length of time"
 msgstr "    TBAN       Bant ein User für eine bestimmte Zeit aus ein Channel"
 
-#: cs_tban.cpp:81
+#: ../cs_tban.cpp:83
 #, c-format
 msgid "%s banned from %s, will auto-expire in %s"
 msgstr "%s gebannt von %s, wird auto-auslaufen in %s"
 
-#: cs_tban.cpp:91
+#: ../cs_tban.cpp:93
 msgid ""
 "Bans the given user from a channel for a specified length of\n"
 "time. If the ban is removed before by hand, it will NOT be replaced."
@@ -34,6 +34,6 @@ msgstr ""
 "Bant ein User für eine bestimmte Zeit aus ein Channel\n"
 "Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt."
 
-#: cs_tban.cpp:99
+#: ../cs_tban.cpp:101
 msgid "Syntax: TBAN channel nick time"
 msgstr "Syntax: TBAN Channel Nickname Zeit"
diff --git a/lang/cs_tban.it_IT.po b/modules/extra/language/cs_tban.it_IT.po
index e7fef1c9c..9f7797eba 100644
--- a/lang/cs_tban.it_IT.po
+++ b/modules/extra/language/cs_tban.it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-26 00:14-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:22-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -17,23 +17,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_tban.cpp:104
+#: ../cs_tban.cpp:106
 msgid "    TBAN       Bans the user for a given length of time"
 msgstr "    TBAN       Banna l'utente per un periodo di tempo specificato"
 
-#: cs_tban.cpp:81
+#: ../cs_tban.cpp:83
 #, c-format
 msgid "%s banned from %s, will auto-expire in %s"
 msgstr "%s bannato da %s, scadrà automaticamente tra %s"
 
-#: cs_tban.cpp:91
+#: ../cs_tban.cpp:93
 msgid ""
 "Bans the given user from a channel for a specified length of\n"
 "time. If the ban is removed before by hand, it will NOT be replaced."
 msgstr ""
 "Banna l'utente specificato da un canale per un periodo di tempo\n"
-"specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrà rimpiazzato."
+"specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrà "
+"rimpiazzato."
 
-#: cs_tban.cpp:99
+#: ../cs_tban.cpp:101
 msgid "Syntax: TBAN channel nick time"
 msgstr "Sintassi: TBAN canale nick tempo"
diff --git a/lang/cs_tban.nl_NL.po b/modules/extra/language/cs_tban.nl_NL.po
index c2e906fd9..9439b7408 100644
--- a/lang/cs_tban.nl_NL.po
+++ b/modules/extra/language/cs_tban.nl_NL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-26 00:14-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:15-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -17,16 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_tban.cpp:104
+#: ../cs_tban.cpp:106
 msgid "    TBAN       Bans the user for a given length of time"
 msgstr "    TBAN       Verban een gebruiker voor een bepaalde tijd"
 
-#: cs_tban.cpp:81
+#: ../cs_tban.cpp:83
 #, c-format
 msgid "%s banned from %s, will auto-expire in %s"
 msgstr "%s verbannen van %s, zal verlopen in %s"
 
-#: cs_tban.cpp:91
+#: ../cs_tban.cpp:93
 msgid ""
 "Bans the given user from a channel for a specified length of\n"
 "time. If the ban is removed before by hand, it will NOT be replaced."
@@ -35,6 +35,6 @@ msgstr ""
 "gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n"
 "zal deze NIET worden vervangen."
 
-#: cs_tban.cpp:99
+#: ../cs_tban.cpp:101
 msgid "Syntax: TBAN channel nick time"
 msgstr "Syntax: TBAN kanaal nick tijd"
diff --git a/lang/cs_tban.pot b/modules/extra/language/cs_tban.pot
index b5b8601dc..6717f9e2c 100644
--- a/lang/cs_tban.pot
+++ b/modules/extra/language/cs_tban.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-26 00:14-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cs_tban.cpp:104
+#: ../cs_tban.cpp:106
 msgid "    TBAN       Bans the user for a given length of time"
 msgstr ""
 
-#: cs_tban.cpp:81
+#: ../cs_tban.cpp:83
 #, c-format
 msgid "%s banned from %s, will auto-expire in %s"
 msgstr ""
 
-#: cs_tban.cpp:91
+#: ../cs_tban.cpp:93
 msgid ""
 "Bans the given user from a channel for a specified length of\n"
 "time. If the ban is removed before by hand, it will NOT be replaced."
 msgstr ""
 
-#: cs_tban.cpp:99
+#: ../cs_tban.cpp:101
 msgid "Syntax: TBAN channel nick time"
 msgstr ""
diff --git a/lang/cs_tban.pt_PT.po b/modules/extra/language/cs_tban.pt_PT.po
index 315ba4d25..0f60ecbcf 100644
--- a/lang/cs_tban.pt_PT.po
+++ b/modules/extra/language/cs_tban.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-26 00:14-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:18-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,23 +16,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cs_tban.cpp:104
+#: ../cs_tban.cpp:106
 msgid "    TBAN       Bans the user for a given length of time"
 msgstr "    TBAN       Bane o usuário por um determinado período de tempo"
 
-#: cs_tban.cpp:81
+#: ../cs_tban.cpp:83
 #, c-format
 msgid "%s banned from %s, will auto-expire in %s"
 msgstr "%s foi banido do %s, irá auto-expirar em %s"
 
-#: cs_tban.cpp:91
+#: ../cs_tban.cpp:93
 msgid ""
 "Bans the given user from a channel for a specified length of\n"
 "time. If the ban is removed before by hand, it will NOT be replaced."
 msgstr ""
 "Bane de um canal o usuário especificado por um determinado período de\n"
-"tempo. Se o ban for removido manualmente antes do tempo, ele não será recolocado."
+"tempo. Se o ban for removido manualmente antes do tempo, ele não será "
+"recolocado."
 
-#: cs_tban.cpp:99
+#: ../cs_tban.cpp:101
 msgid "Syntax: TBAN channel nick time"
 msgstr "Sintaxe: TBAN canal nick tempo"
diff --git a/lang/cs_tban.ru_RU.po b/modules/extra/language/cs_tban.ru_RU.po
index 9005c20f4..f14c06d58 100644
--- a/lang/cs_tban.ru_RU.po
+++ b/modules/extra/language/cs_tban.ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-26 00:14-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:20-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -18,16 +18,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: cs_tban.cpp:104
+#: ../cs_tban.cpp:106
 msgid "    TBAN       Bans the user for a given length of time"
 msgstr "    TBAN       Áàíèò ïîëüçîâàòåëÿ íà óêàçàííûé ïðîìåæóòîê âðåìåíè"
 
-#: cs_tban.cpp:81
+#: ../cs_tban.cpp:83
 #, c-format
 msgid "%s banned from %s, will auto-expire in %s"
 msgstr "Óñòàíîâëåííûé áàí %s íà êàíàëå %s èñòå÷åò ÷åðåç %s ñåêóíä"
 
-#: cs_tban.cpp:91
+#: ../cs_tban.cpp:93
 msgid ""
 "Bans the given user from a channel for a specified length of\n"
 "time. If the ban is removed before by hand, it will NOT be replaced."
@@ -36,6 +36,6 @@ msgstr ""
 "Ïðèìå÷àíèå: óäàëåííûé âðó÷íóþ (äî ñâîåãî èñòå÷åíèÿ) áàí ÍÅ ÁÓÄÅÒ\n"
 "ïåðåóñòàíîâëåí ñåðâèñàìè àâòîìàòè÷åñêè!"
 
-#: cs_tban.cpp:99
+#: ../cs_tban.cpp:101
 msgid "Syntax: TBAN channel nick time"
 msgstr "Ñèíòàêñèñ: TBAN #êàíàë íèê âðåìÿ"
diff --git a/modules/extra/language/db_mysql.pot b/modules/extra/language/db_mysql.pot
new file mode 100644
index 000000000..ac04cee49
--- /dev/null
+++ b/modules/extra/language/db_mysql.pot
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../db_mysql.cpp:142
+msgid "    SQLSYNC     Import your databases to SQL"
+msgstr ""
+
+#: ../db_mysql.cpp:132
+msgid ""
+"Syntax: SQLSYNC\n"
+" \n"
+"This command syncs your databases with SQL. You should\n"
+"only have to execute this command once, when you initially\n"
+"import your databases into SQL."
+msgstr ""
+
+#: ../db_mysql.cpp:1400
+msgid "Updating MySQL."
+msgstr ""
diff --git a/lang/hs_request.it_IT.po b/modules/extra/language/hs_request.it_IT.po
index 2a45d485f..0f50b0596 100644
--- a/lang/hs_request.it_IT.po
+++ b/modules/extra/language/hs_request.it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 22:23-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 23:42-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hs_request.cpp:195
+#: ../hs_request.cpp:193
 msgid ""
 "    ACTIVATE    Approve the requested vHost of a user\n"
 "    REJECT      Reject the requested vHost of a user\n"
@@ -27,33 +27,48 @@ msgstr ""
 "    REJECT      Rifiuta il vHost richiesto di un utente\n"
 "    WAITING     Comando per LIST +req"
 
-#: hs_request.cpp:137
+#: ../hs_request.cpp:132
 msgid "    REQUEST     Request a vHost for your nick"
 msgstr "    REQUEST     Richiede un vHost per il tuo nick"
 
-#: hs_request.cpp:183 hs_request.cpp:245
+#: ../hs_request.cpp:274
+#, c-format
+msgid "#%d Nick:%s, vhost:%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:272
+#, c-format
+msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:181 ../hs_request.cpp:245
 msgid "A memo informing the user will also be sent."
 msgstr "Viene inviato un memo per informare l'utente."
 
-#: hs_request.cpp:181
+#: ../hs_request.cpp:179
 msgid "Activate the requested vHost for the given nick."
 msgstr "Attiva il vHost richiesto per il nick specificato."
 
-#: hs_request.cpp:169 hs_request.cpp:234
+#: ../hs_request.cpp:278
+#, c-format
+msgid "Displayed all records (Count: %d)"
+msgstr ""
+
+#: ../hs_request.cpp:167 ../hs_request.cpp:234
 #, c-format
 msgid "No request for nick %s found."
 msgstr "Nessuna richiesta trovata per il nick %s."
 
-#: hs_request.cpp:104
+#: ../hs_request.cpp:102
 #, c-format
 msgid "Please wait %d seconds before requesting a new vHost"
 msgstr "Prego attendere %d secondi prima di richiedere un nuovo vHost"
 
-#: hs_request.cpp:243
+#: ../hs_request.cpp:243
 msgid "Reject the requested vHost for the given nick."
 msgstr "Rifiuta il vHost richiesto per il nick specificato."
 
-#: hs_request.cpp:124
+#: ../hs_request.cpp:119
 msgid ""
 "Request the given vHost to be actived for your nick by the\n"
 "network administrators. Please be patient while your request\n"
@@ -63,23 +78,23 @@ msgstr ""
 "degli amministratori di rete. Sei pregato di pazientare finchè la tua\n"
 "richiesta viene elaborata."
 
-#: hs_request.cpp:179 hs_request.cpp:190
+#: ../hs_request.cpp:177 ../hs_request.cpp:188
 msgid "Syntax: ACTIVATE nick"
-msgstr "Sintassi: \002ACTIVATE \037nick\037\002"
+msgstr "Sintassi: ACTIVATE nick"
 
-#: hs_request.cpp:241 hs_request.cpp:252
+#: ../hs_request.cpp:241 ../hs_request.cpp:252
 msgid "Syntax: REJECT nick"
-msgstr "Sintassi: \002REJECT \037nick\037\002"
+msgstr "Sintassi: REJECT nick"
 
-#: hs_request.cpp:65 hs_request.cpp:122 hs_request.cpp:132
+#: ../hs_request.cpp:65 ../hs_request.cpp:117 ../hs_request.cpp:127
 msgid "Syntax: REQUEST vhost"
-msgstr "Sintassi: \002REQUEST \037vhost\037\002"
+msgstr "Sintassi: REQUEST vhost"
 
-#: hs_request.cpp:307
+#: ../hs_request.cpp:307
 msgid "Syntax: WAITING"
-msgstr "Sintassi: \002WAITING\002"
+msgstr "Sintassi: WAITING"
 
-#: hs_request.cpp:309
+#: ../hs_request.cpp:309
 msgid ""
 "This command is provided for convenience. It is essentially\n"
 "the same as performing a LIST +req ."
@@ -87,35 +102,34 @@ msgstr ""
 "Questo comando è per comodità. Praticamente è la stessa cosa che\n"
 "eseguire un LIST +req ."
 
-#: hs_request.cpp:110
+#: ../hs_request.cpp:108
 msgid "Your vHost has been requested"
 msgstr "Il tuo vHost è stato richiesto"
 
-#: hs_request.cpp:161
+#: ../hs_request.cpp:159
 msgid "[auto memo] Your requested vHost has been approved."
 msgstr "[auto memo] Il vHost da te richiesto è stato approvato."
 
-#: hs_request.cpp:225
-#, c-format
+#: ../hs_request.cpp:225
 msgid "[auto memo] Your requested vHost has been rejected."
 msgstr "[auto memo] Il vHost da te richiesto è stato rifiutato."
 
-#: hs_request.cpp:223
+#: ../hs_request.cpp:223
 #, c-format
 msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
 msgstr "[auto memo] Il vHost da te richiesto è stato rifiutato. Motivo: %s"
 
-#: hs_request.cpp:646
+#: ../hs_request.cpp:443
 #, c-format
 msgid "[auto memo] vHost %s has been requested."
-msgstr "[auto memo] è stato richiesto il vHost \002%s\002."
+msgstr "[auto memo] è stato richiesto il vHost %s."
 
-#: hs_request.cpp:163
+#: ../hs_request.cpp:161
 #, c-format
 msgid "vHost for %s has been activated"
 msgstr "Il vHost per %s è stato attivato"
 
-#: hs_request.cpp:230
+#: ../hs_request.cpp:230
 #, c-format
 msgid "vHost for %s has been rejected"
 msgstr "Il vHost per %s è stato rifiutato"
diff --git a/lang/hs_request.nl_NL.po b/modules/extra/language/hs_request.nl_NL.po
index 1f798e1eb..59852158c 100644
--- a/lang/hs_request.nl_NL.po
+++ b/modules/extra/language/hs_request.nl_NL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 22:23-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 22:26-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hs_request.cpp:195
+#: ../hs_request.cpp:193
 msgid ""
 "    ACTIVATE    Approve the requested vHost of a user\n"
 "    REJECT      Reject the requested vHost of a user\n"
@@ -27,33 +27,49 @@ msgstr ""
 "    REJECT      Keur de aangevraagde vHost voor een gebruiker af\n"
 "    WAITING     Snelkoppeling naar LIST +req"
 
-#: hs_request.cpp:137
+#: ../hs_request.cpp:132
 msgid "    REQUEST     Request a vHost for your nick"
 msgstr "    REQUEST     Vraag een vHost aan voor je nick"
 
-#: hs_request.cpp:183 hs_request.cpp:245
+#: ../hs_request.cpp:274
+#, c-format
+msgid "#%d Nick:%s, vhost:%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:272
+#, c-format
+msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:181 ../hs_request.cpp:245
 msgid "A memo informing the user will also be sent."
-msgstr "Een memo die de gebruiker op de hoogste stelt zal ook worden verstuurd."
+msgstr ""
+"Een memo die de gebruiker op de hoogste stelt zal ook worden verstuurd."
 
-#: hs_request.cpp:181
+#: ../hs_request.cpp:179
 msgid "Activate the requested vHost for the given nick."
 msgstr "Activeer de aangevraagde vHost voor de gegeven nick."
 
-#: hs_request.cpp:169 hs_request.cpp:234
+#: ../hs_request.cpp:278
+#, c-format
+msgid "Displayed all records (Count: %d)"
+msgstr ""
+
+#: ../hs_request.cpp:167 ../hs_request.cpp:234
 #, c-format
 msgid "No request for nick %s found."
 msgstr "Geen aanvraag voor nick %s gevonden."
 
-#: hs_request.cpp:104
+#: ../hs_request.cpp:102
 #, c-format
 msgid "Please wait %d seconds before requesting a new vHost"
 msgstr "Wacht %d seconden voor je een nieuwe vHost aanvraagt"
 
-#: hs_request.cpp:243
+#: ../hs_request.cpp:243
 msgid "Reject the requested vHost for the given nick."
 msgstr "Keur de aangevraagde vHost voor de gegeven nick af."
 
-#: hs_request.cpp:124
+#: ../hs_request.cpp:119
 msgid ""
 "Request the given vHost to be actived for your nick by the\n"
 "network administrators. Please be patient while your request\n"
@@ -63,23 +79,23 @@ msgstr ""
 "netwerk beheerders. Het kan even duren voordat je aanvraag\n"
 "afgehandeld wordt."
 
-#: hs_request.cpp:179 hs_request.cpp:190
+#: ../hs_request.cpp:177 ../hs_request.cpp:188
 msgid "Syntax: ACTIVATE nick"
-msgstr "Gebruik: \002ACTIVATE \037nick\037\002"
+msgstr "Gebruik: ACTIVATE nick"
 
-#: hs_request.cpp:241 hs_request.cpp:252
+#: ../hs_request.cpp:241 ../hs_request.cpp:252
 msgid "Syntax: REJECT nick"
-msgstr "Gebruik: \002REJECT \037nick\037\002"
+msgstr "Gebruik: REJECT nick"
 
-#: hs_request.cpp:65 hs_request.cpp:122 hs_request.cpp:132
+#: ../hs_request.cpp:65 ../hs_request.cpp:117 ../hs_request.cpp:127
 msgid "Syntax: REQUEST vhost"
-msgstr "Gebruik: \002REQUEST \037vhost\037\002"
+msgstr "Gebruik: REQUEST vhost"
 
-#: hs_request.cpp:307
+#: ../hs_request.cpp:307
 msgid "Syntax: WAITING"
-msgstr "Gebruik: \002WAITING\002"
+msgstr "Gebruik: WAITING"
 
-#: hs_request.cpp:309
+#: ../hs_request.cpp:309
 msgid ""
 "This command is provided for convenience. It is essentially\n"
 "the same as performing a LIST +req ."
@@ -87,35 +103,34 @@ msgstr ""
 "Dit commando is beschikbaar als handigheid. Het is simpelweg\n"
 "hetzelfde als LIST +req ."
 
-#: hs_request.cpp:110
+#: ../hs_request.cpp:108
 msgid "Your vHost has been requested"
 msgstr "Je vHost is aangevraagd"
 
-#: hs_request.cpp:161
+#: ../hs_request.cpp:159
 msgid "[auto memo] Your requested vHost has been approved."
 msgstr "[auto memo] Je aangevraagde vHost is geaccepteerd."
 
-#: hs_request.cpp:225
-#, c-format
+#: ../hs_request.cpp:225
 msgid "[auto memo] Your requested vHost has been rejected."
 msgstr "[auto memo] Je aangevraagde vHost is afgekeurd."
 
-#: hs_request.cpp:223
+#: ../hs_request.cpp:223
 #, c-format
 msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
 msgstr "[auto memo] Je aangevraagde vHost is afgekeurd. Reden: %s"
 
-#: hs_request.cpp:646
+#: ../hs_request.cpp:443
 #, c-format
 msgid "[auto memo] vHost %s has been requested."
-msgstr "[auto memo] vHost \002%s\002 is aangevraagd."
+msgstr "[auto memo] vHost %s is aangevraagd."
 
-#: hs_request.cpp:163
+#: ../hs_request.cpp:161
 #, c-format
 msgid "vHost for %s has been activated"
 msgstr "vHost voor %s is geactiveerd"
 
-#: hs_request.cpp:230
+#: ../hs_request.cpp:230
 #, c-format
 msgid "vHost for %s has been rejected"
 msgstr "vHost voor %s is afgekeurd"
diff --git a/lang/hs_request.pot b/modules/extra/language/hs_request.pot
index 49ab239ea..d2e0a7c35 100644
--- a/lang/hs_request.pot
+++ b/modules/extra/language/hs_request.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 22:23-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,97 +16,111 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hs_request.cpp:195
+#: ../hs_request.cpp:193
 msgid ""
 "    ACTIVATE    Approve the requested vHost of a user\n"
 "    REJECT      Reject the requested vHost of a user\n"
 "    WAITING     Convenience command for LIST +req"
 msgstr ""
 
-#: hs_request.cpp:137
+#: ../hs_request.cpp:132
 msgid "    REQUEST     Request a vHost for your nick"
 msgstr ""
 
-#: hs_request.cpp:183 hs_request.cpp:245
+#: ../hs_request.cpp:274
+#, c-format
+msgid "#%d Nick:%s, vhost:%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:272
+#, c-format
+msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:181 ../hs_request.cpp:245
 msgid "A memo informing the user will also be sent."
 msgstr ""
 
-#: hs_request.cpp:181
+#: ../hs_request.cpp:179
 msgid "Activate the requested vHost for the given nick."
 msgstr ""
 
-#: hs_request.cpp:169 hs_request.cpp:234
+#: ../hs_request.cpp:278
+#, c-format
+msgid "Displayed all records (Count: %d)"
+msgstr ""
+
+#: ../hs_request.cpp:167 ../hs_request.cpp:234
 #, c-format
 msgid "No request for nick %s found."
 msgstr ""
 
-#: hs_request.cpp:104
+#: ../hs_request.cpp:102
 #, c-format
 msgid "Please wait %d seconds before requesting a new vHost"
 msgstr ""
 
-#: hs_request.cpp:243
+#: ../hs_request.cpp:243
 msgid "Reject the requested vHost for the given nick."
 msgstr ""
 
-#: hs_request.cpp:124
+#: ../hs_request.cpp:119
 msgid ""
 "Request the given vHost to be actived for your nick by the\n"
 "network administrators. Please be patient while your request\n"
 "is being considered."
 msgstr ""
 
-#: hs_request.cpp:179 hs_request.cpp:190
+#: ../hs_request.cpp:177 ../hs_request.cpp:188
 msgid "Syntax: ACTIVATE nick"
 msgstr ""
 
-#: hs_request.cpp:241 hs_request.cpp:252
+#: ../hs_request.cpp:241 ../hs_request.cpp:252
 msgid "Syntax: REJECT nick"
 msgstr ""
 
-#: hs_request.cpp:65 hs_request.cpp:122 hs_request.cpp:132
+#: ../hs_request.cpp:65 ../hs_request.cpp:117 ../hs_request.cpp:127
 msgid "Syntax: REQUEST vhost"
 msgstr ""
 
-#: hs_request.cpp:307
+#: ../hs_request.cpp:307
 msgid "Syntax: WAITING"
 msgstr ""
 
-#: hs_request.cpp:309
+#: ../hs_request.cpp:309
 msgid ""
 "This command is provided for convenience. It is essentially\n"
 "the same as performing a LIST +req ."
 msgstr ""
 
-#: hs_request.cpp:110
+#: ../hs_request.cpp:108
 msgid "Your vHost has been requested"
 msgstr ""
 
-#: hs_request.cpp:161
+#: ../hs_request.cpp:159
 msgid "[auto memo] Your requested vHost has been approved."
 msgstr ""
 
-#: hs_request.cpp:225
-#, c-format
+#: ../hs_request.cpp:225
 msgid "[auto memo] Your requested vHost has been rejected."
 msgstr ""
 
-#: hs_request.cpp:223
+#: ../hs_request.cpp:223
 #, c-format
 msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
 msgstr ""
 
-#: hs_request.cpp:646
+#: ../hs_request.cpp:443
 #, c-format
 msgid "[auto memo] vHost %s has been requested."
 msgstr ""
 
-#: hs_request.cpp:163
+#: ../hs_request.cpp:161
 #, c-format
 msgid "vHost for %s has been activated"
 msgstr ""
 
-#: hs_request.cpp:230
+#: ../hs_request.cpp:230
 #, c-format
 msgid "vHost for %s has been rejected"
 msgstr ""
diff --git a/lang/hs_request.pt_PT.po b/modules/extra/language/hs_request.pt_PT.po
index e87c1f3fd..a9fd9844c 100644
--- a/lang/hs_request.pt_PT.po
+++ b/modules/extra/language/hs_request.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 22:23-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 22:48-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hs_request.cpp:195
+#: ../hs_request.cpp:193
 msgid ""
 "    ACTIVATE    Approve the requested vHost of a user\n"
 "    REJECT      Reject the requested vHost of a user\n"
@@ -26,33 +26,48 @@ msgstr ""
 "    REJECT      Recusa o pedido de vHost de um usuário\n"
 "    WAITING     Comando para LISTAR +req"
 
-#: hs_request.cpp:137
+#: ../hs_request.cpp:132
 msgid "    REQUEST     Request a vHost for your nick"
 msgstr "    REQUEST     Request a vHost for your nick"
 
-#: hs_request.cpp:183 hs_request.cpp:245
+#: ../hs_request.cpp:274
+#, c-format
+msgid "#%d Nick:%s, vhost:%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:272
+#, c-format
+msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:181 ../hs_request.cpp:245
 msgid "A memo informing the user will also be sent."
 msgstr "Um memo informando o usuário também será enviado."
 
-#: hs_request.cpp:181
+#: ../hs_request.cpp:179
 msgid "Activate the requested vHost for the given nick."
 msgstr "Ativa o vHost solicitado para o nick fornecido."
 
-#: hs_request.cpp:169 hs_request.cpp:234
+#: ../hs_request.cpp:278
+#, c-format
+msgid "Displayed all records (Count: %d)"
+msgstr ""
+
+#: ../hs_request.cpp:167 ../hs_request.cpp:234
 #, c-format
 msgid "No request for nick %s found."
 msgstr "Nenhum pedido encontrado para o nick %s."
 
-#: hs_request.cpp:104
+#: ../hs_request.cpp:102
 #, c-format
 msgid "Please wait %d seconds before requesting a new vHost"
 msgstr "Por favor, espere %d segundos antes de fazer um novo pedido de vHost"
 
-#: hs_request.cpp:243
+#: ../hs_request.cpp:243
 msgid "Reject the requested vHost for the given nick."
 msgstr "Recusa o pedido de vHost para o nick fornecido."
 
-#: hs_request.cpp:124
+#: ../hs_request.cpp:119
 msgid ""
 "Request the given vHost to be actived for your nick by the\n"
 "network administrators. Please be patient while your request\n"
@@ -62,23 +77,23 @@ msgstr ""
 "administradores da rede. Por favor, tenha paciência\n"
 "enquanto seu pedido é analisado."
 
-#: hs_request.cpp:179 hs_request.cpp:190
+#: ../hs_request.cpp:177 ../hs_request.cpp:188
 msgid "Syntax: ACTIVATE nick"
-msgstr "Sintaxe: \002ACTIVATE \037nick\037\002"
+msgstr "Sintaxe: ACTIVATE nick"
 
-#: hs_request.cpp:241 hs_request.cpp:252
+#: ../hs_request.cpp:241 ../hs_request.cpp:252
 msgid "Syntax: REJECT nick"
-msgstr "Sintaxe: \002REJECT \037nick\037\002"
+msgstr "Sintaxe: REJECT nick"
 
-#: hs_request.cpp:65 hs_request.cpp:122 hs_request.cpp:132
+#: ../hs_request.cpp:65 ../hs_request.cpp:117 ../hs_request.cpp:127
 msgid "Syntax: REQUEST vhost"
-msgstr "Sintaxe: \002REQUEST \037vhost\037\002"
+msgstr "Sintaxe: REQUEST vhost"
 
-#: hs_request.cpp:307
+#: ../hs_request.cpp:307
 msgid "Syntax: WAITING"
-msgstr "Sintaxe: \002WAITING\002"
+msgstr "Sintaxe: WAITING"
 
-#: hs_request.cpp:309
+#: ../hs_request.cpp:309
 msgid ""
 "This command is provided for convenience. It is essentially\n"
 "the same as performing a LIST +req ."
@@ -86,35 +101,34 @@ msgstr ""
 "Este comando é usado por conveniência. É essencialmente\n"
 "o mesmo que fazer um LIST +req"
 
-#: hs_request.cpp:110
+#: ../hs_request.cpp:108
 msgid "Your vHost has been requested"
 msgstr "Seu pedido de vHost foi encaminhado"
 
-#: hs_request.cpp:161
+#: ../hs_request.cpp:159
 msgid "[auto memo] Your requested vHost has been approved."
 msgstr "[Auto Memo] Seu pedido de vHost foi aprovado."
 
-#: hs_request.cpp:225
-#, c-format
+#: ../hs_request.cpp:225
 msgid "[auto memo] Your requested vHost has been rejected."
 msgstr "[Auto Memo] Seu pedido de vHost foi recusado."
 
-#: hs_request.cpp:223
+#: ../hs_request.cpp:223
 #, c-format
 msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
 msgstr "[Auto Memo] Seu pedido de vHost foi recusado. Motivo: %s"
 
-#: hs_request.cpp:646
+#: ../hs_request.cpp:443
 #, c-format
 msgid "[auto memo] vHost %s has been requested."
-msgstr "[Auto Memo] O vHost \002%s\002 foi solicitado."
+msgstr "[Auto Memo] O vHost %s foi solicitado."
 
-#: hs_request.cpp:163
+#: ../hs_request.cpp:161
 #, c-format
 msgid "vHost for %s has been activated"
 msgstr "O vHost para %s foi ativado"
 
-#: hs_request.cpp:230
+#: ../hs_request.cpp:230
 #, c-format
 msgid "vHost for %s has been rejected"
 msgstr "O vHost de %s foi recusado"
diff --git a/lang/hs_request.ru_RU.po b/modules/extra/language/hs_request.ru_RU.po
index a1776c6fc..646fc4714 100644
--- a/lang/hs_request.ru_RU.po
+++ b/modules/extra/language/hs_request.ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 22:23-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 23:27-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: hs_request.cpp:195
+#: ../hs_request.cpp:193
 msgid ""
 "    ACTIVATE    Approve the requested vHost of a user\n"
 "    REJECT      Reject the requested vHost of a user\n"
@@ -28,33 +28,48 @@ msgstr ""
 "    REJECT      Îòêëîíèòü çàïðàøèâàåìûé ïîëüçîâàòåëåì  vHost\n"
 "    WAITING     Ñïèñîê çàïðîñîâ îæèäàþùèõ îáðàáîòêè (àíàëîã LIST +req)"
 
-#: hs_request.cpp:137
+#: ../hs_request.cpp:132
 msgid "    REQUEST     Request a vHost for your nick"
 msgstr "    REQUEST     Çàïðîñ íà vHost äëÿ âàøåãî òåêóùåãî íèêà"
 
-#: hs_request.cpp:183 hs_request.cpp:245
+#: ../hs_request.cpp:274
+#, c-format
+msgid "#%d Nick:%s, vhost:%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:272
+#, c-format
+msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
+msgstr ""
+
+#: ../hs_request.cpp:181 ../hs_request.cpp:245
 msgid "A memo informing the user will also be sent."
 msgstr "Ïîëüçîâàòåëþ áóäåò ïîñëàíî àâòî-óâåäîìëåíèå îá àêòèâàöèè åãî çàïðîñà."
 
-#: hs_request.cpp:181
+#: ../hs_request.cpp:179
 msgid "Activate the requested vHost for the given nick."
 msgstr "Óòâåðäèòü çàïðàøèâàåìûé vHost äëÿ óêàçàííîãî íèêà."
 
-#: hs_request.cpp:169 hs_request.cpp:234
+#: ../hs_request.cpp:278
+#, c-format
+msgid "Displayed all records (Count: %d)"
+msgstr ""
+
+#: ../hs_request.cpp:167 ../hs_request.cpp:234
 #, c-format
 msgid "No request for nick %s found."
 msgstr "Çàïðîñ íà vHost äëÿ íèêà %s íå íàéäåí."
 
-#: hs_request.cpp:104
+#: ../hs_request.cpp:102
 #, c-format
 msgid "Please wait %d seconds before requesting a new vHost"
 msgstr "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä, ïðåæäå ÷åì çàïðàøèâàòü íîâûé vHost"
 
-#: hs_request.cpp:243
+#: ../hs_request.cpp:243
 msgid "Reject the requested vHost for the given nick."
 msgstr "Îòêëîíèòü çàïðàøèâàåìûé vHost äëÿ óêàçàííîãî íèêà."
 
-#: hs_request.cpp:124
+#: ../hs_request.cpp:119
 msgid ""
 "Request the given vHost to be actived for your nick by the\n"
 "network administrators. Please be patient while your request\n"
@@ -64,59 +79,59 @@ msgstr ""
 "àäìèíèñòðàòîðîâ ñåòè. Ïðîñüáà ïðîÿâèòü òåðïåíèå, ïîêà çàïðîñ\n"
 "ðàññìàòðèâàåòñÿ àäìèíèñòðàöèåé."
 
-#: hs_request.cpp:179 hs_request.cpp:190
+#: ../hs_request.cpp:177 ../hs_request.cpp:188
 msgid "Syntax: ACTIVATE nick"
-msgstr "Ñèíòàêñèñ: \002ACTIVATE \037íèê\037\002"
+msgstr "Ñèíòàêñèñ: ACTIVATE íèê"
 
-#: hs_request.cpp:241 hs_request.cpp:252
+#: ../hs_request.cpp:241 ../hs_request.cpp:252
 msgid "Syntax: REJECT nick"
-msgstr "Ñèíòàêñèñ: \002REJECT \037íèê\037\002"
+msgstr "Ñèíòàêñèñ: REJECT íèê"
 
-#: hs_request.cpp:65 hs_request.cpp:122 hs_request.cpp:132
+#: ../hs_request.cpp:65 ../hs_request.cpp:117 ../hs_request.cpp:127
 msgid "Syntax: REQUEST vhost"
-msgstr "Ñèíòàêñèñ: \002REQUEST \037vHost\037\002"
+msgstr "Ñèíòàêñèñ: REQUEST vHost"
 
-#: hs_request.cpp:307
+#: ../hs_request.cpp:307
 msgid "Syntax: WAITING"
-msgstr "Ñèíòàêñèñ: \002WAITING\002"
+msgstr "Ñèíòàêñèñ: WAITING"
 
-#: hs_request.cpp:309
+#: ../hs_request.cpp:309
 msgid ""
 "This command is provided for convenience. It is essentially\n"
 "the same as performing a LIST +req ."
 msgstr ""
-"Äàííàÿ êîìàíäà ñîçäàíà äëÿ óäîáñòâà èñïîëüçîâàíèÿ è âûâîäèò ñïèñîê çàïðîñîâ,\n"
+"Äàííàÿ êîìàíäà ñîçäàíà äëÿ óäîáñòâà èñïîëüçîâàíèÿ è âûâîäèò ñïèñîê "
+"çàïðîñîâ,\n"
 "îæèäàþùèõ îáðàáîòêè. Àíàëîãè÷íàÿ êîìàíäà: LIST +req ."
 
-#: hs_request.cpp:110
+#: ../hs_request.cpp:108
 msgid "Your vHost has been requested"
 msgstr "Âàø çàïðîñ íà vHost îòïðàâëåí."
 
-#: hs_request.cpp:161
+#: ../hs_request.cpp:159
 msgid "[auto memo] Your requested vHost has been approved."
 msgstr "[àâòî-ñîîáùåíèå] Çàïðàøèâàåìûé âàìè vHost óòâåðæäåí è àêòèâèðîâàí."
 
-#: hs_request.cpp:225
-#, c-format
+#: ../hs_request.cpp:225
 msgid "[auto memo] Your requested vHost has been rejected."
 msgstr "[àâòî-ñîîáùåíèå] Çàïðàøèâàåìûé âàìè vHost îòêëîíåí."
 
-#: hs_request.cpp:223
+#: ../hs_request.cpp:223
 #, c-format
 msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
 msgstr "[àâòî-ñîîáùåíèå] Çàïðàøèâàåìûé âàìè vHost îòêëîíåí. Ïðè÷èíà: %s"
 
-#: hs_request.cpp:646
+#: ../hs_request.cpp:443
 #, c-format
 msgid "[auto memo] vHost %s has been requested."
-msgstr "[àâòî-ñîîáùåíèå] Áûë çàïðîøåí vHost \002%s\002"
+msgstr "[àâòî-ñîîáùåíèå] Áûë çàïðîøåí vHost %s"
 
-#: hs_request.cpp:163
+#: ../hs_request.cpp:161
 #, c-format
 msgid "vHost for %s has been activated"
 msgstr "vHost äëÿ %s óñïåøíî àêòèâèðîâàí"
 
-#: hs_request.cpp:230
+#: ../hs_request.cpp:230
 #, c-format
 msgid "vHost for %s has been rejected"
 msgstr "vHost äëÿ %s îòêëîíåí."
diff --git a/lang/ns_maxemail.de_DE.po b/modules/extra/language/ns_maxemail.de_DE.po
index 981d80c5b..fe1f3aef4 100644
--- a/lang/ns_maxemail.de_DE.po
+++ b/modules/extra/language/ns_maxemail.de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 23:51-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:03-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: German\n"
@@ -17,11 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ns_maxemail.cpp:33
-#, c-format
-msgid "The given email address has reached it's usage limit of %d users."
+#: ../ns_maxemail.cpp:33
+#, fuzzy, c-format
+msgid "The given email address has reached its usage limit of %d users."
 msgstr "Die angegebene eMail hat die limit Begrenzung von %d User erreicht."
 
-#: ns_maxemail.cpp:31
-msgid "The given email address has reached it's usage limit of 1 user."
+#: ../ns_maxemail.cpp:31
+#, fuzzy
+msgid "The given email address has reached its usage limit of 1 user."
 msgstr "Die angegebene eMail hat die limit Begrenzung von 1 User erreicht."
diff --git a/lang/ns_maxemail.it_IT.po b/modules/extra/language/ns_maxemail.it_IT.po
index 2d84aff97..1cd1a4083 100644
--- a/lang/ns_maxemail.it_IT.po
+++ b/modules/extra/language/ns_maxemail.it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 23:51-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:11-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -17,11 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ns_maxemail.cpp:33
-#, c-format
-msgid "The given email address has reached it's usage limit of %d users."
-msgstr "L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di %d utenti."
+#: ../ns_maxemail.cpp:33
+#, fuzzy, c-format
+msgid "The given email address has reached its usage limit of %d users."
+msgstr ""
+"L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di %d "
+"utenti."
 
-#: ns_maxemail.cpp:31
-msgid "The given email address has reached it's usage limit of 1 user."
-msgstr "L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di 1 utente."
+#: ../ns_maxemail.cpp:31
+#, fuzzy
+msgid "The given email address has reached its usage limit of 1 user."
+msgstr ""
+"L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di 1 "
+"utente."
diff --git a/lang/ns_maxemail.nl_NL.po b/modules/extra/language/ns_maxemail.nl_NL.po
index 030108e23..fb84c786a 100644
--- a/lang/ns_maxemail.nl_NL.po
+++ b/modules/extra/language/ns_maxemail.nl_NL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 23:51-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-25 23:57-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -17,11 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ns_maxemail.cpp:33
-#, c-format
-msgid "The given email address has reached it's usage limit of %d users."
+#: ../ns_maxemail.cpp:33
+#, fuzzy, c-format
+msgid "The given email address has reached its usage limit of %d users."
 msgstr "Het gegeven email adres heeft de limiet van %d gebruikers bereikt."
 
-#: ns_maxemail.cpp:31
-msgid "The given email address has reached it's usage limit of 1 user."
+#: ../ns_maxemail.cpp:31
+#, fuzzy
+msgid "The given email address has reached its usage limit of 1 user."
 msgstr "Het gegeven email adres heeft de limiet van 1 gebruiker bereikt."
diff --git a/lang/ns_maxemail.pot b/modules/extra/language/ns_maxemail.pot
index dd08475a1..c799470d3 100644
--- a/lang/ns_maxemail.pot
+++ b/modules/extra/language/ns_maxemail.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 23:51-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ns_maxemail.cpp:33
+#: ../ns_maxemail.cpp:33
 #, c-format
-msgid "The given email address has reached it's usage limit of %d users."
+msgid "The given email address has reached its usage limit of %d users."
 msgstr ""
 
-#: ns_maxemail.cpp:31
-msgid "The given email address has reached it's usage limit of 1 user."
+#: ../ns_maxemail.cpp:31
+msgid "The given email address has reached its usage limit of 1 user."
 msgstr ""
diff --git a/lang/ns_maxemail.pt_PT.po b/modules/extra/language/ns_maxemail.pt_PT.po
index e7577e774..ff807f582 100644
--- a/lang/ns_maxemail.pt_PT.po
+++ b/modules/extra/language/ns_maxemail.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 23:51-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:05-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,11 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ns_maxemail.cpp:33
-#, c-format
-msgid "The given email address has reached it's usage limit of %d users."
-msgstr "O endereço de email fornecido alcançou seu limite de uso de %d usuários."
+#: ../ns_maxemail.cpp:33
+#, fuzzy, c-format
+msgid "The given email address has reached its usage limit of %d users."
+msgstr ""
+"O endereço de email fornecido alcançou seu limite de uso de %d usuários."
 
-#: ns_maxemail.cpp:31
-msgid "The given email address has reached it's usage limit of 1 user."
+#: ../ns_maxemail.cpp:31
+#, fuzzy
+msgid "The given email address has reached its usage limit of 1 user."
 msgstr "O endereço de email fornecido alcançou seu limite de uso de 1 usuário."
diff --git a/lang/ns_maxemail.ru_RU.po b/modules/extra/language/ns_maxemail.ru_RU.po
index b6be1d53f..1fa267d55 100644
--- a/lang/ns_maxemail.ru_RU.po
+++ b/modules/extra/language/ns_maxemail.ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 23:51-0400\n"
+"POT-Creation-Date: 2011-02-04 03:41-0500\n"
 "PO-Revision-Date: 2010-09-26 00:07-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -18,11 +18,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ns_maxemail.cpp:33
-#, c-format
-msgid "The given email address has reached it's usage limit of %d users."
-msgstr "Óêàçàííûé âàìè email-àäðåñ èñïîëüçóåòñÿ ìàêñèìàëüíî äîïóñòèìîå êîë-âî ðàç: %d"
+#: ../ns_maxemail.cpp:33
+#, fuzzy, c-format
+msgid "The given email address has reached its usage limit of %d users."
+msgstr ""
+"Óêàçàííûé âàìè email-àäðåñ èñïîëüçóåòñÿ ìàêñèìàëüíî äîïóñòèìîå êîë-âî ðàç: %d"
 
-#: ns_maxemail.cpp:31
-msgid "The given email address has reached it's usage limit of 1 user."
+#: ../ns_maxemail.cpp:31
+#, fuzzy
+msgid "The given email address has reached its usage limit of 1 user."
 msgstr "Óêàçàííûé âàìè email-àäðåñ óæå êåì-òî èñïîëüçóåòñÿ."
diff --git a/modules/extra/language/update.sh b/modules/extra/language/update.sh
new file mode 100755
index 000000000..3ca7081ae
--- /dev/null
+++ b/modules/extra/language/update.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+for f in `ls ../*.cpp`
+do
+	BASE=`basename $f | cut -d'.' -f1`
+	xgettext -C -s -d $BASE -o $BASE.pot --from-code=utf-8 --keyword=_ $f
+done
+
+for f in `ls *.po`
+do
+	msgmerge -v -s -U $f `basename $f | cut -d'.' -f1`.pot
+done
+
+rm -f *~
diff --git a/modules/extra/ns_set_misc.cpp b/modules/extra/ns_set_misc.cpp
index dc420e36d..72b4ba5e9 100644
--- a/modules/extra/ns_set_misc.cpp
+++ b/modules/extra/ns_set_misc.cpp
@@ -35,17 +35,17 @@ class CommandNSSetMisc : public Command
 		if (params.size() > 1)
 		{
 			nc->Extend("nickserv:" + this->name, new ExtensibleItemRegular<Anope::string>(params[1]));
-			u->SendMessage(NickServ, CHAN_SETTING_CHANGED, this->name.c_str(), nc->display.c_str(), params[1].c_str());
+			u->SendMessage(NickServ, LanguageString::CHAN_SETTING_CHANGED, this->name.c_str(), nc->display.c_str(), params[1].c_str());
 		}
 		else
-			u->SendMessage(NickServ, CHAN_SETTING_UNSET, this->name.c_str(), nc->display.c_str());
+			u->SendMessage(NickServ, LanguageString::CHAN_SETTING_UNSET, this->name.c_str(), nc->display.c_str());
 
 		return MOD_CONT;
 	}
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SET", NICK_SET_SYNTAX);
+		SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX);
 	}
 
 	void OnServHelp(CommandSource &source)
@@ -63,7 +63,7 @@ class CommandNSSASetMisc : public CommandNSSetMisc
 
 	void OnSyntaxError(CommandSource &source, const Anope::string &)
 	{
-		SyntaxError(source, "SASET", NICK_SASET_SYNTAX);
+		SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX);
 	}
 };
 
diff --git a/src/botserv.cpp b/src/botserv.cpp
index d3c7a7450..5f321a125 100644
--- a/src/botserv.cpp
+++ b/src/botserv.cpp
@@ -125,7 +125,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 		if (ci->botflags.HasFlag(BS_KICK_BOLDS) && realbuf.find(2) != Anope::string::npos)
 		{
 			check_ban(ci, u, TTB_BOLDS);
-			bot_kick(ci, u, BOT_REASON_BOLD);
+			bot_kick(ci, u, _("Don't use bolds on this channel!"));
 			return;
 		}
 
@@ -133,7 +133,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 		if (ci->botflags.HasFlag(BS_KICK_COLORS) && realbuf.find(3) != Anope::string::npos)
 		{
 			check_ban(ci, u, TTB_COLORS);
-			bot_kick(ci, u, BOT_REASON_COLOR);
+			bot_kick(ci, u, _("Don't use colors on this channel!"));
 			return;
 		}
 
@@ -141,7 +141,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 		if (ci->botflags.HasFlag(BS_KICK_REVERSES) && realbuf.find(22) != Anope::string::npos)
 		{
 			check_ban(ci, u, TTB_REVERSES);
-			bot_kick(ci, u, BOT_REASON_REVERSE);
+			bot_kick(ci, u, _("Don't use reverses on this channel!"));
 			return;
 		}
 
@@ -149,7 +149,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 		if (ci->botflags.HasFlag(BS_KICK_ITALICS) && realbuf.find(29) != Anope::string::npos)
 		{
 			check_ban(ci, u, TTB_ITALICS);
-			bot_kick(ci, u, BOT_REASON_ITALIC);
+			bot_kick(ci, u, _("Don't use italics on this channel!"));
 			return;
 		}
 
@@ -157,7 +157,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 		if (ci->botflags.HasFlag(BS_KICK_UNDERLINES) && realbuf.find(31) != Anope::string::npos)
 		{
 			check_ban(ci, u, TTB_UNDERLINES);
-			bot_kick(ci, u, BOT_REASON_UNDERLINE);
+			bot_kick(ci, u, _("Don't use underlines on this channel!"));
 			return;
 		}
 
@@ -182,7 +182,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 			if (i && l && i >= ci->capsmin && i * 100 / (i + l) >= ci->capspercent)
 			{
 				check_ban(ci, u, TTB_CAPS);
-				bot_kick(ci, u, BOT_REASON_CAPS);
+				bot_kick(ci, u, _("Turn caps lock OFF!"));
 				return;
 			}
 		}
@@ -255,9 +255,9 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 				{
 					check_ban(ci, u, TTB_BADWORDS);
 					if (Config->BSGentleBWReason)
-						bot_kick(ci, u, BOT_REASON_BADWORD_GENTLE);
+						bot_kick(ci, u, _("Watch your language!"));
 					else
-						bot_kick(ci, u, BOT_REASON_BADWORD, bw->word.c_str());
+						bot_kick(ci, u, _("Don't use the word \"%s\" on this channel!"), bw->word.c_str());
 
 					return;
 				}
@@ -281,7 +281,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 			if (ud->lines >= ci->floodlines)
 			{
 				check_ban(ci, u, TTB_FLOOD);
-				bot_kick(ci, u, BOT_REASON_FLOOD);
+				bot_kick(ci, u, _("Stop flooding!"));
 				return;
 			}
 		}
@@ -308,7 +308,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 			if (ud->times >= ci->repeattimes)
 			{
 				check_ban(ci, u, TTB_REPEAT);
-				bot_kick(ci, u, BOT_REASON_REPEAT);
+				bot_kick(ci, u, _("Stop repeating yourself!"));
 				return;
 			}
 		}
@@ -486,7 +486,7 @@ void check_ban(ChannelInfo *ci, User *u, int ttbtype)
 
 /* This makes a bot kick a user. Works somewhat like notice_lang in fact ;) */
 
-void bot_kick(ChannelInfo *ci, User *u, LanguageString message, ...)
+void bot_kick(ChannelInfo *ci, User *u, const char *message, ...)
 {
 	va_list args;
 	char buf[1024];
@@ -494,7 +494,7 @@ void bot_kick(ChannelInfo *ci, User *u, LanguageString message, ...)
 	if (!ci || !ci->bi || !ci->c || !u)
 		return;
 
-	Anope::string fmt = GetString(u, message);
+	Anope::string fmt = GetString(u->Account(), message);
 	va_start(args, message);
 	if (fmt.empty())
 		return;
@@ -519,7 +519,7 @@ void bot_raw_ban(User *requester, ChannelInfo *ci, User *u, const Anope::string
 
 	if (ModeManager::FindUserModeByName(UMODE_PROTECTED) && u->IsProtected() && requester != u)
 	{
-		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester, ACCESS_DENIED).c_str());
+		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), LanguageString::ACCESS_DENIED).c_str());
 		return;
 	}
 
@@ -530,7 +530,7 @@ void bot_raw_ban(User *requester, ChannelInfo *ci, User *u, const Anope::string
 
 	if (matches_list(ci->c, u, CMODE_EXCEPT))
 	{
-		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester, BOT_EXCEPT).c_str());
+		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), _("User matches channel except.")).c_str());
 		return;
 	}
 
@@ -561,7 +561,7 @@ void bot_raw_kick(User *requester, ChannelInfo *ci, User *u, const Anope::string
 
 	if (ModeManager::FindUserModeByName(UMODE_PROTECTED) && u->IsProtected() && requester != u)
 	{
-		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester, ACCESS_DENIED).c_str());
+		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), LanguageString::ACCESS_DENIED).c_str());
 		return;
 	}
 
diff --git a/src/channels.cpp b/src/channels.cpp
index a4c920227..72b09ae1e 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -133,9 +133,9 @@ void Channel::JoinUser(User *user)
 	if (this->ci && check_access(user, this->ci, CA_MEMO) && this->ci->memos.memos.size() > 0)
 	{
 		if (this->ci->memos.memos.size() == 1)
-			user->SendMessage(MemoServ, MEMO_X_ONE_NOTICE, this->ci->memos.memos.size(), this->ci->name.c_str());
+			user->SendMessage(MemoServ, _("There is \002%d\002 memo on channel %s."), this->ci->memos.memos.size(), this->ci->name.c_str());
 		else
-			user->SendMessage(MemoServ, MEMO_X_MANY_NOTICE, this->ci->memos.memos.size(), this->ci->name.c_str());
+			user->SendMessage(MemoServ, _("There are \002%d\002 memos on channel %s."), this->ci->memos.memos.size(), this->ci->name.c_str());
 	}
 
 	if (!Config->s_BotServ.empty() && this->ci && this->ci->bi)
diff --git a/src/chanserv.cpp b/src/chanserv.cpp
index 741349a46..64cfeeef5 100644
--- a/src/chanserv.cpp
+++ b/src/chanserv.cpp
@@ -60,45 +60,45 @@ static int def_levels[][2] = {
 };
 
 LevelInfo levelinfo[] = {
-	{ CA_AUTOHALFOP,	"AUTOHALFOP",	CHAN_LEVEL_AUTOHALFOP },
-	{ CA_AUTOOP,		"AUTOOP",		CHAN_LEVEL_AUTOOP },
-	{ CA_AUTOPROTECT,	"AUTOPROTECT",	CHAN_LEVEL_AUTOPROTECT },
-	{ CA_AUTOVOICE,		"AUTOVOICE",		CHAN_LEVEL_AUTOVOICE },
-	{ CA_NOJOIN,		"NOJOIN",		CHAN_LEVEL_NOJOIN },
-	{ CA_SIGNKICK,		"SIGNKICK",		CHAN_LEVEL_SIGNKICK },
-	{ CA_ACCESS_LIST,	"ACC-LIST",		CHAN_LEVEL_ACCESS_LIST },
-	{ CA_ACCESS_CHANGE,	"ACC-CHANGE",	CHAN_LEVEL_ACCESS_CHANGE },
-	{ CA_AKICK,			"AKICK",			CHAN_LEVEL_AKICK },
-	{ CA_SET,			"SET",			CHAN_LEVEL_SET },
-	{ CA_BAN,			"BAN",			CHAN_LEVEL_BAN },
-	{ CA_BANME,			"BANME",			CHAN_LEVEL_BANME },
-	{ CA_GETKEY,		"GETKEY",		CHAN_LEVEL_GETKEY },
-	{ CA_HALFOP,		"HALFOP",		CHAN_LEVEL_HALFOP },
-	{ CA_HALFOPME,		"HALFOPME",		CHAN_LEVEL_HALFOPME },
-	{ CA_INFO,			"INFO",			CHAN_LEVEL_INFO },
-	{ CA_KICK,			"KICK",			CHAN_LEVEL_KICK },
-	{ CA_KICKME,		"KICKME",		CHAN_LEVEL_KICKME },
-	{ CA_INVITE,		"INVITE",		CHAN_LEVEL_INVITE },
-	{ CA_OPDEOP,		"OPDEOP",		CHAN_LEVEL_OPDEOP },
-	{ CA_OPDEOPME,		"OPDEOPME",		CHAN_LEVEL_OPDEOPME },
-	{ CA_PROTECT,		"PROTECT",		CHAN_LEVEL_PROTECT },
-	{ CA_PROTECTME,		"PROTECTME",		CHAN_LEVEL_PROTECTME },
-	{ CA_TOPIC,			"TOPIC",			CHAN_LEVEL_TOPIC },
-	{ CA_MODE,			"MODE",				CHAN_LEVEL_MODE },
-	{ CA_UNBAN,			"UNBAN",			CHAN_LEVEL_UNBAN },
-	{ CA_VOICE,			"VOICE",			CHAN_LEVEL_VOICE },
-	{ CA_VOICEME,		"VOICEME",		CHAN_LEVEL_VOICEME },
-	{ CA_MEMO,			"MEMO",			CHAN_LEVEL_MEMO },
-	{ CA_ASSIGN,		"ASSIGN",		CHAN_LEVEL_ASSIGN },
-	{ CA_BADWORDS,		"BADWORDS",		CHAN_LEVEL_BADWORDS },
-	{ CA_FANTASIA,		"FANTASIA",		CHAN_LEVEL_FANTASIA },
-	{ CA_GREET,			"GREET",			CHAN_LEVEL_GREET },
-	{ CA_NOKICK,		"NOKICK",		CHAN_LEVEL_NOKICK },
-	{ CA_SAY,			"SAY",			CHAN_LEVEL_SAY },
-	{ CA_AUTOOWNER,		"AUTOOWNER",		CHAN_LEVEL_AUTOOWNER },
-	{ CA_OWNER,			"OWNER",			CHAN_LEVEL_OWNER },
-	{ CA_OWNERME,		"OWNERME",		CHAN_LEVEL_OWNERME },
-	{ CA_FOUNDER,		"FOUNDER",		CHAN_LEVEL_FOUNDER },
+	{ CA_AUTOHALFOP,	"AUTOHALFOP",		_("Automatic mode +h") },
+	{ CA_AUTOOP,		"AUTOOP",		_("Automatic channel operator status") },
+	{ CA_AUTOPROTECT,	"AUTOPROTECT",		_("Automatic mode +a") },
+	{ CA_AUTOVOICE,		"AUTOVOICE",		_("Automatic mode +v") },
+	{ CA_NOJOIN,		"NOJOIN",		_("Not allowed to join channel") },
+	{ CA_SIGNKICK,		"SIGNKICK",		_("No signed kick when SIGNKICK LEVEL is used") },
+	{ CA_ACCESS_LIST,	"ACC-LIST",		_("Allowed to view the access list") },
+	{ CA_ACCESS_CHANGE,	"ACC-CHANGE",		_("Allowed to modify the access list") },
+	{ CA_AKICK,		"AKICK",		_("Allowed to use AKICK command") },
+	{ CA_SET,		"SET",			_("Allowed to use SET command (not FOUNDER/PASSWORD)"), },
+	{ CA_BAN,		"BAN",			_("Allowed to use BAN command") },
+	{ CA_BANME,		"BANME",		_("Allowed to ban him/herself") },
+	{ CA_GETKEY,		"GETKEY",		_("Allowed to use GETKEY command") },
+	{ CA_HALFOP,		"HALFOP",		_("Allowed to (de)halfop him/herself") },
+	{ CA_HALFOPME,		"HALFOPME",		_("Allowed to (de)halfop him/herself") },
+	{ CA_INFO,		"INFO",			_("Allowed to use INFO command with ALL option") },
+	{ CA_KICK,		"KICK",			_("Allowed to use KICK command") },
+	{ CA_KICKME,		"KICKME",		_("Allowed to kick him/herself") },
+	{ CA_INVITE,		"INVITE",		_("Allowed to use INVITE command") },
+	{ CA_OPDEOP,		"OPDEOP",		_("Allowed to use OP/DEOP commands") },
+	{ CA_OPDEOPME,		"OPDEOPME",		_("Allowed to (de)op him/herself") },
+	{ CA_PROTECT,		"PROTECT",		_("Allowed to use PROTECT/DEPROTECT commands") },
+	{ CA_PROTECTME,		"PROTECTME",		_("Allowed to (de)protect him/herself"), },
+	{ CA_TOPIC,		"TOPIC",		_("Allowed to use TOPIC command") },
+	{ CA_MODE,		"MODE",			_("Allowed to use MODE command") },
+	{ CA_UNBAN,		"UNBAN",		_("Allowed to use UNBAN command") },
+	{ CA_VOICE,		"VOICE",		_("Allowed to use VOICE/DEVOICE commands") },
+	{ CA_VOICEME,		"VOICEME",		_("Allowed to (de)voice him/herself") },
+	{ CA_MEMO,		"MEMO",			_("Allowed to list/read channel memos") },
+	{ CA_ASSIGN,		"ASSIGN",		_("Allowed to assign/unassign a bot") },
+	{ CA_BADWORDS,		"BADWORDS",		_("Allowed to use BADWORDS command") },
+	{ CA_FANTASIA,		"FANTASIA",		_("Allowed to use fantaisist commands") },
+	{ CA_GREET,		"GREET",		_("Greet message displayed") },
+	{ CA_NOKICK,		"NOKICK",		_("Never kicked by the bot's kickers") },
+	{ CA_SAY,		"SAY",			_("Allowed to use SAY and ACT commands") },
+	{ CA_AUTOOWNER,		"AUTOOWNER",		_("Automatic mode +q") },
+	{ CA_OWNER,		"OWNER",		_("Allowed to use OWNER command") },
+	{ CA_OWNERME,		"OWNERME",		_("Allowed to (de)owner him/herself") },
+	{ CA_FOUNDER,		"FOUNDER",		_("Allowed to issue commands restricted to channel founders") },
 	{ -1 }
 };
 int levelinfo_maxwidth = 0;
@@ -301,7 +301,7 @@ int check_valid_admin(User *user, Channel *chan, int servermode)
 
 	if (servermode && !check_access(user, chan->ci, CA_AUTOPROTECT))
 	{
-		user->SendMessage(ChanServ, CHAN_IS_REGISTERED, Config->s_ChanServ.c_str());
+		user->SendMessage(ChanServ, _("This channel has been registered with %s."), Config->s_ChanServ.c_str());
 		chan->RemoveMode(NULL, CMODE_PROTECT, user->nick);
 		return 0;
 	}
@@ -331,7 +331,7 @@ int check_valid_op(User *user, Channel *chan, int servermode)
 
 	if (servermode && !check_access(user, chan->ci, CA_AUTOOP))
 	{
-		user->SendMessage(ChanServ, CHAN_IS_REGISTERED, Config->s_ChanServ.c_str());
+		user->SendMessage(ChanServ, _("This channel has been registered with %s."), Config->s_ChanServ.c_str());
 
 		if (owner)
 			chan->RemoveMode(NULL, CMODE_OWNER, user->nick);
diff --git a/src/command.cpp b/src/command.cpp
index 17de467e9..398f4249c 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -28,28 +28,6 @@ CommandSource::~CommandSource()
 	}
 }
 
-void CommandSource::Reply(LanguageString message, ...)
-{
-	Anope::string m = GetString(this->u, message);
-
-	m = m.replace_all_cs("%S", this->owner->nick);
-
-	if (m.length() >= 4096)
-		Log() << "Warning, language string " << message << " is longer than 4096 bytes";
-
-	va_list args;
-	char buf[4096];
-	va_start(args, message);
-	vsnprintf(buf, sizeof(buf) - 1, m.c_str(), args);
-	va_end(args);
-
-	sepstream sep(buf, '\n');
-	Anope::string line;
-
-	while (sep.GetToken(line))
-		this->Reply(line.empty() ? " " : line.c_str());
-}
-
 void CommandSource::Reply(const char *message, ...)
 {
 	va_list args;
@@ -60,12 +38,20 @@ void CommandSource::Reply(const char *message, ...)
 		va_start(args, message);
 		vsnprintf(buf, BUFSIZE - 1, message, args);
 
-		this->reply.push_back(buf);
+		this->Reply(Anope::string(buf));
 
 		va_end(args);
 	}
 }
 
+void CommandSource::Reply(const Anope::string &message)
+{
+	sepstream sep(message, '\n');
+	Anope::string tok;
+	while (sep.GetToken(tok))
+		this->reply.push_back(tok);
+}
+
 Command::Command(const Anope::string &sname, size_t min_params, size_t max_params, const Anope::string &spermission) : Flags<CommandFlag>(CommandFlagStrings), MaxParams(max_params), MinParams(min_params), name(sname), permission(spermission)
 {
 	this->module = NULL;
diff --git a/src/commands.cpp b/src/commands.cpp
index 4cfb1c636..e3a52a503 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -52,18 +52,22 @@ void mod_run_cmd(BotInfo *bi, User *u, Command *c, const Anope::string &command,
 {
 	if (!bi || !u)
 		return;
+	
+	PushLanguage("anope", u->Account() ? u->Account()->language : "");
 
 	if (!c)
 	{
-		u->SendMessage(bi, UNKNOWN_COMMAND_HELP, command.c_str(), bi->nick.c_str());
+		u->SendMessage(bi, _("Unknown command \002%s\002.  \"%R%s HELP\" for help."), command.c_str(), bi->nick.c_str());
+		PopLanguage();
 		return;
 	}
 
 	// Command requires registered users only
 	if (!c->HasFlag(CFLAG_ALLOW_UNREGISTERED) && !u->IsIdentified())
 	{
-		u->SendMessage(bi, NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
+		u->SendMessage(bi, _(LanguageString::NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
 		Log(LOG_COMMAND, "denied", bi) << "Access denied for unregistered user " << u->GetMask() << " with command " << command;
+		PopLanguage();
 		return;
 	}
 
@@ -98,27 +102,31 @@ void mod_run_cmd(BotInfo *bi, User *u, Command *c, const Anope::string &command,
 			{
 				if (ci->HasFlag(CI_FORBIDDEN) && !c->HasFlag(CFLAG_ALLOW_FORBIDDEN))
 				{
-					u->SendMessage(bi, CHAN_X_FORBIDDEN, ci->name.c_str());
+					u->SendMessage(bi, _(LanguageString::CHAN_X_FORBIDDEN), ci->name.c_str());
 					Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command << " because of FORBIDDEN channel " << ci->name;
+					PopLanguage();
 					return;
 				}
 				else if (ci->HasFlag(CI_SUSPENDED) && !c->HasFlag(CFLAG_ALLOW_SUSPENDED))
 				{
-					u->SendMessage(bi, CHAN_X_FORBIDDEN, ci->name.c_str());
+					u->SendMessage(bi, _(LanguageString::CHAN_X_FORBIDDEN), ci->name.c_str());
 					Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command << " because of SUSPENDED channel " << ci->name;
+					PopLanguage();
 					return;
 				}
 			}
 			else if (!c->HasFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL))
 			{
-				u->SendMessage(bi, CHAN_X_NOT_REGISTERED, params[0].c_str());
+				u->SendMessage(bi, _(LanguageString::CHAN_X_NOT_REGISTERED), params[0].c_str());
+				PopLanguage();
 				return;
 			}
 		}
 		/* A user not giving a channel name for a param that should be a channel */
 		else
 		{
-			u->SendMessage(bi, CHAN_X_INVALID, params[0].c_str());
+			u->SendMessage(bi, LanguageString::CHAN_X_INVALID, params[0].c_str());
+			PopLanguage();
 			return;
 		}
 	}
@@ -133,19 +141,24 @@ void mod_run_cmd(BotInfo *bi, User *u, Command *c, const Anope::string &command,
 	if (params.size() < c->MinParams)
 	{
 		c->OnSyntaxError(source, !params.empty() ? params[params.size() - 1] : "");
+		PopLanguage();
 		return;
 	}
 
 	EventReturn MOD_RESULT;
 	FOREACH_RESULT(I_OnPreCommand, OnPreCommand(source, c, params));
 	if (MOD_RESULT == EVENT_STOP)
+	{
+		PopLanguage();
 		return;
+	}
 
 	// If the command requires a permission, and they aren't registered or don't have the required perm, DENIED
 	if (!c->permission.empty() && !u->Account()->HasCommand(c->permission))
 	{
-		u->SendMessage(bi, ACCESS_DENIED);
+		u->SendMessage(bi, LanguageString::ACCESS_DENIED);
 		Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command;
+		PopLanguage();
 		return;
 	}
 
@@ -184,23 +197,23 @@ void mod_help_cmd(BotInfo *bi, User *u, ChannelInfo *ci, const Anope::string &cm
 	source.fantasy = ci != NULL;
 
 	if (!c || (Config->HidePrivilegedCommands && !c->permission.empty() && (!u->Account() || !u->Account()->HasCommand(c->permission))) || !c->OnHelp(source, subcommand))
-		u->SendMessage(bi, NO_HELP_AVAILABLE, cmd.c_str());
+		source.Reply( _("No help available for \002%s\002."), cmd.c_str());
 	else
 	{
 		u->SendMessage(bi, " ");
 
 		/* Inform the user what permission is required to use the command */
 		if (!c->permission.empty())
-			u->SendMessage(bi, COMMAND_REQUIRES_PERM, c->permission.c_str());
+			source.Reply(_("Access to this command requires the permission \002%s\002 to be present in your opertype."), c->permission.c_str());
 
 		/* User isn't identified and needs to be to use this command */
 		if (!c->HasFlag(CFLAG_ALLOW_UNREGISTERED) && !u->IsIdentified())
-			u->SendMessage(bi, COMMAND_IDENTIFY_REQUIRED);
+			source.Reply( _("You need to be identified to use this command."));
 		/* User doesn't have the proper permission to use this command */
 		else if (!c->permission.empty() && (!u->Account() || !u->Account()->HasCommand(c->permission)))
-			u->SendMessage(bi, COMMAND_CANNOT_USE);
+			source.Reply(_("You cannot use this command."));
 		/* User can use this command */
 		else
-			u->SendMessage(bi, COMMAND_CAN_USE);
+			source.Reply(_("You can use this command."));
 	}
 }
diff --git a/src/hostserv.cpp b/src/hostserv.cpp
index a3edce445..bfd68f17f 100644
--- a/src/hostserv.cpp
+++ b/src/hostserv.cpp
@@ -169,8 +169,8 @@ void do_on_id(User *u)
 		u->UpdateHost();
 
 		if (!na->hostinfo.GetIdent().empty())
-			u->SendMessage(HostServ, HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
+			u->SendMessage(HostServ, _("Your vhost of \002%s\002@\002%s\002 is now activated."), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
 		else
-			u->SendMessage(HostServ, HOST_ACTIVATED, na->hostinfo.GetHost().c_str());
+			u->SendMessage(HostServ, _("Your vhost of \002%s\002 is now activated."), na->hostinfo.GetHost().c_str());
 	}
 }
diff --git a/src/language.cpp b/src/language.cpp
index 2823cc117..7256ebbbf 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -1,11 +1,5 @@
 #include "services.h"
-
-#if GETTEXT_FOUND
-# include LIBINTL
-# define _(x) gettext(x)
-#else
-# define _(x) x
-#endif
+#include <stack>
 
 std::vector<Anope::string> languages;
 
@@ -38,50 +32,49 @@ void InitLanguages()
 #endif
 }
 
-const Anope::string GetString(const Anope::string &language, LanguageString string)
+const Anope::string GetString(NickCore *nc, const char *string)
 {
-	return GetString("anope", language, language_strings[string]);
+	return GetString("anope", nc ? nc->language : "", string);
 }
 
-const Anope::string GetString(LanguageString string)
+const Anope::string GetString(const Anope::string &domain, const Anope::string &lang, const char *string)
 {
-	return GetString("anope", "", language_strings[string]);
+	PushLanguage(domain, lang);
+	const char *t_string = anope_gettext(string);
+	PopLanguage();
+	return t_string;
 }
 
-const Anope::string GetString(NickCore *nc, LanguageString string)
+#if GETTEXT_FOUND
+static std::stack<std::pair<Anope::string, Anope::string > > language_stack;
+
+void PushLanguage(const Anope::string &domain, Anope::string language)
 {
-	return GetString(nc ? nc->language : "", string);
+	if (language.empty() && !Config->NSDefLanguage.empty())
+		language = Config->NSDefLanguage;
+	
+	language_stack.push(std::make_pair(domain, language));
 }
 
-const Anope::string GetString(User *u, LanguageString string)
+void PopLanguage()
 {
-	if (!u)
-		return GetString(string);
-	NickCore *nc = u->Account();
-	NickAlias *na = NULL;
-	if (!nc)
-		na = findnick(u->nick);
-	return GetString(nc ? nc : (na ? na->nc : NULL), string);
+	language_stack.pop();
 }
 
-#if GETTEXT_FOUND
 /* Used by gettext to make it always dynamically load language strings (so we can drop them in while Anope is running) */
 extern "C" int _nl_msg_cat_cntr;
-const Anope::string GetString(const char *domain, Anope::string language, const Anope::string &string)
-{
-	if (language == "en")
-		language.clear();
 
-	/* Apply def language */
-	if (language.empty() && !Config->NSDefLanguage.empty())
-		language = Config->NSDefLanguage;
-
-	if (language.empty())
+const char *anope_gettext(const char *string)
+{
+	std::pair<Anope::string, Anope::string> lang_info;
+	if (!language_stack.empty())
+		lang_info = language_stack.top();
+	if (lang_info.first.empty() || lang_info.second.empty())
 		return string;
 
 	++_nl_msg_cat_cntr;
 #ifdef _WIN32
-	SetThreadLocale(MAKELCID(MAKELANGID(WindowsGetLanguage(language.c_str()), SUBLANG_DEFAULT), SORT_DEFAULT));
+	SetThreadLocale(MAKELCID(MAKELANGID(WindowsGetLanguage(lang_info.second.c_str()), SUBLANG_DEFAULT), SORT_DEFAULT));
 #else
 	/* First, set LANGUAGE env variable.
 	 * Some systems (Debian) don't care about this, so we must setlocale LC_ALL aswell.
@@ -90,11 +83,11 @@ const Anope::string GetString(const char *domain, Anope::string language, const
 	 * use the LANGUAGE env variable. We must reset the locale to en_US (or, anything not
 	 * C or POSIX) then.
 	 */
-	setenv("LANGUAGE", language.c_str(), 1);
-	if (setlocale(LC_ALL, language.c_str()) == NULL)
+	setenv("LANGUAGE", lang_info.second.c_str(), 1);
+	if (setlocale(LC_ALL, lang_info.second.c_str()) == NULL)
 		setlocale(LC_ALL, "en_US");
 #endif
-	const char *ret = dgettext(domain, string.c_str());
+	const char *translated_string = dgettext(lang_info.first.c_str(), string);
 #ifdef _WIN32
 	SetThreadLocale(MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), SORT_DEFAULT));
 #else
@@ -102,5198 +95,38 @@ const Anope::string GetString(const char *domain, Anope::string language, const
 	setlocale(LC_ALL, "");
 #endif
 
-	Anope::string translated = ret ? ret : "";
+	Anope::string translated = translated_string ? translated_string : "";
 
 	if (Config->UseStrictPrivMsg)
 		translated = translated.replace_all_cs("%R", "/");
 	else
 		translated = translated.replace_all_cs("%R", "/msg ");
 	
-	return translated;
+	return translated.c_str();
 }
 #else
-const Anope::string GetString(const char *domain, Anope::string language, const Anope::string &string)
+void PushLanguage(const Anope::string &, Anope::string)
 {
-	Anope::string translated = string;
+}
+
+void PopLanguage()
+{
+}
+
+const char *anope_gettext(const char *string)
+{
+	Anope::string translated = string ? string : "";
 	if (Config->UseStrictPrivMsg)
 		translated = translated.replace_all_cs("%R", "/");
 	else
 		translated = translated.replace_all_cs("%R", "/msg ");
-	return translated;
+	return translated.c_str();
 }
 #endif
 
-void SyntaxError(CommandSource &source, const Anope::string &command, LanguageString message)
+void SyntaxError(CommandSource &source, const Anope::string &command, const Anope::string &message)
 {
-	if (command.empty())
-		return;
-
-	Anope::string str = GetString(source.u, message);
-	source.Reply(SYNTAX_ERROR, str.c_str());
-	source.Reply(MORE_INFO, source.owner->nick.c_str(), command.c_str());
+	source.Reply(_("Syntax: \002%s\002"), message.c_str());
+	source.Reply(_(LanguageString::MORE_INFO), source.owner->nick.c_str(), command.c_str());
 }
 
-const char *const language_strings[LANG_STRING_COUNT] = {
-	/* LANGUAGE_NAME */
-	_("English"),
-	/* COMMAND_REQUIRES_PERM */
-	_("Access to this command requires the permission %s to be present in your opertype."),
-	/* COMMAND_IDENTIFY_REQUIRED */
-	_("You need to be identified to use this command."),
-	/* COMMAND_CANNOT_USE */
-	_("You cannot use this command."),
-	/* COMMAND_CAN_USE */
-	_("You can use this command."),
-	/* COMMAND_DEPRECATED */
-	_("This command is deprecated, use \"%R%s MODE\" instead."),
-	/* USER_RECORD_NOT_FOUND */
-	_("Internal error - unable to process request."),
-	/* UNKNOWN_COMMAND */
-	_("Unknown command %s."),
-	/* UNKNOWN_COMMAND_HELP */
-	_("Unknown command %s.  \"%R%s HELP\" for help."),
-	/* SYNTAX_ERROR */
-	_("Syntax: %s"),
-	/* MORE_INFO */
-	_("%R%s HELP %s for more information."),
-	/* NO_HELP_AVAILABLE */
-	_("No help available for %s."),
-	/* BAD_USERHOST_MASK */
-	_("Mask must be in the form user@host."),
-	/* BAD_EXPIRY_TIME */
-	_("Invalid expiry time."),
-	/* USERHOST_MASK_TOO_WIDE */
-	_("%s coverage is too wide; Please use a more specific mask."),
-	/* SERVICE_OFFLINE */
-	_("%s is currently offline."),
-	/* READ_ONLY_MODE */
-	_("Notice: Services is in read-only mode; changes will not be saved!"),
-	/* PASSWORD_INCORRECT */
-	_("Password incorrect."),
-	/* INVALID_TARGET */
-	_("\"/msg %s\" is no longer supported. Use \"/msg %s@%s\" or \"/%s\" instead."),
-	/* ACCESS_DENIED */
-	_("Access denied."),
-	/* MORE_OBSCURE_PASSWORD */
-	_("Please try again with a more obscure password. Passwords should be at least five characters long, should not be something easily guessed (e.g. your real name or your nick), and cannot contain the space or tab characters."),
-	/* PASSWORD_TOO_LONG */
-	_("Your password is too long. Please try again with a shorter password."),
-	/* NICK_NOT_REGISTERED */
-	_("Your nick isn't registered."),
-	/* NICK_X_IS_SERVICES */
-	_("Nick %s is part of this Network's Services."),
-	/* NICK_X_NOT_REGISTERED */
-	_("Nick %s isn't registered."),
-	/* NICK_X_IN_USE */
-	_("Nick %s is currently in use."),
-	/* NICK_X_NOT_IN_USE */
-	_("Nick %s isn't currently in use."),
-	/* NICK_X_NOT_ON_CHAN */
-	_("%s is not currently on channel %s."),
-	/* NICK_X_FORBIDDEN */
-	_("Nick %s may not be registered or used."),
-	/* NICK_X_FORBIDDEN_OPER */
-	_("Nick %s has been forbidden by %s:\n"
-	"%s"),
-	/* NICK_X_ILLEGAL */
-	_("Nick %s is an illegal nickname and cannot be used."),
-	/* NICK_X_TRUNCATED */
-	_("Nick %s was truncated to %d characters."),
-	/* NICK_X_SUSPENDED */
-	_("Nick %s is currently suspended."),
-	/* CHAN_X_NOT_REGISTERED */
-	_("Channel %s isn't registered."),
-	/* CHAN_X_NOT_IN_USE */
-	_("Channel %s doesn't exist."),
-	/* CHAN_X_FORBIDDEN */
-	_("Channel %s may not be registered or used."),
-	/* CHAN_X_FORBIDDEN_OPER */
-	_("Channel %s has been forbidden by %s:\n"
-	"%s"),
-	/* CHAN_X_SUSPENDED */
-	_("      Suspended: [%s] %s"),
-	/* NICK_IDENTIFY_REQUIRED */
-	_("Password authentication required for that command.\n"
-	"Retry after typing %R%s IDENTIFY password."),
-	/* MAIL_DISABLED */
-	_("Services have been configured to not send mail."),
-	/* MAIL_INVALID */
-	_("E-mail for %s is invalid."),
-	/* MAIL_X_INVALID */
-	_("%s is not a valid e-mail address."),
-	/* MAIL_LATER */
-	_("Cannot send mail now; please retry a little later."),
-	/* MAIL_DELAYED */
-	_("Please wait %d seconds and retry."),
-	/* NO_REASON */
-	_("No reason"),
-	/* UNKNOWN */
-	_("<unknown>"),
-	/* DURATION_DAY */
-	_("1 day"),
-	/* DURATION_DAYS */
-	_("%d days"),
-	/* DURATION_HOUR */
-	_("1 hour"),
-	/* DURATION_HOURS */
-	_("%d hours"),
-	/* DURATION_MINUTE */
-	_("1 minute"),
-	/* DURATION_MINUTES */
-	_("%d minutes"),
-	/* DURATION_SECOND */
-	_("1 second"),
-	/* DURATION_SECONDS */
-	_("%d seconds"),
-	/* NO_EXPIRE */
-	_("does not expire"),
-	/* EXPIRES_SOON */
-	_("expires at next database update"),
-	/* EXPIRES_M */
-	_("expires in %d minutes"),
-	/* EXPIRES_1M */
-	_("expires in %d minute"),
-	/* EXPIRES_HM */
-	_("expires in %d hours, %d minutes"),
-	/* EXPIRES_H1M */
-	_("expires in %d hours, %d minute"),
-	/* EXPIRES_1HM */
-	_("expires in %d hour, %d minutes"),
-	/* EXPIRES_1H1M */
-	_("expires in %d hour, %d minute"),
-	/* EXPIRES_D */
-	_("expires in %d days"),
-	/* EXPIRES_1D */
-	_("expires in %d day"),
-	/* END_OF_ANY_LIST */
-	_("End of %s list."),
-	/* LIST_INCORRECT_RANGE */
-	_("Incorrect range specified. The correct syntax is #from-to."),
-	/* CS_LIST_INCORRECT_RANGE */
-	_("To search for channels starting with #, search for the channel\n"
-	"name without the #-sign prepended (anope instead of #anope)."),
-	/* NICK_IS_REGISTERED */
-	_("This nick is owned by someone else.  Please choose another.\n"
-	"(If this is your nick, type %R%s IDENTIFY password.)"),
-	/* NICK_IS_SECURE */
-	_("This nickname is registered and protected.  If it is your\n"
-	"nick, type %R%s IDENTIFY password.  Otherwise,\n"
-	"please choose a different nick."),
-	/* NICK_MAY_NOT_BE_USED */
-	_("This nickname may not be used.  Please choose another one."),
-	/* FORCENICKCHANGE_IN_1_MINUTE */
-	_("If you do not change within one minute, I will change your nick."),
-	/* FORCENICKCHANGE_IN_20_SECONDS */
-	_("If you do not change within 20 seconds, I will change your nick."),
-	/* FORCENICKCHANGE_NOW */
-	_("This nickname has been registered; you may not use it."),
-	/* FORCENICKCHANGE_CHANGING */
-	_("Your nickname is now being changed to %s"),
-	/* NICK_REGISTER_SYNTAX */
-	_("REGISTER password [email]"),
-	/* NICK_REGISTER_SYNTAX_EMAIL */
-	_("REGISTER password email"),
-	/* NICK_REGISTRATION_DISABLED */
-	_("Sorry, nickname registration is temporarily disabled."),
-	/* NICK_REGISTRATION_FAILED */
-	_("Sorry, registration failed."),
-	/* NICK_REG_PLEASE_WAIT */
-	_("Please wait %d seconds before using the REGISTER command again."),
-	/* NICK_CANNOT_BE_REGISTERED */
-	_("Nickname %s may not be registered."),
-	/* NICK_ALREADY_REGISTERED */
-	_("Nickname %s is already registered!"),
-	/* NICK_REGISTERED */
-	_("Nickname %s registered under your account: %s"),
-	/* NICK_REGISTERED_NO_MASK */
-	_("Nickname %s registered."),
-	/* NICK_PASSWORD_IS */
-	_("Your password is %s - remember this for later use."),
-	/* NICK_REG_DELAY */
-	_("You must have been using this nick for at least %d seconds to register."),
-	/* NICK_GROUP_SYNTAX */
-	_("GROUP target password"),
-	/* NICK_GROUP_DISABLED */
-	_("Sorry, nickname grouping is temporarily disabled."),
-	/* NICK_GROUP_PLEASE_WAIT */
-	_("Please wait %d seconds before using the GROUP command again."),
-	/* NICK_GROUP_CHANGE_DISABLED */
-	_("Your nick is already registered; type \002%R%s DROP\002 first."),
-	/* NICK_GROUP_SAME */
-	_("You are already a member of the group of %s."),
-	/* NICK_GROUP_TOO_MANY */
-	_("There are too many nicks in %s's group; list them and drop some.\n"
-	"Type %R%s HELP GLIST and %R%s HELP DROP\n"
-	"for more information."),
-	/* NICK_GROUP_JOINED */
-	_("You are now in the group of %s."),
-	/* NICK_UNGROUP_ONE_NICK */
-	_("Your nick is not grouped to anything, you can't ungroup it."),
-	/* NICK_UNGROUP_NOT_IN_GROUP */
-	_("The nick %s is not in your group."),
-	/* NICK_UNGROUP_SUCCESSFUL */
-	_("Nick %s has been ungrouped from %s."),
-	/* NICK_IDENTIFY_SYNTAX */
-	_("IDENTIFY [account] password"),
-	/* NICK_IDENTIFY_FAILED */
-	_("Sorry, identification failed."),
-	/* NICK_IDENTIFY_SUCCEEDED */
-	_("Password accepted - you are now recognized."),
-	/* NICK_IDENTIFY_EMAIL_REQUIRED */
-	_("You must now supply an e-mail for your nick.\n"
-	"This e-mail will allow you to retrieve your password in\n"
-	"case you forget it."),
-	/* NICK_IDENTIFY_EMAIL_HOWTO */
-	_("Type %R%S SET EMAIL e-mail in order to set your e-mail.\n"
-	"Your privacy is respected; this e-mail won't be given to\n"
-	"any third-party person."),
-	/* NICK_ALREADY_IDENTIFIED */
-	_("You are already identified."),
-	/* NICK_UPDATE_SUCCESS */
-	_("Status updated (memos, vhost, chmodes, flags)."),
-	/* NICK_LOGOUT_SYNTAX */
-	_("LOGOUT"),
-	/* NICK_LOGOUT_SUCCEEDED */
-	_("Your nick has been logged out."),
-	/* NICK_LOGOUT_X_SUCCEEDED */
-	_("Nick %s has been logged out."),
-	/* NICK_LOGOUT_SERVICESADMIN */
-	_("Can't logout %s because he's a Services Operator."),
-	/* NICK_DROP_DISABLED */
-	_("Sorry, nickname de-registration is temporarily disabled."),
-	/* NICK_DROPPED */
-	_("Your nickname has been dropped."),
-	/* NICK_X_DROPPED */
-	_("Nickname %s has been dropped."),
-	/* NICK_SET_SYNTAX */
-	_("SET option parameters"),
-	/* NICK_SET_DISABLED */
-	_("Sorry, nickname option setting is temporarily disabled."),
-	/* NICK_SET_UNKNOWN_OPTION */
-	_("Unknown SET option %s."),
-	/* NICK_SET_OPTION_DISABLED */
-	_("Option %s cannot be set on this network."),
-	/* NICK_SET_DISPLAY_CHANGED */
-	_("The new display is now %s."),
-	/* NICK_SET_LANGUAGE_SYNTAX */
-	_("SET LANGUAGE language"),
-	/* NICK_SET_LANGUAGE_CHANGED */
-	_("Language changed to English."),
-	/* NICK_SET_EMAIL_UNSET */
-	_("E-mail address unset."),
-	/* NICK_SET_EMAIL_UNSET_IMPOSSIBLE */
-	_("You cannot unset the e-mail on this network."),
-	/* NICK_SET_KILL_SYNTAX */
-	_("SET KILL {ON | QUICK | OFF}"),
-	/* NICK_SET_KILL_IMMED_SYNTAX */
-	_("SET KILL {ON | QUICK | IMMED | OFF}"),
-	/* NICK_SET_KILL_IMMED */
-	_("Protection is now ON, with no delay."),
-	/* NICK_SET_KILL_IMMED_DISABLED */
-	_("The IMMED option is not available on this network."),
-	/* NICK_SET_SECURE_SYNTAX */
-	_("SET SECURE {ON | OFF}"),
-	/* NICK_SET_PRIVATE_SYNTAX */
-	_("SET PRIVATE {ON | OFF}"),
-	/* NICK_SET_HIDE_SYNTAX */
-	_("SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"),
-	/* NICK_SET_MSG_SYNTAX */
-	_("SET MSG {ON | OFF}"),
-	/* NICK_SET_AUTOOP_SYNTAX */
-	_("SET AUTOOP {ON | OFF}"),
-	/* NICK_SASET_SYNTAX */
-	_("SASET nickname option parameters"),
-	/* NICK_SASET_UNKNOWN_OPTION */
-	_("Unknown SASET option %s."),
-	/* NICK_SASET_BAD_NICK */
-	_("Nickname %s not registered."),
-	/* NICK_SASET_DISPLAY_INVALID */
-	_("The new display for %s MUST be a nickname of the nickname group!"),
-	/* NICK_SASET_PASSWORD_FAILED */
-	_("Sorry, couldn't change password for %s."),
-	/* NICK_SASET_PASSWORD_CHANGED */
-	_("Password for %s changed."),
-	/* NICK_SASET_PASSWORD_CHANGED_TO */
-	_("Password for %s changed to %s."),
-	/* NICK_SASET_EMAIL_CHANGED */
-	_("E-mail address for %s changed to %s."),
-	/* NICK_SASET_EMAIL_UNSET */
-	_("E-mail address for %s unset."),
-	/* NICK_SASET_GREET_CHANGED */
-	_("Greet message for %s changed to %s."),
-	/* NICK_SASET_GREET_UNSET */
-	_("Greet message for %s unset."),
-	/* NICK_SASET_KILL_SYNTAX */
-	_("SASET nickname KILL {ON | QUICK | OFF}"),
-	/* NICK_SASET_KILL_IMMED_SYNTAX */
-	_("SASET nickname KILL {ON | QUICK | IMMED | OFF}"),
-	/* NICK_SASET_KILL_ON */
-	_("Protection is now ON for %s."),
-	/* NICK_SASET_KILL_QUICK */
-	_("Protection is now ON for %s, with a reduced delay."),
-	/* NICK_SASET_KILL_IMMED */
-	_("Protection is now ON for %s, with no delay."),
-	/* NICK_SASET_KILL_OFF */
-	_("Protection is now OFF for %s."),
-	/* NICK_SASET_SECURE_SYNTAX */
-	_("SASET nickname SECURE {ON | OFF}"),
-	/* NICK_SASET_SECURE_ON */
-	_("Secure option is now ON for %s."),
-	/* NICK_SASET_SECURE_OFF */
-	_("Secure option is now OFF for %s."),
-	/* NICK_SASET_PRIVATE_SYNTAX */
-	_("SASET nickname PRIVATE {ON | OFF}"),
-	/* NICK_SASET_PRIVATE_ON */
-	_("Private option is now ON for %s."),
-	/* NICK_SASET_PRIVATE_OFF */
-	_("Private option is now OFF for %s."),
-	/* NICK_SASET_HIDE_SYNTAX */
-	_("SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"),
-	/* NICK_SASET_HIDE_EMAIL_ON */
-	_("The E-mail address of %s will now be hidden from %s INFO displays."),
-	/* NICK_SASET_HIDE_EMAIL_OFF */
-	_("The E-mail address of %s will now be shown in %s INFO displays."),
-	/* NICK_SASET_HIDE_MASK_ON */
-	_("The last seen user@host mask of %s will now be hidden from %s INFO displays."),
-	/* NICK_SASET_HIDE_MASK_OFF */
-	_("The last seen user@host mask of %s will now be shown in %s INFO displays."),
-	/* NICK_SASET_HIDE_QUIT_ON */
-	_("The last quit message of %s will now be hidden from %s INFO displays."),
-	/* NICK_SASET_HIDE_QUIT_OFF */
-	_("The last quit message of %s will now be shown in %s INFO displays."),
-	/* NICK_SASET_HIDE_STATUS_ON */
-	_("The services access status of %s will now be hidden from %s INFO displays."),
-	/* NICK_SASET_HIDE_STATUS_OFF */
-	_("The services access status of %s will now be shown in %s INFO displays."),
-	/* NICK_SASET_MSG_SYNTAX */
-	_("SASAET nickname PRIVATE {ON | OFF}"),
-	/* NICK_SASET_MSG_ON */
-	_("Services will now reply to %s with messages."),
-	/* NICK_SASET_MSG_OFF */
-	_("Services will now reply to %s with notices."),
-	/* NICK_SASET_NOEXPIRE_SYNTAX */
-	_("SASET nickname NOEXPIRE {ON | OFF}"),
-	/* NICK_SASET_NOEXPIRE_ON */
-	_("Nick %s will not expire."),
-	/* NICK_SASET_NOEXPIRE_OFF */
-	_("Nick %s will expire."),
-	/* NICK_SASET_AUTOOP_SYNTAX */
-	_("SASET nickname AUTOOP {ON | OFF}"),
-	/* NICK_SASET_AUTOOP_ON */
-	_("Services will now autoop %s in channels."),
-	/* NICK_SASET_AUTOOP_OFF */
-	_("Services will no longer autoop %s in channels."),
-	/* NICK_SASET_LANGUAGE_SYNTAX */
-	_("SASET nickname LANGUAGE number"),
-	/* NICK_ACCESS_SYNTAX */
-	_("ACCESS {ADD | DEL | LIST} [mask]"),
-	/* NICK_ACCESS_ALREADY_PRESENT */
-	_("Mask %s already present on your access list."),
-	/* NICK_ACCESS_REACHED_LIMIT */
-	_("Sorry, you can only have %d access entries for a nickname."),
-	/* NICK_ACCESS_ADDED */
-	_("%s added to your access list."),
-	/* NICK_ACCESS_NOT_FOUND */
-	_("%s not found on your access list."),
-	/* NICK_ACCESS_DELETED */
-	_("%s deleted from your access list."),
-	/* NICK_ACCESS_LIST */
-	_("Access list:"),
-	/* NICK_ACCESS_LIST_X */
-	_("Access list for %s:"),
-	/* NICK_ACCESS_LIST_EMPTY */
-	_("Your access list is empty."),
-	/* NICK_ACCESS_LIST_X_EMPTY */
-	_("Access list for %s is empty."),
-	/* NICK_AJOIN_SYNTAX */
-	_("AJOIN {ADD | DEL | LIST} [\037channel\037] [\037key\037]"),
-	/* NICK_AJOIN_LIST_EMPTY */
-	_("Your auto join list is empty."),
-	/* NICK_AJOIN_LIST_HEAD */
-	_("Your auto join list:\n"
-	"  Num   Channel      Key"),
-	/* NICK_AJOIN_LIST_FULL */
-	_("Your auto join list is full."),
-	/* NICK_AJOIN_ADDED */
-	_("Added %s to your auto join list."),
-	/* NICK_AJOIN_NOTFOUND */
-	_("%s was not found on your auto join list."),
-	/* NICK_AJOIN_DELETED */
-	_("%s was removed from your auto join list."),
-	/* NICK_STATUS_REPLY */
-	_("STATUS %s %d %s"),
-	/* NICK_INFO_SYNTAX */
-	_("INFO nick"),
-	/* NICK_INFO_REALNAME */
-	_("%s is %s"),
-	/* NICK_INFO_SERVICES_OPERTYPE */
-	_("%s is a services operator of type %s."),
-	/* NICK_INFO_ADDRESS */
-	_("Last seen address: %s"),
-	/* NICK_INFO_ADDRESS_ONLINE */
-	_("   Is online from: %s"),
-	/* NICK_INFO_ADDRESS_ONLINE_NOHOST */
-	_("%s is currently online."),
-	/* NICK_INFO_TIME_REGGED */
-	_("  Time registered: %s"),
-	/* NICK_INFO_LAST_SEEN */
-	_("   Last seen time: %s"),
-	/* NICK_INFO_LAST_QUIT */
-	_("Last quit message: %s"),
-	/* NICK_INFO_EMAIL */
-	_("   E-mail address: %s"),
-	/* NICK_INFO_VHOST */
-	_("            vhost: %s"),
-	/* NICK_INFO_VHOST2 */
-	_("            vhost: %s@%s"),
-	/* NICK_INFO_GREET */
-	_("    Greet message: %s"),
-	/* NICK_INFO_OPTIONS */
-	_("          Options: %s"),
-	/* NICK_INFO_EXPIRE */
-	_("Expires on: %s"),
-	/* NICK_INFO_OPT_KILL */
-	_("Protection"),
-	/* NICK_INFO_OPT_SECURE */
-	_("Security"),
-	/* NICK_INFO_OPT_PRIVATE */
-	_("Private"),
-	/* NICK_INFO_OPT_MSG */
-	_("Message mode"),
-	/* NICK_INFO_OPT_AUTOOP */
-	_("Auto-op"),
-	/* NICK_INFO_OPT_NONE */
-	_("None"),
-	/* NICK_INFO_NO_EXPIRE */
-	_("This nickname will not expire."),
-	/* NICK_INFO_SUSPENDED */
-	_("This nickname is currently suspended, reason: %s"),
-	/* NICK_INFO_SUSPENDED_NO_REASON */
-	_("This nickname is currently suspended"),
-	/* NICK_LIST_SYNTAX */
-	_("LIST pattern"),
-	/* NICK_LIST_SERVADMIN_SYNTAX */
-	_("LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"),
-	/* NICK_LIST_HEADER */
-	_("List of entries matching %s:"),
-	/* NICK_LIST_RESULTS */
-	_("End of list - %d/%d matches shown."),
-	/* NICK_ALIST_HEADER */
-	_("Channels that you have access on:\n"
-	"  Num  Channel              Level    Description"),
-	/* NICK_ALIST_HEADER_X */
-	_("Channels that %s has access on:\n"
-	"  Num  Channel              Level    Description"),
-	/* NICK_ALIST_XOP_FORMAT */
-	_("  %3d %c%-20s %-8s %s"),
-	/* NICK_ALIST_ACCESS_FORMAT */
-	_("  %3d %c%-20s %-8d %s"),
-	/* NICK_ALIST_FOOTER */
-	_("End of list - %d/%d channels shown."),
-	/* NICK_GLIST_HEADER */
-	_("List of nicknames in your group:"),
-	/* NICK_GLIST_HEADER_X */
-	_("List of nicknames in the group of %s:"),
-	/* NICK_GLIST_FOOTER */
-	_("%d nicknames in the group."),
-	/* NICK_GLIST_REPLY */
-	_("   %s (expires in %s)"),
-	/* NICK_GLIST_REPLY_NOEXPIRE */
-	_("   %s (does not expire)"),
-	/* NICK_RECOVER_SYNTAX */
-	_("RECOVER nickname [password]"),
-	/* NICK_NO_RECOVER_SELF */
-	_("You can't recover yourself!"),
-	/* NICK_RECOVERED */
-	_("User claiming your nick has been killed.\n"
-	"%R%s RELEASE %s to get it back before %s timeout."),
-	/* NICK_RELEASE_SYNTAX */
-	_("RELEASE nickname [password]"),
-	/* NICK_RELEASE_NOT_HELD */
-	_("Nick %s isn't being held."),
-	/* NICK_RELEASED */
-	_("Services' hold on your nick has been released."),
-	/* NICK_GHOST_SYNTAX */
-	_("GHOST nickname [password]"),
-	/* NICK_NO_GHOST_SELF */
-	_("You can't ghost yourself!"),
-	/* NICK_GHOST_KILLED */
-	_("Ghost with your nick has been killed."),
-	/* NICK_GHOST_UNIDENTIFIED */
-	_("You may not ghost an unidentified user, use RECOVER instead."),
-	/* NICK_GETPASS_SYNTAX */
-	_("GETPASS nickname"),
-	/* NICK_GETPASS_UNAVAILABLE */
-	_("GETPASS command unavailable because encryption is in use."),
-	/* NICK_GETPASS_PASSWORD_IS */
-	_("Password for %s is %s."),
-	/* NICK_GETEMAIL_SYNTAX */
-	_("GETEMAIL user@email-host No WildCards!!"),
-	/* NICK_GETEMAIL_EMAILS_ARE */
-	_("Emails Match %s to %s."),
-	/* NICK_GETEMAIL_NOT_USED */
-	_("No Emails listed for %s."),
-	/* NICK_SENDPASS_SYNTAX */
-	_("SENDPASS nickname"),
-	/* NICK_SENDPASS_UNAVAILABLE */
-	_("SENDPASS command unavailable because encryption is in use."),
-	/* NICK_SENDPASS_SUBJECT */
-	_("Nickname password (%s)"),
-	/* NICK_SENDPASS */
-	_("Hi,\n"
-	" \n"
-	"You have requested to receive the password of nickname %s by e-mail.\n"
-	"The password is %s. For security purposes, you should change it as soon as you receive this mail.\n"
-	" \n"
-	"If you don't know why this mail was sent to you, please ignore it silently.\n"
-	" \n"
-	"%s administrators."),
-	/* NICK_SENDPASS_OK */
-	_("Password of %s has been sent."),
-	/* NICK_RESETPASS_SYNTAX */
-	_("RESETPASS nickname"),
-	/* NICK_RESETPASS_SUBJECT */
-	_("Reset password request for %s"),
-	/* NICK_RESETPASS_MESSAGE */
-	_("Hi,\n"
-	" \n"
-	"You have requested to have the password for %s reset.\n"
-	"To reset your password, type %R%s CONFIRM %s\n"
-	" \n"
-	"If you don't know why this mail was sent to you, please ignore it silently.\n"
-	" \n"
-	"%s administrators."),
-	/* NICK_RESETPASS_COMPLETE */
-	_("Password reset email for %s has been sent."),
-	/* NICK_SUSPEND_SYNTAX */
-	_("SUSPEND nickname reason"),
-	/* NICK_SUSPEND_SUCCEEDED */
-	_("Nick %s is now suspended."),
-	/* NICK_UNSUSPEND_SYNTAX */
-	_("UNSUSPEND nickname"),
-	/* NICK_UNSUSPEND_SUCCEEDED */
-	_("Nick %s is now released."),
-	/* NICK_FORBID_SYNTAX */
-	_("FORBID nickname [reason]"),
-	/* NICK_FORBID_SYNTAX_REASON */
-	_("FORBID nickname reason"),
-	/* NICK_FORBID_SUCCEEDED */
-	_("Nick %s is now forbidden."),
-	/* NICK_REQUESTED */
-	_("This nick has already been requested, please check your e-mail address for the pass code"),
-	/* NICK_REG_RESENT */
-	_("Your passcode has been re-sent to %s."),
-	/* NICK_REG_UNABLE */
-	_("Nick NOT registered, please try again later."),
-	/* NICK_IS_PREREG */
-	_("This nick is awaiting an e-mail verification code before completing registration."),
-	/* NICK_ENTER_REG_CODE */
-	_("A passcode has been sent to %s, please type %R%s confirm <passcode> to complete registration.\n"
-	  "If you need to cancel your registration, use \"%R%s drop <password>\"."),
-	/* NICK_GETPASS_PASSCODE_IS */
-	_("Passcode for %s is %s."),
-	/* NICK_FORCE_REG */
-	_("Nickname %s confirmed"),
-	/* NICK_REG_MAIL_SUBJECT */
-	_("Nickname Registration (%s)"),
-	/* NICK_REG_MAIL */
-	_("Hi,\n"
-	" \n"
-	"You have requested to register the nickname %s on %s.\n"
-	"Please type \" %R%s confirm %s \" to complete registration.\n"
-	" \n"
-	"If you don't know why this mail was sent to you, please ignore it silently.\n"
-	" \n"
-	"%s administrators."),
-	/* NICK_CONFIRM_NOT_FOUND */
-	_("Registration step 1 may have expired, please use \"%R%s register <password> <email>\" first."),
-	/* NICK_CONFIRM_INVALID */
-	_("Invalid passcode has been entered, please check the e-mail again, and retry"),
-	/* NICK_CONFIRM_EXPIRED */
-	_("Your password reset request has expired."),
-	/* NICK_CONFIRM_SUCCESS */
-	_("You are now identified for your nick. Change your password using \"%R%s SET PASSWORD newpassword\" now."),
-	/* CHAN_LEVEL_AUTOOP */
-	_("Automatic channel operator status"),
-	/* CHAN_LEVEL_AUTOVOICE */
-	_("Automatic mode +v"),
-	/* CHAN_LEVEL_AUTOHALFOP */
-	_("Automatic mode +h"),
-	/* CHAN_LEVEL_AUTOPROTECT */
-	_("Automatic mode +a"),
-	/* CHAN_LEVEL_NOJOIN */
-	_("Not allowed to join channel"),
-	/* CHAN_LEVEL_INVITE */
-	_("Allowed to use INVITE command"),
-	/* CHAN_LEVEL_AKICK */
-	_("Allowed to use AKICK command"),
-	/* CHAN_LEVEL_SET */
-	_("Allowed to use SET command (not FOUNDER/PASSWORD)"),
-	/* CHAN_LEVEL_CLEARUSERS */
-	_("Allowed to use CLEARUSERS command"),
-	/* CHAN_LEVEL_UNBAN */
-	_("Allowed to use UNBAN command"),
-	/* CHAN_LEVEL_OPDEOP */
-	_("Allowed to use OP/DEOP commands"),
-	/* CHAN_LEVEL_ACCESS_LIST */
-	_("Allowed to view the access list"),
-	/* CHAN_LEVEL_ACCESS_CHANGE */
-	_("Allowed to modify the access list"),
-	/* CHAN_LEVEL_MEMO */
-	_("Allowed to list/read channel memos"),
-	/* CHAN_LEVEL_ASSIGN */
-	_("Allowed to assign/unassign a bot"),
-	/* CHAN_LEVEL_BADWORDS */
-	_("Allowed to use BADWORDS command"),
-	/* CHAN_LEVEL_NOKICK */
-	_("Never kicked by the bot's kickers"),
-	/* CHAN_LEVEL_FANTASIA */
-	_("Allowed to use fantaisist commands"),
-	/* CHAN_LEVEL_SAY */
-	_("Allowed to use SAY and ACT commands"),
-	/* CHAN_LEVEL_GREET */
-	_("Greet message displayed"),
-	/* CHAN_LEVEL_VOICEME */
-	_("Allowed to (de)voice him/herself"),
-	/* CHAN_LEVEL_VOICE */
-	_("Allowed to use VOICE/DEVOICE commands"),
-	/* CHAN_LEVEL_GETKEY */
-	_("Allowed to use GETKEY command"),
-	/* CHAN_LEVEL_OPDEOPME */
-	_("Allowed to (de)op him/herself"),
-	/* CHAN_LEVEL_HALFOPME */
-	_("Allowed to (de)halfop him/herself"),
-	/* CHAN_LEVEL_HALFOP */
-	_("Allowed to use HALFOP/DEHALFOP commands"),
-	/* CHAN_LEVEL_PROTECTME */
-	_("Allowed to (de)protect him/herself"),
-	/* CHAN_LEVEL_PROTECT */
-	_("Allowed to use PROTECT/DEPROTECT commands"),
-	/* CHAN_LEVEL_KICKME */
-	_("Allowed to kick him/herself"),
-	/* CHAN_LEVEL_KICK */
-	_("Allowed to use KICK command"),
-	/* CHAN_LEVEL_SIGNKICK */
-	_("No signed kick when SIGNKICK LEVEL is used"),
-	/* CHAN_LEVEL_BANME */
-	_("Allowed to ban him/herself"),
-	/* CHAN_LEVEL_BAN */
-	_("Allowed to use BAN command"),
-	/* CHAN_LEVEL_TOPIC */
-	_("Allowed to use TOPIC command"),
-	/* CHAN_LEVEL_MODE */
-	_("Allowed to use MODE command"),
-	/* CHAN_LEVEL_INFO */
-	_("Allowed to use INFO command with ALL option"),
-	/* CHAN_LEVEL_AUTOOWNER */
-	_("Automatic mode +q"),
-	/* CHAN_LEVEL_OWNER */
-	_("Allowed to use OWNER command"),
-	/* CHAN_LEVEL_OWNERME */
-	_("Allowed to (de)owner him/herself"),
-	/* CHAN_LEVEL_FOUNDER */
-	_("Allowed to issue commands restricted to channel founders"),
-	/* CHAN_IS_REGISTERED */
-	_("This channel has been registered with %s."),
-	/* CHAN_MAY_NOT_BE_USED */
-	_("This channel may not be used."),
-	/* CHAN_NOT_ALLOWED_TO_JOIN */
-	_("You are not permitted to be on this channel."),
-	/* CHAN_X_INVALID */
-	_("Channel %s is not a valid channel."),
-	/* CHAN_REGISTER_SYNTAX */
-	_("REGISTER channel description"),
-	/* CHAN_REGISTER_DISABLED */
-	_("Sorry, channel registration is temporarily disabled."),
-	/* CHAN_REGISTER_NOT_LOCAL */
-	_("Local channels cannot be registered."),
-	/* CHAN_MAY_NOT_BE_REGISTERED */
-	_("Channel %s may not be registered."),
-	/* CHAN_ALREADY_REGISTERED */
-	_("Channel %s is already registered!"),
-	/* CHAN_MUST_BE_CHANOP */
-	_("You must be a channel operator to register the channel."),
-	/* CHAN_REACHED_CHANNEL_LIMIT */
-	_("Sorry, you have already reached your limit of %d channels."),
-	/* CHAN_EXCEEDED_CHANNEL_LIMIT */
-	_("Sorry, you have already exceeded your limit of %d channels."),
-	/* CHAN_REGISTERED */
-	_("Channel %s registered under your nickname: %s"),
-	/* CHAN_SYMBOL_REQUIRED */
-	_("Please use the symbol of # when attempting to register"),
-	/* CHAN_DROP_SYNTAX */
-	_("DROP channel"),
-	/* CHAN_DROP_DISABLED */
-	_("Sorry, channel de-registration is temporarily disabled."),
-	/* CHAN_DROPPED */
-	_("Channel %s has been dropped."),
-	/* CHAN_SASET_SYNTAX */
-	_("SASET channel option parameters"),
-	/* CHAN_SASET_KEEPTOPIC_SYNTAX */
-	_("SASET channel KEEPTOPIC {ON | OFF}"),
-	/* CHAN_SASET_OPNOTICE_SYNTAX */
-	_("SASET channel OPNOTICE {ON | OFF}"),
-	/* CHAN_SASET_PEACE_SYNTAX */
-	_("SASET channel PEACE {ON | OFF}"),
-	/* CHAN_SASET_PERSIST_SYNTAX */
-	_("SASET channel PERSIST {ON | OFF}"),
-	/* CHAN_SASET_PRIVATE_SYNTAX */
-	_("SASET channel PRIVATE {ON | OFF}"),
-	/* CHAN_SASET_RESTRICTED_SYNTAX */
-	_("SASET channel RESTRICTED {ON | OFF}"),
-	/* CHAN_SASET_SECURE_SYNTAX */
-	_("SASET channel SECURE {ON | OFF}"),
-	/* CHAN_SASET_SECUREFOUNDER_SYNTAX */
-	_("SASET channel SECUREFOUNDER {ON | OFF}"),
-	/* CHAN_SASET_SECUREOPS_SYNTAX */
-	_("SASET channel SECUREOPS {ON | OFF}"),
-	/* CHAN_SASET_SIGNKICK_SYNTAX */
-	_("SASET channel SIGNKICK {ON | OFF}"),
-	/* CHAN_SASET_TOPICLOCK_SYNTAX */
-	_("SASET channel TOPICLOCK {ON | OFF}"),
-	/* CHAN_SASET_XOP_SYNTAX */
-	_("SASET channel XOP {ON | OFF}"),
-	/* CHAN_SET_SYNTAX */
-	_("SET channel option parameters"),
-	/* CHAN_SET_DISABLED */
-	_("Sorry, channel option setting is temporarily disabled."),
-	/* CHAN_SETTING_CHANGED */
-	_("%s for %s set to %s."),
-	/* CHAN_SETTING_UNSET */
-	_("%s for %s unset."),
-	/* CHAN_SET_FOUNDER_TOO_MANY_CHANS */
-	_("%s has too many channels registered."),
-	/* CHAN_FOUNDER_CHANGED */
-	_("Founder of %s changed to %s."),
-	/* CHAN_SUCCESSOR_CHANGED */
-	_("Successor for %s changed to %s."),
-	/* CHAN_SUCCESSOR_UNSET */
-	_("Successor for %s unset."),
-	/* CHAN_SUCCESSOR_IS_FOUNDER */
-	_("%s cannot be the successor on channel %s because he is its founder."),
-	/* CHAN_DESC_CHANGED */
-	_("Description of %s changed to %s."),
-	/* CHAN_SET_BANTYPE_INVALID */
-	_("%s is not a valid ban type."),
-	/* CHAN_SET_BANTYPE_CHANGED */
-	_("Ban type for channel %s is now #%d."),
-	/* CHAN_SET_MLOCK_DEPRECATED */
-	_("MLOCK is deprecated. Use \002%R%s HELP MODE\002 instead."),
-	/* CHAN_SET_KEEPTOPIC_SYNTAX */
-	_("SET channel KEEPTOPIC {ON | OFF}"),
-	/* CHAN_SET_KEEPTOPIC_ON */
-	_("Topic retention option for %s is now ON."),
-	/* CHAN_SET_KEEPTOPIC_OFF */
-	_("Topic retention option for %s is now OFF."),
-	/* CHAN_SET_TOPICLOCK_SYNTAX */
-	_("SET channel TOPICLOCK {ON | OFF}"),
-	/* CHAN_SET_TOPICLOCK_ON */
-	_("Topic lock option for %s is now ON."),
-	/* CHAN_SET_TOPICLOCK_OFF */
-	_("Topic lock option for %s is now OFF."),
-	/* CHAN_SET_PEACE_SYNTAX */
-	_("SET channel PEACE {ON | OFF}"),
-	/* CHAN_SET_PEACE_ON */
-	_("Peace option for %s is now ON."),
-	/* CHAN_SET_PEACE_OFF */
-	_("Peace option for %s is now OFF."),
-	/* CHAN_SET_PRIVATE_SYNTAX */
-	_("SET channel PRIVATE {ON | OFF}"),
-	/* CHAN_SET_PRIVATE_ON */
-	_("Private option for %s is now ON."),
-	/* CHAN_SET_PRIVATE_OFF */
-	_("Private option for %s is now OFF."),
-	/* CHAN_SET_SECUREOPS_SYNTAX */
-	_("SET channel SECUREOPS {ON | OFF}"),
-	/* CHAN_SET_SECUREOPS_ON */
-	_("Secure ops option for %s is now ON."),
-	/* CHAN_SET_SECUREOPS_OFF */
-	_("Secure ops option for %s is now OFF."),
-	/* CHAN_SET_SECUREFOUNDER_SYNTAX */
-	_("SET channel SECUREFOUNDER {ON | OFF}"),
-	/* CHAN_SET_SECUREFOUNDER_ON */
-	_("Secure founder option for %s is now ON."),
-	/* CHAN_SET_SECUREFOUNDER_OFF */
-	_("Secure founder option for %s is now OFF."),
-	/* CHAN_SET_RESTRICTED_SYNTAX */
-	_("SET channel RESTRICTED {ON | OFF}"),
-	/* CHAN_SET_RESTRICTED_ON */
-	_("Restricted access option for %s is now ON."),
-	/* CHAN_SET_RESTRICTED_OFF */
-	_("Restricted access option for %s is now OFF."),
-	/* CHAN_SET_SECURE_SYNTAX */
-	_("SET channel SECURE {ON | OFF}"),
-	/* CHAN_SET_SECURE_ON */
-	_("Secure option for %s is now ON."),
-	/* CHAN_SET_SECURE_OFF */
-	_("Secure option for %s is now OFF."),
-	/* CHAN_SET_SIGNKICK_SYNTAX */
-	_("SET channel SIGNKICK {ON | LEVEL | OFF}"),
-	/* CHAN_SET_SIGNKICK_ON */
-	_("Signed kick option for %s is now ON."),
-	/* CHAN_SET_SIGNKICK_LEVEL */
-	_("Signed kick option for %s is now ON, but depends of the\n"
-	"level of the user that is using the command."),
-	/* CHAN_SET_SIGNKICK_OFF */
-	_("Signed kick option for %s is now OFF."),
-	/* CHAN_SET_OPNOTICE_SYNTAX */
-	_("SET channel OPNOTICE {ON | OFF}"),
-	/* CHAN_SET_OPNOTICE_ON */
-	_("Op-notice option for %s is now ON."),
-	/* CHAN_SET_OPNOTICE_OFF */
-	_("Op-notice option for %s is now OFF."),
-	/* CHAN_SET_XOP_SYNTAX */
-	_("SET channel XOP {ON | OFF}"),
-	/* CHAN_SET_XOP_ON */
-	_("xOP lists system for %s is now ON."),
-	/* CHAN_SET_XOP_OFF */
-	_("xOP lists system for %s is now OFF."),
-	/* CHAN_SET_PERSIST_SYNTAX */
-	_("SET channel PERSIST {ON | OFF}"),
-	/* CHAN_SET_PERSIST_ON */
-	_("Channel %s is now persistant."),
-	/* CHAN_SET_PERSIST_OFF */
-	_("Channel %s is no longer persistant."),
-	/* CHAN_SET_NOEXPIRE_SYNTAX */
-	_("SET channel NOEXPIRE {ON | OFF}"),
-	/* CHAN_SET_NOEXPIRE_ON */
-	_("Channel %s will not expire."),
-	/* CHAN_SET_NOEXPIRE_OFF */
-	_("Channel %s will expire."),
-	/* CHAN_XOP_REACHED_LIMIT */
-	_("Sorry, you can only have %d AOP/SOP/VOP entries on a channel."),
-	/* CHAN_XOP_LIST_FORMAT */
-	_("  %3d  %s"),
-	/* CHAN_XOP_ACCESS */
-	_("You can't use this command. Use the ACCESS command instead.\n"
-	"Type %R%s HELP ACCESS for more information."),
-	/* CHAN_XOP_NOT_AVAILABLE */
-	_("xOP system is not available."),
-	/* CHAN_QOP_SYNTAX */
-	_("QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"),
-	/* CHAN_QOP_DISABLED */
-	_("Sorry, channel QOP list modification is temporarily disabled."),
-	/* CHAN_QOP_ADDED */
-	_("%s added to %s QOP list."),
-	/* CHAN_QOP_MOVED */
-	_("%s moved to %s QOP list."),
-	/* CHAN_QOP_NO_SUCH_ENTRY */
-	_("No such entry (#%d) on %s QOP list."),
-	/* CHAN_QOP_NOT_FOUND */
-	_("%s not found on %s QOP list."),
-	/* CHAN_QOP_NO_MATCH */
-	_("No matching entries on %s QOP list."),
-	/* CHAN_QOP_DELETED */
-	_("%s deleted from %s QOP list."),
-	/* CHAN_QOP_DELETED_ONE */
-	_("Deleted 1 entry from %s QOP list."),
-	/* CHAN_QOP_DELETED_SEVERAL */
-	_("Deleted %d entries from %s QOP list."),
-	/* CHAN_QOP_LIST_EMPTY */
-	_("%s QOP list is empty."),
-	/* CHAN_QOP_LIST_HEADER */
-	_("QOP list for %s:\n"
-	"  Num  Nick"),
-	/* CHAN_QOP_CLEAR */
-	_("Channel %s QOP list has been cleared."),
-	/* CHAN_AOP_SYNTAX */
-	_("AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"),
-	/* CHAN_AOP_DISABLED */
-	_("Sorry, channel AOP list modification is temporarily disabled."),
-	/* CHAN_AOP_ADDED */
-	_("%s added to %s AOP list."),
-	/* CHAN_AOP_MOVED */
-	_("%s moved to %s AOP list."),
-	/* CHAN_AOP_NO_SUCH_ENTRY */
-	_("No such entry (#%d) on %s AOP list."),
-	/* CHAN_AOP_NOT_FOUND */
-	_("%s not found on %s AOP list."),
-	/* CHAN_AOP_NO_MATCH */
-	_("No matching entries on %s AOP list."),
-	/* CHAN_AOP_DELETED */
-	_("%s deleted from %s AOP list."),
-	/* CHAN_AOP_DELETED_ONE */
-	_("Deleted 1 entry from %s AOP list."),
-	/* CHAN_AOP_DELETED_SEVERAL */
-	_("Deleted %d entries from %s AOP list."),
-	/* CHAN_AOP_LIST_EMPTY */
-	_("%s AOP list is empty."),
-	/* CHAN_AOP_LIST_HEADER */
-	_("AOP list for %s:\n"
-	"  Num  Nick"),
-	/* CHAN_AOP_CLEAR */
-	_("Channel %s AOP list has been cleared."),
-	/* CHAN_HOP_SYNTAX */
-	_("HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"),
-	/* CHAN_HOP_DISABLED */
-	_("Sorry, channel HOP list modification is temporarily disabled."),
-	/* CHAN_HOP_ADDED */
-	_("%s added to %s HOP list."),
-	/* CHAN_HOP_MOVED */
-	_("%s moved to %s HOP list."),
-	/* CHAN_HOP_NO_SUCH_ENTRY */
-	_("No such entry (#%d) on %s HOP list."),
-	/* CHAN_HOP_NOT_FOUND */
-	_("%s not found on %s HOP list."),
-	/* CHAN_HOP_NO_MATCH */
-	_("No matching entries on %s HOP list."),
-	/* CHAN_HOP_DELETED */
-	_("%s deleted from %s HOP list."),
-	/* CHAN_HOP_DELETED_ONE */
-	_("Deleted 1 entry from %s HOP list."),
-	/* CHAN_HOP_DELETED_SEVERAL */
-	_("Deleted %d entries from %s HOP list."),
-	/* CHAN_HOP_LIST_EMPTY */
-	_("%s HOP list is empty."),
-	/* CHAN_HOP_LIST_HEADER */
-	_("HOP list for %s:\n"
-	"  Num  Nick"),
-	/* CHAN_HOP_CLEAR */
-	_("Channel %s HOP list has been cleared."),
-	/* CHAN_SOP_SYNTAX */
-	_("SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"),
-	/* CHAN_SOP_DISABLED */
-	_("Sorry, channel SOP list modification is temporarily disabled."),
-	/* CHAN_SOP_ADDED */
-	_("%s added to %s SOP list."),
-	/* CHAN_SOP_MOVED */
-	_("%s moved to %s SOP list."),
-	/* CHAN_SOP_NO_SUCH_ENTRY */
-	_("No such entry (#%d) on %s SOP list."),
-	/* CHAN_SOP_NOT_FOUND */
-	_("%s not found on %s SOP list."),
-	/* CHAN_SOP_NO_MATCH */
-	_("No matching entries on %s SOP list."),
-	/* CHAN_SOP_DELETED */
-	_("%s deleted from %s SOP list."),
-	/* CHAN_SOP_DELETED_ONE */
-	_("Deleted 1 entry from %s SOP list."),
-	/* CHAN_SOP_DELETED_SEVERAL */
-	_("Deleted %d entries from %s SOP list."),
-	/* CHAN_SOP_LIST_EMPTY */
-	_("%s SOP list is empty."),
-	/* CHAN_SOP_LIST_HEADER */
-	_("SOP list for %s:\n"
-	"  Num  Nick"),
-	/* CHAN_SOP_CLEAR */
-	_("Channel %s SOP list has been cleared."),
-	/* CHAN_VOP_SYNTAX */
-	_("VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"),
-	/* CHAN_VOP_DISABLED */
-	_("Sorry, channel VOP list modification is temporarily disabled."),
-	/* CHAN_VOP_ADDED */
-	_("%s added to %s VOP list."),
-	/* CHAN_VOP_MOVED */
-	_("%s moved to %s VOP list."),
-	/* CHAN_VOP_NO_SUCH_ENTRY */
-	_("No such entry (#%d) on %s VOP list."),
-	/* CHAN_VOP_NOT_FOUND */
-	_("%s not found on %s VOP list."),
-	/* CHAN_VOP_NO_MATCH */
-	_("No matching entries on %s VOP list."),
-	/* CHAN_VOP_DELETED */
-	_("%s deleted from %s VOP list."),
-	/* CHAN_VOP_DELETED_ONE */
-	_("Deleted 1 entry from %s VOP list."),
-	/* CHAN_VOP_DELETED_SEVERAL */
-	_("Deleted %d entries from %s VOP list."),
-	/* CHAN_VOP_LIST_EMPTY */
-	_("%s VOP list is empty."),
-	/* CHAN_VOP_LIST_HEADER */
-	_("VOP list for %s:\n"
-	"  Num  Nick"),
-	/* CHAN_VOP_CLEAR */
-	_("Channel %s VOP list has been cleared."),
-	/* CHAN_ACCESS_SYNTAX */
-	_("ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"),
-	/* CHAN_ACCESS_XOP */
-	_("You can't use this command. \n"
-	"Use the AOP, SOP and VOP commands instead.\n"
-	"Type %R%s HELP command for more information."),
-	/* CHAN_ACCESS_XOP_HOP */
-	_("You can't use this command. \n"
-	"Use the AOP, SOP, HOP and VOP commands instead.\n"
-	"Type %R%s HELP command for more information."),
-	/* CHAN_ACCESS_DISABLED */
-	_("Sorry, channel access list modification is temporarily disabled."),
-	/* CHAN_ACCESS_LEVEL_NONZERO */
-	_("Access level must be non-zero."),
-	/* CHAN_ACCESS_LEVEL_RANGE */
-	_("Access level must be between %d and %d inclusive."),
-	/* CHAN_ACCESS_REACHED_LIMIT */
-	_("Sorry, you can only have %d access entries on a channel."),
-	/* CHAN_ACCESS_LEVEL_UNCHANGED */
-	_("Access level for %s on %s unchanged from %d."),
-	/* CHAN_ACCESS_LEVEL_CHANGED */
-	_("Access level for %s on %s changed to %d."),
-	/* CHAN_ACCESS_ADDED */
-	_("%s added to %s access list at level %d."),
-	/* CHAN_ACCESS_NOT_FOUND */
-	_("%s not found on %s access list."),
-	/* CHAN_ACCESS_NO_MATCH */
-	_("No matching entries on %s access list."),
-	/* CHAN_ACCESS_DELETED */
-	_("%s deleted from %s access list."),
-	/* CHAN_ACCESS_DELETED_ONE */
-	_("Deleted 1 entry from %s access list."),
-	/* CHAN_ACCESS_DELETED_SEVERAL */
-	_("Deleted %d entries from %s access list."),
-	/* CHAN_ACCESS_LIST_EMPTY */
-	_("%s access list is empty."),
-	/* CHAN_ACCESS_LIST_HEADER */
-	_("Access list for %s:\n"
-	"  Num   Lev  Mask"),
-	/* CHAN_ACCESS_LIST_FOOTER */
-	_("End of access list."),
-	/* CHAN_ACCESS_LIST_XOP_FORMAT */
-	_("  %3d   %s  %s"),
-	/* CHAN_ACCESS_LIST_AXS_FORMAT */
-	_("  %3d  %4d  %s"),
-	/* CHAN_ACCESS_CLEAR */
-	_("Channel %s access list has been cleared."),
-	/* CHAN_ACCESS_VIEW_XOP_FORMAT */
-	_("  %3d   %s   %s\n"
-	"    by %s, last seen %s"),
-	/* CHAN_ACCESS_VIEW_AXS_FORMAT */
-	_("  %3d  %4d  %s\n"
-	"    by %s, last seen %s"),
-	/* CHAN_AKICK_SYNTAX */
-	_("AKICK channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [nick-or-usermask] [reason]"),
-	/* CHAN_AKICK_DISABLED */
-	_("Sorry, channel autokick list modification is temporarily disabled."),
-	/* CHAN_AKICK_ALREADY_EXISTS */
-	_("%s already exists on %s autokick list."),
-	/* CHAN_AKICK_REACHED_LIMIT */
-	_("Sorry, you can only have %d autokick masks on a channel."),
-	/* CHAN_AKICK_ADDED */
-	_("%s added to %s autokick list."),
-	/* CHAN_AKICK_NOT_FOUND */
-	_("%s not found on %s autokick list."),
-	/* CHAN_AKICK_NO_MATCH */
-	_("No matching entries on %s autokick list."),
-	/* CHAN_AKICK_DELETED */
-	_("%s deleted from %s autokick list."),
-	/* CHAN_AKICK_DELETED_ONE */
-	_("Deleted 1 entry from %s autokick list."),
-	/* CHAN_AKICK_DELETED_SEVERAL */
-	_("Deleted %d entries from %s autokick list."),
-	/* CHAN_AKICK_LIST_EMPTY */
-	_("%s autokick list is empty."),
-	/* CHAN_AKICK_LIST_HEADER */
-	_("Autokick list for %s:"),
-	/* CHAN_AKICK_LIST_FORMAT */
-	_("  %3d %s (%s)"),
-	/* CHAN_AKICK_VIEW_FORMAT */
-	_("%3d %s (by %s on %s)\n"
-	"    %s"),
-	/* CHAN_AKICK_LAST_USED */
-	_("    Last used %s"),
-	/* CHAN_AKICK_ENFORCE_DONE */
-	_("AKICK ENFORCE for %s complete; %d users were affected."),
-	/* CHAN_AKICK_CLEAR */
-	_("Channel %s akick list has been cleared."),
-	/* CHAN_LEVELS_SYNTAX */
-	_("LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"),
-	/* CHAN_LEVELS_XOP */
-	_("Levels are not available as xOP is enabled on this channel."),
-	/* CHAN_LEVELS_RANGE */
-	_("Level must be between %d and %d inclusive."),
-	/* CHAN_LEVELS_CHANGED */
-	_("Level for %s on channel %s changed to %d."),
-	/* CHAN_LEVELS_CHANGED_FOUNDER */
-	_("Level for %s on channel %s changed to founder only."),
-	/* CHAN_LEVELS_UNKNOWN */
-	_("Setting %s not known.  Type %R%s HELP LEVELS DESC for a list of valid settings."),
-	/* CHAN_LEVELS_DISABLED */
-	_("%s disabled on channel %s."),
-	/* CHAN_LEVELS_LIST_HEADER */
-	_("Access level settings for channel %s:"),
-	/* CHAN_LEVELS_LIST_DISABLED */
-	_("    %-*s  (disabled)"),
-	/* CHAN_LEVELS_LIST_FOUNDER */
-	_("    %-*s  (founder only)"),
-	/* CHAN_LEVELS_LIST_NORMAL */
-	_("    %-*s  %d"),
-	/* CHAN_LEVELS_RESET */
-	_("Access levels for %s reset to defaults."),
-	/* CHAN_STATUS_SYNTAX */
-	_("STATUS channel item"),
-	/* CHAN_STATUS_NOT_REGGED */
-	_("STATUS ERROR Channel %s not registered"),
-	/* CHAN_STATUS_NOTONLINE */
-	_("STATUS ERROR Nick %s not online"),
-	/* CHAN_STATUS_INFO */
-	_("STATUS %s %s %d"),
-	/* CHAN_INFO_SYNTAX */
-	_("INFO channel"),
-	/* CHAN_INFO_HEADER */
-	_("Information for channel %s:"),
-	/* CHAN_INFO_NO_FOUNDER */
-	_("        Founder: %s"),
-	/* CHAN_INFO_NO_SUCCESSOR */
-	_("      Successor: %s"),
-	/* CHAN_INFO_DESCRIPTION */
-	_("    Description: %s"),
-	/* CHAN_INFO_TIME_REGGED */
-	_("     Registered: %s"),
-	/* CHAN_INFO_LAST_USED */
-	_("      Last used: %s"),
-	/* CHAN_INFO_LAST_TOPIC */
-	_("     Last topic: %s"),
-	/* CHAN_INFO_TOPIC_SET_BY */
-	_("   Topic set by: %s"),
-	/* CHAN_INFO_BANTYPE */
-	_("       Ban type: %d"),
-	/* CHAN_INFO_OPT_KEEPTOPIC */
-	_("Topic Retention"),
-	/* CHAN_INFO_OPT_OPNOTICE */
-	_("OP Notice"),
-	/* CHAN_INFO_OPT_PEACE */
-	_("Peace"),
-	/* CHAN_INFO_OPT_RESTRICTED */
-	_("Restricted Access"),
-	/* CHAN_INFO_OPT_SECURE */
-	_("Secure"),
-	/* CHAN_INFO_OPT_SECUREOPS */
-	_("Secure Ops"),
-	/* CHAN_INFO_OPT_SECUREFOUNDER */
-	_("Secure Founder"),
-	/* CHAN_INFO_OPT_SIGNKICK */
-	_("Signed kicks"),
-	/* CHAN_INFO_OPT_TOPICLOCK */
-	_("Topic Lock"),
-	/* CHAN_INFO_OPT_XOP */
-	_("xOP lists system"),
-	/* CHAN_INFO_OPT_PERSIST */
-	_("Persistant"),
-	/* CHAN_INFO_MODE_LOCK */
-	_("      Mode lock: %s"),
-	/* CHAN_INFO_EXPIRE */
-	_("      Expires on: %s"),
-	/* CHAN_INFO_NO_EXPIRE */
-	_("This channel will not expire."),
-	/* CHAN_LIST_END */
-	_("End of list - %d/%d matches shown."),
-	/* CHAN_INVITE_SYNTAX */
-	_("INVITE channel"),
-	/* CHAN_INVITE_ALREADY_IN */
-	_("You are already in %s! "),
-	/* CHAN_INVITE_SUCCESS */
-	_("You have been invited to %s."),
-	/* CHAN_INVITE_OTHER_SUCCESS */
-	_("%s has been invited to %s."),
-	/* CHAN_UNBAN_SYNTAX */
-	_("UNBAN channel [nick]"),
-	/* CHAN_UNBANNED */
-	_("You have been unbanned from %s."),
-	/* CHAN_UNBANNED_OTHER */
-	_("%s has been unbanned from %s."),
-	/* CHAN_TOPIC_SYNTAX */
-	_("TOPIC channel [topic]"),
-	/* CHAN_CLEARUSERS_SYNTAX */
-	_("CLEARUSERS \037channel\037"),
-	/* CHAN_CLEARED_USERS */
-	_("All users have been kicked from \2%s\2."),
-	/* CHAN_CLONED */
-	_("All settings from \002%s\002 have been transferred to \002%s\002"),
-	/* CHAN_CLONED_ACCESS */
-	_("All access entries from \002%s\002 have been transferred to \002%s\002"),
-	/* CHAN_CLONED_AKICK */
-	_("All akick entries from \002%s\002 have been transferred to \002%s\002"),
-	/* CHAN_CLONED_BADWORDS */
-	_("All badword entries from \002%s\002 have been transferred to \002%s\002"),
-	/* CHAN_CLONE_SYNTAX */
-	_("CLONE \037channel\037 \037target\037"),
-	/* CHAN_GETKEY_SYNTAX */
-	_("GETKEY channel"),
-	/* CHAN_GETKEY_NOKEY */
-	_("The channel %s has no key."),
-	/* CHAN_GETKEY_KEY */
-	_("Key for channel %s is %s."),
-	/* CHAN_FORBID_SYNTAX */
-	_("FORBID channel [reason]"),
-	/* CHAN_FORBID_SYNTAX_REASON */
-	_("FORBID channel reason"),
-	/* CHAN_FORBID_SUCCEEDED */
-	_("Channel %s is now forbidden."),
-	/* CHAN_FORBID_REASON */
-	_("This channel has been forbidden."),
-	/* CHAN_SUSPEND_SYNTAX */
-	_("SUSPEND channel [reason]"),
-	/* CHAN_SUSPEND_SYNTAX_REASON */
-	_("SUSPEND channel reason"),
-	/* CHAN_SUSPEND_SUCCEEDED */
-	_("Channel %s is now suspended."),
-	/* CHAN_SUSPEND_REASON */
-	_("This channel has been suspended."),
-	/* CHAN_UNSUSPEND_SYNTAX */
-	_("UNSUSPEND channel"),
-	/* CHAN_UNSUSPEND_ERROR */
-	_("No # found in front of channel name."),
-	/* CHAN_UNSUSPEND_SUCCEEDED */
-	_("Channel %s is now released."),
-	/* CHAN_UNSUSPEND_FAILED */
-	_("Couldn't release channel %s!"),
-	/* CHAN_EXCEPTED */
-	_("%s matches an except on %s and cannot be banned until the except have been removed."),
-	/* CHAN_OP_SYNTAX */
-	_("OP [#channel] [nick]"),
-	/* CHAN_HALFOP_SYNTAX */
-	_("HALFOP [#channel] [nick]"),
-	/* CHAN_VOICE_SYNTAX */
-	_("VOICE [#channel] [nick]"),
-	/* CHAN_PROTECT_SYNTAX */
-	_("PROTECT [#channel] [nick]"),
-	/* CHAN_OWNER_SYNTAX */
-	_("OWNER [#channel] [\037nick\037]\002"),
-	/* CHAN_DEOP_SYNTAX */
-	_("DEOP [#channel] [nick]"),
-	/* CHAN_DEHALFOP_SYNTAX */
-	_("DEHALFOP [#channel] [nick]"),
-	/* CHAN_DEVOICE_SYNTAX */
-	_("DEVOICE [#channel] [nick]"),
-	/* CHAN_DEPROTECT_SYNTAX */
-	_("DEROTECT [#channel] [nick]"),
-	/* CHAN_DEOWNER_SYNTAX */
-	_("DEOWNER [#channel] [\037nick\037]"),
-	/* CHAN_KICK_SYNTAX */
-	_("KICK #channel nick [reason]"),
-	/* CHAN_BAN_SYNTAX */
-	_("BAN #channel nick [reason]"),
-	/* CHAN_MODE_SYNTAX */
-	_("MODE \037channel\037 {LOCK|SET} [\037modes\037 | {ADD|DEL|LIST} [\037what\037]]"),
-	/* CHAN_MODE_LOCK_UNKNOWN */
-	_("Unknown mode character %c ignored."),
-	/* CHAN_MODE_LOCK_MISSING_PARAM */
-	_("Missing parameter for mode %c."),
-	/* CHAN_MODE_LOCK_NONE */
-	_("Channel %s has no mode locks."),
-	/* CHAN_MODE_LOCK_HEADER */
-	_("Mode locks for %s:"),
-	/* CHAN_MODE_LOCKED */
-	_("%c%c%s locked on %s"),
-	/* CHAN_MODE_NOT_LOCKED */
-	_("%c is not locked on %s."),
-	/* CHAN_MODE_UNLOCKED */
-	_("%c%c%s has been unlocked from %s."),
-	/* CHAN_MODE_LIST_FMT */
-	_("%c%c%s, by %s on %s"),
-	/* CHAN_ENTRYMSG_LIST_HEADER */
-	_("Entry message list for \2%s\2:"),
-	/* CHAN_ENTRYMSG_LIST_ENTRY */
-	_("%3d    %s\n"
-	"  Added by %s on %s"),
-	/* CHAN_ENTRYMSG_LIST_END */
-	_("End of entry message list."),
-	/* CHAN_ENTRYMSG_LIST_EMPTY */
-	_("Entry message list for \2%s\2 is empty."),
-	/* CHAN_ENTRYMSG_LIST_FULL */
-	_("The entry message list for \2%s\2 is full."),
-	/* CHAN_ENTRYMSG_ADDED */
-	_("Entry message added to \2%s\2"),
-	/* CHAN_ENTRYMSG_DELETED */
-	_("Entry message \2%i\2 for \2%s\2 deleted."),
-	/* CHAN_ENTRYMSG_NOT_FOUND */
-	_("Entry message \2%s\2 not found on channel \2%s\2."),
-	/* CHAN_ENTRYMSG_CLEARED */
-	_("Entry messages for \2%s\2 have been cleared."),
-	/* CHAN_ENTRYMSG_SYNTAX */
-	_("ENTRYMSG \037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]"),
-	/* MEMO_HAVE_NEW_MEMO */
-	_("You have 1 new memo."),
-	/* MEMO_HAVE_NEW_MEMOS */
-	_("You have %d new memos."),
-	/* MEMO_TYPE_READ_LAST */
-	_("Type %R%s READ LAST to read it."),
-	/* MEMO_TYPE_READ_NUM */
-	_("Type %R%s READ %d to read it."),
-	/* MEMO_TYPE_LIST_NEW */
-	_("Type %R%s LIST NEW to list them."),
-	/* MEMO_AT_LIMIT */
-	_("Warning: You have reached your maximum number of memos (%d).  You will be unable to receive any new memos until you delete some of your current ones."),
-	/* MEMO_OVER_LIMIT */
-	_("Warning: You are over your maximum number of memos (%d).  You will be unable to receive any new memos until you delete some of your current ones."),
-	/* MEMO_X_MANY_NOTICE */
-	_("There are %d memos on channel %s."),
-	/* MEMO_X_ONE_NOTICE */
-	_("There is %d memo on channel %s."),
-	/* MEMO_NEW_X_MEMO_ARRIVED */
-	_("There is a new memo on channel %s.\n"
-	"Type %R%s READ %s %d to read it."),
-	/* MEMO_NEW_MEMO_ARRIVED */
-	_("You have a new memo from %s.\n"
-	"Type %R%s READ %d to read it."),
-	/* MEMO_HAVE_NO_MEMOS */
-	_("You have no memos."),
-	/* MEMO_X_HAS_NO_MEMOS */
-	_("%s has no memos."),
-	/* MEMO_SEND_SYNTAX */
-	_("SEND {nick | channel} memo-text"),
-	/* MEMO_SENDALL_SYNTAX */
-	_("SENDALL memo-text"),
-	/* MEMO_SEND_DISABLED */
-	_("Sorry, memo sending is temporarily disabled."),
-	/* MEMO_SEND_PLEASE_WAIT */
-	_("Please wait %d seconds before using the SEND command again."),
-	/* MEMO_X_GETS_NO_MEMOS */
-	_("%s cannot receive memos."),
-	/* MEMO_X_HAS_TOO_MANY_MEMOS */
-	_("%s currently has too many memos and cannot receive more."),
-	/* MEMO_SENT */
-	_("Memo sent to %s."),
-	/* MEMO_MASS_SENT */
-	_("A massmemo has been sent to all registered users."),
-	/* MEMO_STAFF_SYNTAX */
-	_("STAFF memo-text"),
-	/* MEMO_CANCEL_SYNTAX */
-	_("CANCEL {nick | channel}"),
-	/* MEMO_CANCEL_NONE */
-	_("No memo was cancelable."),
-	/* MEMO_CANCELLED */
-	_("Last memo to %s has been cancelled."),
-	/* MEMO_LIST_SYNTAX */
-	_("LIST [channel] [list | NEW]"),
-	/* MEMO_HAVE_NO_NEW_MEMOS */
-	_("You have no new memos."),
-	/* MEMO_X_HAS_NO_NEW_MEMOS */
-	_("%s has no new memos."),
-	/* MEMO_LIST_MEMOS */
-	_("Memos for %s.  To read, type: %R%s READ num"),
-	/* MEMO_LIST_NEW_MEMOS */
-	_("New memos for %s.  To read, type: %R%s READ num"),
-	/* MEMO_LIST_CHAN_MEMOS */
-	_("Memos for %s.  To read, type: %R%s READ %s num"),
-	/* MEMO_LIST_CHAN_NEW_MEMOS */
-	_("New memos for %s.  To read, type: %R%s READ %s num"),
-	/* MEMO_LIST_HEADER */
-	_(" Num  Sender            Date/Time"),
-	/* MEMO_LIST_FORMAT */
-	_("%c%3d  %-16s  %s"),
-	/* MEMO_READ_SYNTAX */
-	_("READ [channel] {list | LAST | NEW}"),
-	/* MEMO_HEADER */
-	_("Memo %d from %s (%s).  To delete, type: %R%s DEL %d"),
-	/* MEMO_CHAN_HEADER */
-	_("Memo %d from %s (%s).  To delete, type: %R%s DEL %s %d"),
-	/* MEMO_TEXT */
-	_("%s"),
-	/* MEMO_DEL_SYNTAX */
-	_("DEL [channel] {num | list | ALL}"),
-	/* MEMO_DELETED_ONE */
-	_("Memo %d has been deleted."),
-	/* MEMO_DELETED_ALL */
-	_("All of your memos have been deleted."),
-	/* MEMO_CHAN_DELETED_ALL */
-	_("All memos for channel %s have been deleted."),
-	/* MEMO_SET_DISABLED */
-	_("Sorry, memo option setting is temporarily disabled."),
-	/* MEMO_SET_NOTIFY_SYNTAX */
-	_("SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"),
-	/* MEMO_SET_NOTIFY_ON */
-	_("%s will now notify you of memos when you log on and when they are sent to you."),
-	/* MEMO_SET_NOTIFY_LOGON */
-	_("%s will now notify you of memos when you log on or unset /AWAY."),
-	/* MEMO_SET_NOTIFY_NEW */
-	_("%s will now notify you of memos when they are sent to you."),
-	/* MEMO_SET_NOTIFY_OFF */
-	_("%s will not send you any notification of memos."),
-	/* MEMO_SET_NOTIFY_MAIL */
-	_("You will now be informed about new memos via email."),
-	/* MEMO_SET_NOTIFY_NOMAIL */
-	_("You will no longer be informed via email."),
-	/* MEMO_SET_NOTIFY_INVALIDMAIL */
-	_("There's no email address set for your nick."),
-	/* MEMO_SET_LIMIT_SYNTAX */
-	_("SET LIMIT [channel] limit"),
-	/* MEMO_SET_LIMIT_SERVADMIN_SYNTAX */
-	_("SET LIMIT [user | channel] {limit | NONE} [HARD]"),
-	/* MEMO_SET_YOUR_LIMIT_FORBIDDEN */
-	_("You are not permitted to change your memo limit."),
-	/* MEMO_SET_LIMIT_FORBIDDEN */
-	_("The memo limit for %s may not be changed."),
-	/* MEMO_SET_YOUR_LIMIT_TOO_HIGH */
-	_("You cannot set your memo limit higher than %d."),
-	/* MEMO_SET_LIMIT_TOO_HIGH */
-	_("You cannot set the memo limit for %s higher than %d."),
-	/* MEMO_SET_LIMIT_OVERFLOW */
-	_("Memo limit too large; limiting to %d instead."),
-	/* MEMO_SET_YOUR_LIMIT */
-	_("Your memo limit has been set to %d."),
-	/* MEMO_SET_YOUR_LIMIT_ZERO */
-	_("You will no longer be able to receive memos."),
-	/* MEMO_UNSET_YOUR_LIMIT */
-	_("Your memo limit has been disabled."),
-	/* MEMO_SET_LIMIT */
-	_("Memo limit for %s set to %d."),
-	/* MEMO_SET_LIMIT_ZERO */
-	_("Memo limit for %s set to 0."),
-	/* MEMO_UNSET_LIMIT */
-	_("Memo limit disabled for %s."),
-	/* MEMO_INFO_NO_MEMOS */
-	_("You currently have no memos."),
-	/* MEMO_INFO_MEMO */
-	_("You currently have 1 memo."),
-	/* MEMO_INFO_MEMO_UNREAD */
-	_("You currently have 1 memo, and it has not yet been read."),
-	/* MEMO_INFO_MEMOS */
-	_("You currently have %d memos."),
-	/* MEMO_INFO_MEMOS_ONE_UNREAD */
-	_("You currently have %d memos, of which 1 is unread."),
-	/* MEMO_INFO_MEMOS_SOME_UNREAD */
-	_("You currently have %d memos, of which %d are unread."),
-	/* MEMO_INFO_MEMOS_ALL_UNREAD */
-	_("You currently have %d memos; all of them are unread."),
-	/* MEMO_INFO_LIMIT */
-	_("Your memo limit is %d."),
-	/* MEMO_INFO_HARD_LIMIT */
-	_("Your memo limit is %d, and may not be changed."),
-	/* MEMO_INFO_LIMIT_ZERO */
-	_("Your memo limit is 0; you will not receive any new memos."),
-	/* MEMO_INFO_HARD_LIMIT_ZERO */
-	_("Your memo limit is 0; you will not receive any new memos.  You cannot change this limit."),
-	/* MEMO_INFO_NO_LIMIT */
-	_("You have no limit on the number of memos you may keep."),
-	/* MEMO_INFO_NOTIFY_OFF */
-	_("You will not be notified of new memos."),
-	/* MEMO_INFO_NOTIFY_ON */
-	_("You will be notified of new memos at logon and when they arrive."),
-	/* MEMO_INFO_NOTIFY_RECEIVE */
-	_("You will be notified when new memos arrive."),
-	/* MEMO_INFO_NOTIFY_SIGNON */
-	_("You will be notified of new memos at logon."),
-	/* MEMO_INFO_X_NO_MEMOS */
-	_("%s currently has no memos."),
-	/* MEMO_INFO_X_MEMO */
-	_("%s currently has 1 memo."),
-	/* MEMO_INFO_X_MEMO_UNREAD */
-	_("%s currently has 1 memo, and it has not yet been read."),
-	/* MEMO_INFO_X_MEMOS */
-	_("%s currently has %d memos."),
-	/* MEMO_INFO_X_MEMOS_ONE_UNREAD */
-	_("%s currently has %d memos, of which 1 is unread."),
-	/* MEMO_INFO_X_MEMOS_SOME_UNREAD */
-	_("%s currently has %d memos, of which %d are unread."),
-	/* MEMO_INFO_X_MEMOS_ALL_UNREAD */
-	_("%s currently has %d memos; all of them are unread."),
-	/* MEMO_INFO_X_LIMIT */
-	_("%s's memo limit is %d."),
-	/* MEMO_INFO_X_HARD_LIMIT */
-	_("%s's memo limit is %d, and may not be changed."),
-	/* MEMO_INFO_X_NO_LIMIT */
-	_("%s has no memo limit."),
-	/* MEMO_INFO_X_NOTIFY_OFF */
-	_("%s is not notified of new memos."),
-	/* MEMO_INFO_X_NOTIFY_ON */
-	_("%s is notified of new memos at logon and when they arrive."),
-	/* MEMO_INFO_X_NOTIFY_RECEIVE */
-	_("%s is notified when new memos arrive."),
-	/* MEMO_INFO_X_NOTIFY_SIGNON */
-	_("%s is notified of news memos at logon."),
-	/* MEMO_MAIL_SUBJECT */
-	_("New memo"),
-	/* NICK_MAIL_TEXT */
-	_("Hi %s\n"
-	" \n"
-	"You've just received a new memo from %s. This is memo number %d.\n"
-	" \n"
-	"Memo text:\n"
-	" \n"
-	"%s"),
-	/* MEMO_RSEND_PLEASE_WAIT */
-	_("Please wait %d seconds before using the RSEND command again."),
-	/* MEMO_RSEND_DISABLED */
-	_("Sorry, RSEND has been disabled on this network."),
-	/* MEMO_RSEND_SYNTAX */
-	_("RSEND {nick | channel} memo-text"),
-	/* MEMO_RSEND_NICK_MEMO_TEXT */
-	_("[auto-memo] The memo you sent has been viewed."),
-	/* MEMO_RSEND_CHAN_MEMO_TEXT */
-	_("[auto-memo] The memo you sent to %s has been viewed."),
-	/* MEMO_RSEND_USER_NOTIFICATION */
-	_("A notification memo has been sent to %s informing him/her you have\n"
-	"read his/her memo."),
-	/* MEMO_CHECK_SYNTAX */
-	_("CHECK nickname"),
-	/* MEMO_CHECK_NOT_READ */
-	_("The last memo you sent to %s (sent on %s) has not yet been read."),
-	/* MEMO_CHECK_READ */
-	_("The last memo you sent to %s (sent on %s) has been read."),
-	/* MEMO_CHECK_NO_MEMO */
-	_("Nick %s doesn't have a memo from you."),
-	/* MEMO_NO_RSEND_SELF */
-	_("You can not request a receipt when sending a memo to yourself."),
-	/* MEMO_IGNORE_SYNTAX */
-	_("IGNORE [\037channel\037] {\002ADD|DEL|LIST\002} [\037entry\037]"),
-	/* MEMO_IGNORE_ADD */
-	_("\002%s\002 added to your ignore list."),
-	/* MEMO_IGNORE_ALREADY_IGNORED */
-	_("\002%s\002 is already on your ignore list."),
-	/* MEMO_IGNORE_DEL */
-	_("\002%s\002 removed from your ignore list."),
-	/* MEMO_IGNORE_NOT_IGNORED */
-	_("\002%s\002 is not on your ignore list."),
-	/* MEMO_IGNORE_LIST_EMPTY */
-	_("Your memo ignore list is empty."),
-	/* MEMO_IGNORE_LIST_HEADER */
-	_("Ignore list:"),
-	/* BOT_DOES_NOT_EXIST */
-	_("Bot %s does not exist."),
-	/* BOT_NOT_ASSIGNED */
-	_("You must assign a bot to the channel before using this command.\n"
-	"Type %R%S HELP ASSIGN for more information."),
-	/* BOT_NOT_ON_CHANNEL */
-	_("Bot is not on channel %s."),
-	/* BOT_REASON_BADWORD */
-	_("Don't use the word \"%s\" on this channel!"),
-	/* BOT_REASON_BADWORD_GENTLE */
-	_("Watch your language!"),
-	/* BOT_REASON_BOLD */
-	_("Don't use bolds on this channel!"),
-	/* BOT_REASON_CAPS */
-	_("Turn caps lock OFF!"),
-	/* BOT_REASON_COLOR */
-	_("Don't use colors on this channel!"),
-	/* BOT_REASON_FLOOD */
-	_("Stop flooding!"),
-	/* BOT_REASON_REPEAT */
-	_("Stop repeating yourself!"),
-	/* BOT_REASON_REVERSE */
-	_("Don't use reverses on this channel!"),
-	/* BOT_REASON_UNDERLINE */
-	_("Don't use underlines on this channel!"),
-	/* BOT_REASON_ITALIC */
-	_("Don't use italics on this channel!"),
-	/* BOT_REASON_AMSGS */
-	_("Don't use AMSGs!"),
-	/* BOT_BOT_SYNTAX */
-	_("BOT ADD nick user host real\n"
-	"BOT CHANGE oldnick newnick [user [host [real]]]\n"
-	"BOT DEL nick"),
-	/* BOT_BOT_ALREADY_EXISTS */
-	_("Bot %s already exists."),
-	/* BOT_BOT_CREATION_FAILED */
-	_("Sorry, bot creation failed."),
-	/* BOT_BOT_READONLY */
-	_("Sorry, bot modification is temporarily disabled."),
-	/* BOT_BOT_ADDED */
-	_("%s!%s@%s (%s) added to the bot list."),
-	/* BOT_BOT_ANY_CHANGES */
-	_("Old info is equal to the new one."),
-	/* BOT_BOT_CHANGED */
-	_("Bot %s has been changed to %s!%s@%s (%s)"),
-	/* BOT_BOT_DELETED */
-	_("Bot %s has been deleted."),
-	/* BOT_BOTLIST_HEADER */
-	_("Bot list:"),
-	/* BOT_BOTLIST_PRIVATE_HEADER */
-	_("Bots reserved to IRC operators:"),
-	/* BOT_BOTLIST_FOOTER */
-	_("%d bots available."),
-	/* BOT_BOTLIST_EMPTY */
-	_("There are no bots available at this time.\n"
-	"Ask a Services Operator to create one!"),
-	/* BOT_ASSIGN_SYNTAX */
-	_("ASSIGN chan nick"),
-	/* BOT_ASSIGN_READONLY */
-	_("Sorry, bot assignment is temporarily disabled."),
-	/* BOT_ASSIGN_ALREADY */
-	_("Bot %s is already assigned to channel %s."),
-	/* BOT_ASSIGN_ASSIGNED */
-	_("Bot %s has been assigned to %s."),
-	/* BOT_UNASSIGN_SYNTAX */
-	_("UNASSIGN chan"),
-	/* BOT_UNASSIGN_UNASSIGNED */
-	_("There is no bot assigned to %s anymore."),
-	/* BOT_UNASSIGN_PERSISTANT_CHAN */
-	_("You can not unassign bots while persist is set on the channel."),
-	/* BOT_INFO_SYNTAX */
-	_("INFO {chan | nick}"),
-	/* BOT_INFO_NOT_FOUND */
-	_("%s is not a valid bot or registered channel."),
-	/* BOT_INFO_BOT_HEADER */
-	_("Information for bot %s:"),
-	/* BOT_INFO_BOT_MASK */
-	_("       Mask : %s@%s"),
-	/* BOT_INFO_BOT_REALNAME */
-	_("  Real name : %s"),
-	/* BOT_INFO_BOT_CREATED */
-	_("    Created : %s"),
-	/* BOT_INFO_BOT_USAGE */
-	_("    Used on : %d channel(s)"),
-	/* BOT_INFO_BOT_OPTIONS */
-	_("    Options : %s"),
-	/* BOT_INFO_CHAN_BOT */
-	_("           Bot nick : %s"),
-	/* BOT_INFO_CHAN_BOT_NONE */
-	_("           Bot nick : not assigned yet."),
-	/* BOT_INFO_CHAN_KICK_BADWORDS */
-	_("   Bad words kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_BADWORDS_BAN */
-	_("   Bad words kicker : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_KICK_BOLDS */
-	_("       Bolds kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_BOLDS_BAN */
-	_("       Bolds kicker : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_KICK_CAPS_ON */
-	_("        Caps kicker : %s (minimum %d/%d%%)"),
-	/* BOT_INFO_CHAN_KICK_CAPS_BAN */
-	_("        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"),
-	/* BOT_INFO_CHAN_KICK_CAPS_OFF */
-	_("        Caps kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_COLORS */
-	_("      Colors kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_COLORS_BAN */
-	_("      Colors kicker : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_KICK_FLOOD_ON */
-	_("       Flood kicker : %s (%d lines in %ds)"),
-	/* BOT_INFO_CHAN_KICK_FLOOD_BAN */
-	_("       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"),
-	/* BOT_INFO_CHAN_KICK_FLOOD_OFF */
-	_("       Flood kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_REPEAT_ON */
-	_("      Repeat kicker : %s (%d times)"),
-	/* BOT_INFO_CHAN_KICK_REPEAT_BAN */
-	_("      Repeat kicker : %s (%d kick(s) to ban; %d times)"),
-	/* BOT_INFO_CHAN_KICK_REPEAT_OFF */
-	_("      Repeat kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_REVERSES */
-	_("    Reverses kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_REVERSES_BAN */
-	_("    Reverses kicker : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_KICK_UNDERLINES */
-	_("  Underlines kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_UNDERLINES_BAN */
-	_("  Underlines kicker : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_KICK_ITALICS */
-	_("     Italics kicker : %s"),
-	/* BOT_INFO_CHAN_KICK_ITALICS_BAN */
-	_("     Italics kicker : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_KICK_AMSGS */
-	_("     AMSG kicker    : %s"),
-	/* BOT_INFO_CHAN_KICK_AMSGS_BAN */
-	_("     AMSG kicker    : %s (%d kick(s) to ban)"),
-	/* BOT_INFO_CHAN_MSG */
-	_("      Fantasy reply : %s"),
-	/* BOT_INFO_ACTIVE */
-	_("enabled"),
-	/* BOT_INFO_INACTIVE */
-	_("disabled"),
-	/* BOT_INFO_CHAN_OPTIONS */
-	_("            Options : %s"),
-	/* BOT_INFO_OPT_DONTKICKOPS */
-	_("Ops protection"),
-	/* BOT_INFO_OPT_DONTKICKVOICES */
-	_("Voices protection"),
-	/* BOT_INFO_OPT_FANTASY */
-	_("Fantasy"),
-	/* BOT_INFO_OPT_GREET */
-	_("Greet"),
-	/* BOT_INFO_OPT_NOBOT */
-	_("No bot"),
-	/* BOT_INFO_OPT_SYMBIOSIS */
-	_("Symbiosis"),
-	/* BOT_INFO_OPT_NONE */
-	_("None"),
-	/* BOT_SET_SYNTAX */
-	_("SET (channel | bot) option settings"),
-	/* BOT_SET_DISABLED */
-	_("Sorry, bot option setting is temporarily disabled."),
-	/* BOT_SET_UNKNOWN */
-	_("Unknown option %s.\n"
-	"Type %R%S HELP SET for more information."),
-	/* BOT_SET_DONTKICKOPS_SYNTAX */
-	_("SET channel DONTKICKOPS {ON|OFF}"),
-	/* BOT_SET_DONTKICKOPS_ON */
-	_("Bot won't kick ops on channel %s."),
-	/* BOT_SET_DONTKICKOPS_OFF */
-	_("Bot will kick ops on channel %s."),
-	/* BOT_SET_DONTKICKVOICES_SYNTAX */
-	_("SET channel DONTKICKVOICES {ON|OFF}"),
-	/* BOT_SET_DONTKICKVOICES_ON */
-	_("Bot won't kick voices on channel %s."),
-	/* BOT_SET_DONTKICKVOICES_OFF */
-	_("Bot will kick voices on channel %s."),
-	/* BOT_SET_FANTASY_SYNTAX */
-	_("SET channel FANTASY {ON|OFF}"),
-	/* BOT_SET_FANTASY_ON */
-	_("Fantasy mode is now ON on channel %s."),
-	/* BOT_SET_FANTASY_OFF */
-	_("Fantasy mode is now OFF on channel %s."),
-	/* BOT_SET_GREET_SYNTAX */
-	_("SET channel GREET {ON|OFF}"),
-	/* BOT_SET_GREET_ON */
-	_("Greet mode is now ON on channel %s."),
-	/* BOT_SET_GREET_OFF */
-	_("Greet mode is now OFF on channel %s."),
-	/* BOT_SET_NOBOT_SYNTAX */
-	_("SET botname NOBOT {ON|OFF}"),
-	/* BOT_SET_NOBOT_ON */
-	_("No Bot mode is now ON on channel %s."),
-	/* BOT_SET_NOBOT_OFF */
-	_("No Bot mode is now OFF on channel %s."),
-	/* BOT_SET_PRIVATE_SYNTAX */
-	_("SET botname PRIVATE {ON|OFF}"),
-	/* BOT_SET_PRIVATE_ON */
-	_("Private mode of bot %s is now ON."),
-	/* BOT_SET_PRIVATE_OFF */
-	_("Private mode of bot %s is now OFF."),
-	/* BOT_SET_SYMBIOSIS_SYNTAX */
-	_("SET channel SYMBIOSIS {ON|OFF}"),
-	/* BOT_SET_SYMBIOSIS_ON */
-	_("Symbiosis mode is now ON on channel %s."),
-	/* BOT_SET_SYMBIOSIS_OFF */
-	_("Symbiosis mode is now OFF on channel %s."),
-	/* BOT_SET_MSG_SYNTAX */
-	_("SET \037channel\037 MSG {\037OFF|PRIVMSG|NOTICE|NOTICEOPS\037}"),
-	/* BOT_SET_MSG_OFF */
-	_("Fantasy replies will no longer be sent to %s."),
-	/* BOT_SET_MSG_PRIVMSG */
-	_("Fantasy replies will be sent via PRIVMSG to %s."),
-	/* BOT_SET_MSG_NOTICE */
-	_("Fantasy replies will be sent via NOTICE to %s."),
-	/* BOT_SET_MSG_NOTICEOPS */
-	_("Fantasy replies will be sent via NOTICE to channel ops on %s."),
-	/* BOT_KICK_SYNTAX */
-	_("KICK channel option {ON|OFF} [settings]"),
-	/* BOT_KICK_DISABLED */
-	_("Sorry, kicker configuration is temporarily disabled."),
-	/* BOT_KICK_UNKNOWN */
-	_("Unknown option %s.\n"
-	"Type %R%S HELP KICK for more information."),
-	/* BOT_KICK_BAD_TTB */
-	_("%s cannot be taken as times to ban."),
-	/* BOT_KICK_BADWORDS_ON */
-	_("Bot will now kick bad words. Use the BADWORDS command\n"
-	"to add or remove a bad word."),
-	/* BOT_KICK_BADWORDS_ON_BAN */
-	_("Bot will now kick bad words, and will place a ban after \n"
-	"%d kicks for the same user. Use the BADWORDS command\n"
-	"to add or remove a bad word."),
-	/* BOT_KICK_BADWORDS_OFF */
-	_("Bot won't kick bad words anymore."),
-	/* BOT_KICK_BOLDS_ON */
-	_("Bot will now kick bolds."),
-	/* BOT_KICK_BOLDS_ON_BAN */
-	_("Bot will now kick bolds, and will place a ban after \n"
-	"%d kicks for the same user."),
-	/* BOT_KICK_BOLDS_OFF */
-	_("Bot won't kick bolds anymore."),
-	/* BOT_KICK_CAPS_ON */
-	_("Bot will now kick caps (they must constitute at least\n"
-	"%d characters and %d%% of the entire message)."),
-	/* BOT_KICK_CAPS_ON_BAN */
-	_("Bot will now kick caps (they must constitute at least\n"
-	"%d characters and %d%% of the entire message), and will \n"
-	"place a ban after %d kicks for the same user."),
-	/* BOT_KICK_CAPS_OFF */
-	_("Bot won't kick caps anymore."),
-	/* BOT_KICK_COLORS_ON */
-	_("Bot will now kick colors."),
-	/* BOT_KICK_COLORS_ON_BAN */
-	_("Bot will now kick colors, and will place a ban after %d \n"
-	"kicks for the same user."),
-	/* BOT_KICK_COLORS_OFF */
-	_("Bot won't kick colors anymore."),
-	/* BOT_KICK_FLOOD_ON */
-	_("Bot will now kick flood (%d lines in %d seconds)."),
-	/* BOT_KICK_FLOOD_ON_BAN */
-	_("Bot will now kick flood (%d lines in %d seconds), and \n"
-	"will place a ban after %d kicks for the same user."),
-	/* BOT_KICK_FLOOD_OFF */
-	_("Bot won't kick flood anymore."),
-	/* BOT_KICK_REPEAT_ON */
-	_("Bot will now kick repeats (users that say %d times\n"
-	"the same thing)."),
-	/* BOT_KICK_REPEAT_ON_BAN */
-	_("Bot will now kick repeats (users that say %d times\n"
-	"the same thing), and will place a ban after %d \n"
-	"kicks for the same user."),
-	/* BOT_KICK_REPEAT_OFF */
-	_("Bot won't kick repeats anymore."),
-	/* BOT_KICK_REVERSES_ON */
-	_("Bot will now kick reverses."),
-	/* BOT_KICK_REVERSES_ON_BAN */
-	_("Bot will now kick reverses, and will place a ban after %d \n"
-	"kicks for the same user."),
-	/* BOT_KICK_REVERSES_OFF */
-	_("Bot won't kick reverses anymore."),
-	/* BOT_KICK_UNDERLINES_ON */
-	_("Bot will now kick underlines."),
-	/* BOT_KICK_UNDERLINES_ON_BAN */
-	_("Bot will now kick underlines, and will place a ban after %d \n"
-	"kicks for the same user."),
-	/* BOT_KICK_UNDERLINES_OFF */
-	_("Bot won't kick underlines anymore."),
-	/* BOT_KICK_ITALICS_ON */
-	_("Bot will now kick italics."),
-	/* BOT_KICK_ITALICS_ON_BAN */
-	_("Bot will now kick italics, and will place a ban after \n"
-	"%d kicks for the same user."),
-	/* BOT_KICK_ITALICS_OFF */
-	_("Bot won't kick italics anymore."),
-	/* BOT_KICK_AMSGS_ON */
-	_("Bot will now kick for \002amsgs\002"),
-	/* BOT_KICK_AMSGS_ON_BAN */
-	_("Bot will not kick for \002amsgs\002, and will place a ban after\n"
-	"%d kicks for the same user."),
-	/* BOT_KICK_AMSGS_OFF */
-	_("Bot won't kick for \002amsgs\002 anymore."),
-	/* BOT_BADWORDS_SYNTAX */
-	_("BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"),
-	/* BOT_BADWORDS_DISABLED */
-	_("Sorry, channel bad words list modification is temporarily disabled."),
-	/* BOT_BADWORDS_REACHED_LIMIT */
-	_("Sorry, you can only have %d bad words entries on a channel."),
-	/* BOT_BADWORDS_ALREADY_EXISTS */
-	_("%s already exists in %s bad words list."),
-	/* BOT_BADWORDS_ADDED */
-	_("%s added to %s bad words list."),
-	/* BOT_BADWORDS_NOT_FOUND */
-	_("%s not found on %s bad words list."),
-	/* BOT_BADWORDS_NO_MATCH */
-	_("No matching entries on %s bad words list."),
-	/* BOT_BADWORDS_DELETED */
-	_("%s deleted from %s bad words list."),
-	/* BOT_BADWORDS_DELETED_ONE */
-	_("Deleted 1 entry from %s bad words list."),
-	/* BOT_BADWORDS_DELETED_SEVERAL */
-	_("Deleted %d entries from %s bad words list."),
-	/* BOT_BADWORDS_LIST_EMPTY */
-	_("%s bad words list is empty."),
-	/* BOT_BADWORDS_LIST_HEADER */
-	_("Bad words list for %s:\n"
-	"  Num   Word                           Type"),
-	/* BOT_BADWORDS_LIST_FORMAT */
-	_("  %3d   %-30s %s"),
-	/* BOT_BADWORDS_CLEAR */
-	_("Bad words list is now empty."),
-	/* BOT_SAY_SYNTAX */
-	_("SAY channel text"),
-	/* BOT_ACT_SYNTAX */
-	_("ACT channel text"),
-	/* BOT_EXCEPT */
-	_("User matches channel except."),
-	/* BOT_BAD_NICK */
-	_("Bot Nicks may only contain valid nick characters."),
-	/* BOT_BAD_HOST */
-	_("Bot Hosts may only contain valid host characters."),
-	/* BOT_BAD_IDENT */
-	_("Bot Idents may only contain valid characters."),
-	/* BOT_LONG_IDENT */
-	_("Bot Idents may only contain %d characters."),
-	/* BOT_LONG_HOST */
-	_("Bot Hosts may only contain %d characters."),
-	/* OPER_BOUNCY_MODES */
-	_("Services is unable to change modes.  Are your servers configured correctly?"),
-	/* OPER_BOUNCY_MODES_U_LINE */
-	_("Services is unable to change modes.  Are your servers' U:lines configured correctly?"),
-	/* OPER_GLOBAL_SYNTAX */
-	_("GLOBAL message"),
-	/* OPER_STATS_UNKNOWN_OPTION */
-	_("Unknown STATS option %s."),
-	/* OPER_STATS_CURRENT_USERS */
-	_("Current users: %d (%d ops)"),
-	/* OPER_STATS_MAX_USERS */
-	_("Maximum users: %d (%s)"),
-	/* OPER_STATS_UPTIME_DHMS */
-	_("Services up %d days, %02d:%02d"),
-	/* OPER_STATS_UPTIME_1DHMS */
-	_("Services up %d day, %02d:%02d"),
-	/* OPER_STATS_UPTIME_HMS */
-	_("Services up %d hours, %d minutes"),
-	/* OPER_STATS_UPTIME_H1MS */
-	_("Services up %d hours, %d minute"),
-	/* OPER_STATS_UPTIME_1HMS */
-	_("Services up %d hour, %d minutes"),
-	/* OPER_STATS_UPTIME_1H1MS */
-	_("Services up %d hour, %d minute"),
-	/* OPER_STATS_UPTIME_MS */
-	_("Services up %d minutes, %d seconds"),
-	/* OPER_STATS_UPTIME_M1S */
-	_("Services up %d minutes, %d second"),
-	/* OPER_STATS_UPTIME_1MS */
-	_("Services up %d minute, %d seconds"),
-	/* OPER_STATS_UPTIME_1M1S */
-	_("Services up %d minute, %d second"),
-	/* OPER_STATS_BYTES_READ */
-	_("Bytes read    : %5d kB"),
-	/* OPER_STATS_BYTES_WRITTEN */
-	_("Bytes written : %5d kB"),
-	/* OPER_STATS_USER_MEM */
-	_("User          : %6d records, %5d kB"),
-	/* OPER_STATS_CHANNEL_MEM */
-	_("Channel       : %6d records, %5d kB"),
-	/* OPER_STATS_GROUPS_MEM */
-	_("NS Groups     : %6d records, %5d kB"),
-	/* OPER_STATS_ALIASES_MEM */
-	_("NS Aliases    : %6d records, %5d kB"),
-	/* OPER_STATS_CHANSERV_MEM */
-	_("ChanServ      : %6d records, %5d kB"),
-	/* OPER_STATS_BOTSERV_MEM */
-	_("BotServ       : %6d records, %5d kB"),
-	/* OPER_STATS_HOSTSERV_MEM */
-	_("HostServ      : %6d records, %5d kB"),
-	/* OPER_STATS_OPERSERV_MEM */
-	_("OperServ      : %6d records, %5d kB"),
-	/* OPER_STATS_SESSIONS_MEM */
-	_("Sessions      : %6d records, %5d kB"),
-	/* OPER_STATS_AKILL_COUNT */
-	_("Current number of AKILLs: %d"),
-	/* OPER_STATS_AKILL_EXPIRE_DAYS */
-	_("Default AKILL expiry time: %d days"),
-	/* OPER_STATS_AKILL_EXPIRE_DAY */
-	_("Default AKILL expiry time: 1 day"),
-	/* OPER_STATS_AKILL_EXPIRE_HOURS */
-	_("Default AKILL expiry time: %d hours"),
-	/* OPER_STATS_AKILL_EXPIRE_HOUR */
-	_("Default AKILL expiry time: 1 hour"),
-	/* OPER_STATS_AKILL_EXPIRE_MINS */
-	_("Default AKILL expiry time: %d minutes"),
-	/* OPER_STATS_AKILL_EXPIRE_MIN */
-	_("Default AKILL expiry time: 1 minute"),
-	/* OPER_STATS_AKILL_EXPIRE_NONE */
-	_("Default AKILL expiry time: No expiration"),
-	/* OPER_STATS_SNLINE_COUNT */
-	_("Current number of SNLINEs: %d"),
-	/* OPER_STATS_SNLINE_EXPIRE_DAYS */
-	_("Default SNLINE expiry time: %d days"),
-	/* OPER_STATS_SNLINE_EXPIRE_DAY */
-	_("Default SNLINE expiry time: 1 day"),
-	/* OPER_STATS_SNLINE_EXPIRE_HOURS */
-	_("Default SNLINE expiry time: %d hours"),
-	/* OPER_STATS_SNLINE_EXPIRE_HOUR */
-	_("Default SNLINE expiry time: 1 hour"),
-	/* OPER_STATS_SNLINE_EXPIRE_MINS */
-	_("Default SNLINE expiry time: %d minutes"),
-	/* OPER_STATS_SNLINE_EXPIRE_MIN */
-	_("Default SNLINE expiry time: 1 minute"),
-	/* OPER_STATS_SNLINE_EXPIRE_NONE */
-	_("Default SNLINE expiry time: No expiration"),
-	/* OPER_STATS_SQLINE_COUNT */
-	_("Current number of SQLINEs: %d"),
-	/* OPER_STATS_SQLINE_EXPIRE_DAYS */
-	_("Default SQLINE expiry time: %d days"),
-	/* OPER_STATS_SQLINE_EXPIRE_DAY */
-	_("Default SQLINE expiry time: 1 day"),
-	/* OPER_STATS_SQLINE_EXPIRE_HOURS */
-	_("Default SQLINE expiry time: %d hours"),
-	/* OPER_STATS_SQLINE_EXPIRE_HOUR */
-	_("Default SQLINE expiry time: 1 hour"),
-	/* OPER_STATS_SQLINE_EXPIRE_MINS */
-	_("Default SQLINE expiry time: %d minutes"),
-	/* OPER_STATS_SQLINE_EXPIRE_MIN */
-	_("Default SQLINE expiry time: 1 minute"),
-	/* OPER_STATS_SQLINE_EXPIRE_NONE */
-	_("Default SQLINE expiry time: No expiration"),
-	/* OPER_STATS_SZLINE_COUNT */
-	_("Current number of SZLINEs: %d"),
-	/* OPER_STATS_SZLINE_EXPIRE_DAYS */
-	_("Default SZLINE expiry time: %d days"),
-	/* OPER_STATS_SZLINE_EXPIRE_DAY */
-	_("Default SZLINE expiry time: 1 day"),
-	/* OPER_STATS_SZLINE_EXPIRE_HOURS */
-	_("Default SZLINE expiry time: %d hours"),
-	/* OPER_STATS_SZLINE_EXPIRE_HOUR */
-	_("Default SZLINE expiry time: 1 hour"),
-	/* OPER_STATS_SZLINE_EXPIRE_MINS */
-	_("Default SZLINE expiry time: %d minutes"),
-	/* OPER_STATS_SZLINE_EXPIRE_MIN */
-	_("Default SZLINE expiry time: 1 minute"),
-	/* OPER_STATS_SZLINE_EXPIRE_NONE */
-	_("Default SZLINE expiry time: No expiration"),
-	/* OPER_STATS_RESET */
-	_("Statistics reset."),
-	/* OPER_STATS_UPLINK_SERVER */
-	_("Uplink server: %s"),
-	/* OPER_STATS_UPLINK_CAPAB */
-	_("Uplink capab: %s"),
-	/* OPER_STATS_UPLINK_SERVER_COUNT */
-	_("Servers found: %d"),
-	/* OPER_MODE_SYNTAX */
-	_("MODE channel modes"),
-	/* OPER_UMODE_SYNTAX */
-	_("UMODE nick modes"),
-	/* OPER_UMODE_SUCCESS */
-	_("Changed usermodes of %s."),
-	/* OPER_UMODE_CHANGED */
-	_("%s changed your usermodes."),
-	/* OPER_OLINE_SYNTAX */
-	_("OLINE nick flags"),
-	/* OPER_OLINE_SUCCESS */
-	_("Operflags %s have been added for %s."),
-	/* OPER_OLINE_IRCOP */
-	_("You are now an IRC Operator."),
-	/* OPER_KICK_SYNTAX */
-	_("KICK channel user reason"),
-	/* OPER_SVSNICK_SYNTAX */
-	_("SVSNICK nick newnick "),
-	/* OPER_SVSNICK_NEWNICK */
-	_("The nick %s is now being changed to %s."),
-	/* OPER_AKILL_SYNTAX */
-	_("AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {\037nick\037 | mask | entry-list} [reason]]"),
-	/* OPER_AKILL_EXISTS */
-	_("%s already exists on the AKILL list."),
-	/* OPER_ALREADY_COVERED */
-	_("%s is already covered by %s."),
-	/* OPER_AKILL_NO_NICK */
-	_("Reminder: AKILL masks cannot contain nicknames; make sure you have not included a nick portion in your mask."),
-	/* OPER_AKILL_ADDED */
-	_("%s added to the AKILL list."),
-	/* OPER_EXPIRY_CHANGED */
-	_("Expiry time of %s changed."),
-	/* OPER_AKILL_NOT_FOUND */
-	_("%s not found on the AKILL list."),
-	/* OPER_AKILL_NO_MATCH */
-	_("No matching entries on the AKILL list."),
-	/* OPER_AKILL_DELETED */
-	_("%s deleted from the AKILL list."),
-	/* OPER_AKILL_DELETED_ONE */
-	_("Deleted 1 entry from the AKILL list."),
-	/* OPER_AKILL_DELETED_SEVERAL */
-	_("Deleted %d entries from the AKILL list."),
-	/* OPER_LIST_EMPTY */
-	_("AKILL list is empty."),
-	/* OPER_AKILL_LIST_HEADER */
-	_("Current AKILL list:\n"
-	"  Num   Mask                              Reason"),
-	/* OPER_LIST_FORMAT */
-	_("  %3d   %-32s  %s"),
-	/* OPER_AKILL_VIEW_HEADER */
-	_("Current AKILL list:"),
-	/* OPER_VIEW_FORMAT */
-	_("%3d  %s (by %s on %s; %s)\n"
-	"      %s"),
-	/* OPER_AKILL_CLEAR */
-	_("The AKILL list has been cleared."),
-	/* OPER_CHANKILL_SYNTAX */
-	_("CHANKILL [+expiry] {#channel} [reason]"),
-	/* OPER_SNLINE_SYNTAX */
-	_("SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:reason]]"),
-	/* OPER_SNLINE_EXISTS */
-	_("%s already exists on the SNLINE list."),
-	/* OPER_SNLINE_ADDED */
-	_("%s added to the SNLINE list."),
-	/* OPER_SNLINE_NOT_FOUND */
-	_("%s not found on the SNLINE list."),
-	/* OPER_SNLINE_NO_MATCH */
-	_("No matching entries on the SNLINE list."),
-	/* OPER_SNLINE_DELETED */
-	_("%s deleted from the SNLINE list."),
-	/* OPER_SNLINE_DELETED_ONE */
-	_("Deleted 1 entry from the SNLINE list."),
-	/* OPER_SNLINE_DELETED_SEVERAL */
-	_("Deleted %d entries from the SNLINE list."),
-	/* OPER_SNLINE_LIST_EMPTY */
-	_("SNLINE list is empty."),
-	/* OPER_SNLINE_LIST_HEADER */
-	_("Current SNLINE list:\n"
-	"  Num   Mask                              Reason"),
-	/* OPER_SNLINE_VIEW_HEADER */
-	_("Current SNLINE list:"),
-	/* OPER_SNLINE_CLEAR */
-	_("The SNLINE list has been cleared."),
-	/* OPER_SQLINE_SYNTAX */
-	_("SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {\037nick\037 | mask | entry-list} [reason]]"),
-	/* OPER_SQLINE_CHANNELS_UNSUPPORTED */
-	_("Channel SQLINEs are not supported by your IRCd, so you can't use them."),
-	/* OPER_SQLINE_EXISTS */
-	_("%s already exists on the SQLINE list."),
-	/* OPER_SQLINE_ADDED */
-	_("%s added to the SQLINE list."),
-	/* OPER_SQLINE_NOT_FOUND */
-	_("%s not found on the SQLINE list."),
-	/* OPER_SQLINE_NO_MATCH */
-	_("No matching entries on the SQLINE list."),
-	/* OPER_SQLINE_DELETED */
-	_("%s deleted from the SQLINE list."),
-	/* OPER_SQLINE_DELETED_ONE */
-	_("Deleted 1 entry from the SQLINE list."),
-	/* OPER_SQLINE_DELETED_SEVERAL */
-	_("Deleted %d entries from the SQLINE list."),
-	/* OPER_SQLINE_LIST_EMPTY */
-	_("SQLINE list is empty."),
-	/* OPER_SQLINE_LIST_HEADER */
-	_("Current SQLINE list:\n"
-	"  Num   Mask                              Reason"),
-	/* OPER_SQLINE_VIEW_HEADER */
-	_("Current SQLINE list:"),
-	/* OPER_SQLINE_CLEAR */
-	_("The SQLINE list has been cleared."),
-	/* OPER_SZLINE_SYNTAX */
-	_("SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {\037nick\037 | mask | entry-list} [reason]]"),
-	/* OPER_SZLINE_EXISTS */
-	_("%s already exists on the SZLINE list."),
-	/* OPER_SZLINE_ONLY_IPS */
-	_("Reminder: you can only add IP masks to the SZLINE list."),
-	/* OPER_SZLINE_ADDED */
-	_("%s added to the SZLINE list."),
-	/* OPER_SZLINE_NOT_FOUND */
-	_("%s not found on the SZLINE list."),
-	/* OPER_SZLINE_NO_MATCH */
-	_("No matching entries on the SZLINE list."),
-	/* OPER_SZLINE_DELETED */
-	_("%s deleted from the SZLINE list."),
-	/* OPER_SZLINE_DELETED_ONE */
-	_("Deleted 1 entry from the SZLINE list."),
-	/* OPER_SZLINE_DELETED_SEVERAL */
-	_("Deleted %d entries from the SZLINE list."),
-	/* OPER_SZLINE_LIST_EMPTY */
-	_("SZLINE list is empty."),
-	/* OPER_SZLINE_LIST_HEADER */
-	_("Current SZLINE list:\n"
-	"  Num   Mask                              Reason"),
-	/* OPER_SZLINE_VIEW_HEADER */
-	_("Current SZLINE list:"),
-	/* OPER_SZLINE_CLEAR */
-	_("The SZLINE list has been cleared."),
-	/* OPER_SET_SYNTAX */
-	_("SET option setting"),
-	/* OPER_SET_READONLY_ON */
-	_("Services are now in read-only mode."),
-	/* OPER_SET_READONLY_OFF */
-	_("Services are now in read-write mode."),
-	/* OPER_SET_READONLY_ERROR */
-	_("Setting for READONLY must be ON or OFF."),
-	/* OPER_SET_DEBUG_ON */
-	_("Services are now in debug mode."),
-	/* OPER_SET_DEBUG_OFF */
-	_("Services are now in non-debug mode."),
-	/* OPER_SET_DEBUG_LEVEL */
-	_("Services are now in debug mode (level %d)."),
-	/* OPER_SET_DEBUG_ERROR */
-	_("Setting for DEBUG must be ON, OFF, or a positive number."),
-	/* OPER_SET_NOEXPIRE_ON */
-	_("Services are now in no expire mode."),
-	/* OPER_SET_NOEXPIRE_OFF */
-	_("Services are now in expire mode."),
-	/* OPER_SET_NOEXPIRE_ERROR */
-	_("Setting for NOEXPIRE must be ON or OFF."),
-	/* OPER_SET_UNKNOWN_OPTION */
-	_("Unknown option %s."),
-	/* OPER_SET_LIST_OPTION_ON */
-	_("%s is enabled"),
-	/* OPER_SET_LIST_OPTION_OFF */
-	_("%s is disabled"),
-	/* OPER_NOOP_SYNTAX */
-	_("NOOP {SET|REVOKE} server"),
-	/* OPER_NOOP_SET */
-	_("All O:lines of %s have been removed."),
-	/* OPER_NOOP_REVOKE */
-	_("All O:lines of %s have been reset."),
-	/* OPER_JUPE_SYNTAX */
-	_("JUPE servername [reason]"),
-	/* OPER_JUPE_HOST_ERROR */
-	_("Please use a valid server name when juping"),
-	/* OPER_JUPE_INVALID_SERVER */
-	_("You can not jupe your services server or your uplink server."),
-	/* OPER_UPDATING */
-	_("Updating databases."),
-	/* OPER_RELOAD */
-	_("Services' configuration file has been reloaded."),
-	/* OPER_IGNORE_SYNTAX */
-	_("IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"),
-	/* OPER_IGNORE_VALID_TIME */
-	_("You have to enter a valid number as time."),
-	/* OPER_IGNORE_TIME_DONE */
-	_("%s will now be ignored for %s."),
-	/* OPER_IGNORE_PERM_DONE */
-	_("%s will now permanently be ignored."),
-	/* OPER_IGNORE_DEL_DONE */
-	_("%s will no longer be ignored."),
-	/* OPER_IGNORE_LIST */
-	_("Services ignore list:\n"
-	"  Mask        Creator      Reason      Expires"),
-	/* OPER_IGNORE_LIST_NOMATCH */
-	_("Nick %s not found on ignore list."),
-	/* OPER_IGNORE_LIST_EMPTY */
-	_("Ignore list is empty."),
-	/* OPER_IGNORE_LIST_CLEARED */
-	_("Ignore list has been cleared."),
-	/* OPER_CHANLIST_HEADER */
-	_("Channel list:\n"
-	"Name                 Users Modes   Topic"),
-	/* OPER_CHANLIST_HEADER_USER */
-	_("%s channel list:\n"
-	"Name                 Users Modes   Topic"),
-	/* OPER_CHANLIST_RECORD */
-	_("%-20s  %4d +%-6s %s"),
-	/* OPER_CHANLIST_END */
-	_("End of channel list."),
-	/* OPER_USERLIST_HEADER */
-	_("Users list:\n"
-	"Nick                 Mask"),
-	/* OPER_USERLIST_HEADER_CHAN */
-	_("%s users list:\n"
-	"Nick                 Mask"),
-	/* OPER_USERLIST_RECORD */
-	_("%-20s %s@%s"),
-	/* OPER_USERLIST_END */
-	_("End of users list."),
-	/* OPER_SUPER_ADMIN_ON */
-	_("You are now a SuperAdmin"),
-	/* OPER_SUPER_ADMIN_OFF */
-	_("You are no longer a SuperAdmin"),
-	/* OPER_SUPER_ADMIN_SYNTAX */
-	_("Setting for SuperAdmin must be ON or OFF (must be enabled in services.conf)"),
-	/* OPER_SUPER_ADMIN_WALL_ON */
-	_("%s is now a Super-Admin"),
-	/* OPER_SUPER_ADMIN_WALL_OFF */
-	_("%s is no longer a Super-Admin"),
-	/* OPER_STAFF_LIST_HEADER */
-	_("On Level Nick"),
-	/* OPER_STAFF_FORMAT */
-	_(" %c %s  %s"),
-	/* OPER_STAFF_AFORMAT */
-	_(" %c %s  %s [%s]"),
-	/* OPER_DEFCON_SYNTAX */
-	_("DEFCON [1|2|3|4|5]"),
-	/* OPER_DEFCON_DENIED */
-	_("Services are in Defcon mode, Please try again later."),
-	/* OPER_DEFCON_CHANGED */
-	_("Services are now at DEFCON %d"),
-	/* OPER_DEFCON_WALL */
-	_("%s Changed the DEFCON level to %d"),
-	/* DEFCON_GLOBAL */
-	_("The Defcon Level is now at Level: %d"),
-	/* OPER_MODULE_LOADED */
-	_("Module %s loaded"),
-	/* OPER_MODULE_UNLOADED */
-	_("Module %s unloaded"),
-	/* OPER_MODULE_RELOADED */
-	_("Module \002%s\002 reloaded"),
-	/* OPER_MODULE_LOAD_FAIL */
-	_("Unable to load module %s"),
-	/* OPER_MODULE_REMOVE_FAIL */
-	_("Unable to remove module %s"),
-	/* OPER_MODULE_NO_UNLOAD */
-	_("This module can not be unloaded."),
-	/* OPER_MODULE_ALREADY_LOADED */
-	_("Module %s is already loaded."),
-	/* OPER_MODULE_ISNT_LOADED */
-	_("Module %s isn't loaded."),
-	/* OPER_MODULE_LOAD_SYNTAX */
-	_("MODLOAD FileName"),
-	/* OPER_MODULE_UNLOAD_SYNTAX */
-	_("MODUNLOAD FileName"),
-	/* OPER_MODULE_RELOAD_SYNTAX */
-	_("MODRELOAD \037FileName\037"),
-	/* OPER_MODULE_LIST_HEADER */
-	_("Current Module list:"),
-	/* OPER_MODULE_LIST */
-	_("Module: %s [%s] [%s]"),
-	/* OPER_MODULE_LIST_FOOTER */
-	_("%d Modules loaded."),
-	/* OPER_MODULE_INFO_LIST */
-	_("Module: %s Version: %s Author: %s loaded: %s"),
-	/* OPER_MODULE_CMD_LIST */
-	_("Providing command: %R%s %s"),
-	/* OPER_MODULE_NO_LIST */
-	_("No modules currently loaded"),
-	/* OPER_MODULE_NO_INFO */
-	_("No information about module %s is available"),
-	/* OPER_MODULE_INFO_SYNTAX */
-	_("MODINFO FileName"),
-	/* OPER_EXCEPTION_SYNTAX */
-	_("EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"),
-	/* OPER_EXCEPTION_DISABLED */
-	_("Session limiting is disabled."),
-	/* OPER_EXCEPTION_ADDED */
-	_("Session limit for %s set to %d."),
-	/* OPER_EXCEPTION_MOVED */
-	_("Exception for %s (#%d) moved to position %d."),
-	/* OPER_EXCEPTION_NOT_FOUND */
-	_("%s not found on session-limit exception list."),
-	/* OPER_EXCEPTION_NO_MATCH */
-	_("No matching entries on session-limit exception list."),
-	/* OPER_EXCEPTION_DELETED */
-	_("%s deleted from session-limit exception list."),
-	/* OPER_EXCEPTION_DELETED_ONE */
-	_("Deleted 1 entry from session-limit exception list."),
-	/* OPER_EXCEPTION_DELETED_SEVERAL */
-	_("Deleted %d entries from session-limit exception list."),
-	/* OPER_EXCEPTION_LIST_HEADER */
-	_("Current Session Limit Exception list:"),
-	/* OPER_EXCEPTION_LIST_FORMAT */
-	_("%3d  %4d   %s"),
-	/* OPER_EXCEPTION_LIST_COLHEAD */
-	_("Num  Limit  Host"),
-	/* OPER_EXCEPTION_VIEW_FORMAT */
-	_("%3d.  %s  (by %s on %s; %s)\n"
-	"    Limit: %-4d  - %s"),
-	/* OPER_EXCEPTION_INVALID_LIMIT */
-	_("Invalid session limit. It must be a valid integer greater than or equal to zero and less than %d."),
-	/* OPER_EXCEPTION_INVALID_HOSTMASK */
-	_("Invalid hostmask. Only real hostmasks are valid as exceptions are not matched against nicks or usernames."),
-	/* OPER_EXCEPTION_EXISTS */
-	_("%s already exists on the EXCEPTION list."),
-	/* OPER_EXCEPTION_CHANGED */
-	_("Exception for %s has been updated to %d."),
-	/* OPER_SESSION_LIST_SYNTAX */
-	_("SESSION LIST limit"),
-	/* OPER_SESSION_INVALID_THRESHOLD */
-	_("Invalid threshold value. It must be a valid integer greater than 1."),
-	/* OPER_SESSION_NOT_FOUND */
-	_("%s not found on session list."),
-	/* OPER_SESSION_LIST_HEADER */
-	_("Hosts with at least %d sessions:"),
-	/* OPER_SESSION_LIST_COLHEAD */
-	_("Sessions  Host"),
-	/* OPER_SESSION_LIST_FORMAT */
-	_("%6d    %s"),
-	/* OPER_SESSION_VIEW_FORMAT */
-	_("The host %s currently has %d sessions with a limit of %d."),
-	/* OPER_HELP_EXCEPTION */
-	_("Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
-	"        EXCEPTION DEL {mask | list}\n"
-	"        EXCEPTION MOVE num position\n"
-	"        EXCEPTION LIST [mask | list]\n"
-	"        EXCEPTION VIEW [mask | list]\n"
-	" \n"
-	"Allows Services Operators to manipulate the list of hosts that\n"
-	"have specific session limits - allowing certain machines, \n"
-	"such as shell servers, to carry more than the default number\n"
-	"of clients at a time. Once a host reaches its session limit,\n"
-	"all clients attempting to connect from that host will be\n"
-	"killed. Before the user is killed, they are notified, via a\n"
-	"/NOTICE from %S, of a source of help regarding session\n"
-	"limiting. The content of this notice is a config setting.\n"
-	" \n"
-	"EXCEPTION ADD adds the given host mask to the exception list.\n"
-	"Note that nick!user@host and user@host masks are invalid!\n"
-	"Only real host masks, such as box.host.dom and *.host.dom,\n"
-	"are allowed because sessions limiting does not take nick or\n"
-	"user names into account. limit must be a number greater than\n"
-	"or equal to zero. This determines how many sessions this host\n"
-	"may carry at a time. A value of zero means the host has an\n"
-	"unlimited session limit. See the AKILL help for details about\n"
-	"the format of the optional expiry parameter.\n"
-	"EXCEPTION DEL removes the given mask from the exception list.\n"
-	"EXCEPTION MOVE moves exception num to position. The\n"
-	"exceptions inbetween will be shifted up or down to fill the gap.\n"
-	"EXCEPTION LIST and EXCEPTION VIEW show all current\n"
-	"exceptions; if the optional mask is given, the list is limited\n"
-	"to those exceptions matching the mask. The difference is that\n"
-	"EXCEPTION VIEW is more verbose, displaying the name of the\n"
-	"person who added the exception, its session limit, reason, \n"
-	"host mask and the expiry date and time.\n"
-	" \n"
-	"Note that a connecting client will \"use\" the first exception\n"
-	"their host matches. Large exception lists and widely matching\n"
-	"exception masks are likely to degrade services' performance."),
-	/* OPER_HELP_SESSION */
-	_("Syntax: SESSION LIST threshold\n"
-	"        SESSION VIEW host\n"
-	" \n"
-	"Allows Services Operators to view the session list.\n"
-	"SESSION LIST lists hosts with at least threshold sessions.\n"
-	"The threshold must be a number greater than 1. This is to \n"
-	"prevent accidental listing of the large number of single \n"
-	"session hosts.\n"
-	"SESSION VIEW displays detailed information about a specific\n"
-	"host - including the current session count and session limit.\n"
-	"The host value may not include wildcards.\n"
-	"See the EXCEPTION help for more information about session\n"
-	"limiting and how to set session limits specific to certain\n"
-	"hosts and groups thereof."),
-	/* OPER_HELP_STAFF */
-	_("Syntax: STAFF\n"
-	"Displays all Services Staff nicks along with level\n"
-	"and on-line status."),
-	/* OPER_HELP_DEFCON */
-	_("Syntax: DEFCON [1|2|3|4|5]\n"
-	"The defcon system can be used to implement a pre-defined\n"
-	"set of restrictions to services useful during an attempted\n"
-	"attack on the network."),
-	/* OPER_HELP_DEFCON_NO_NEW_CHANNELS */
-	_("* No new channel registrations"),
-	/* OPER_HELP_DEFCON_NO_NEW_NICKS */
-	_("* No new nick registrations"),
-	/* OPER_HELP_DEFCON_NO_MLOCK_CHANGE */
-	_("* No MLOCK changes"),
-	/* OPER_HELP_DEFCON_FORCE_CHAN_MODES */
-	_("* Force Chan Modes (%s) to be set on all channels"),
-	/* OPER_HELP_DEFCON_REDUCE_SESSION */
-	_("* Use the reduced session limit of %d"),
-	/* OPER_HELP_DEFCON_NO_NEW_CLIENTS */
-	_("* Kill any NEW clients connecting"),
-	/* OPER_HELP_DEFCON_OPER_ONLY */
-	_("* Ignore any non-opers with message"),
-	/* OPER_HELP_DEFCON_SILENT_OPER_ONLY */
-	_("* Silently ignore non-opers"),
-	/* OPER_HELP_DEFCON_AKILL_NEW_CLIENTS */
-	_("* AKILL any new clients connecting"),
-	/* OPER_HELP_DEFCON_NO_NEW_MEMOS */
-	_("* No new memos sent"),
-	/* OPER_HELP_CHANKILL */
-	_("Syntax: CHANKILL [+expiry] channel reason\n"
-	"Puts an AKILL for every nick on the specified channel. It\n"
-	"uses the entire and complete real ident@host for every nick,\n"
-	"then enforces the AKILL."),
-	/* NEWS_LOGON_TEXT */
-	_("[Logon News - %s] %s"),
-	/* NEWS_OPER_TEXT */
-	_("[Oper News - %s] %s"),
-	/* NEWS_RANDOM_TEXT */
-	_("[Random News - %s] %s"),
-	/* NEWS_LOGON_SYNTAX */
-	_("LOGONNEWS {ADD|DEL|LIST} [text|num]"),
-	/* NEWS_LOGON_LIST_HEADER */
-	_("Logon news items:"),
-	/* NEWS_LIST_ENTRY */
-	_("%5d (%s by %s)\n"
-	"    %s"),
-	/* NEWS_LOGON_LIST_NONE */
-	_("There is no logon news."),
-	/* NEWS_LOGON_ADD_SYNTAX */
-	_("Syntax: LOGONNEWS ADD text"),
-	/* NEWS_ADD_FULL */
-	_("News list is full!"),
-	/* NEWS_LOGON_ADDED */
-	_("Added new logon news item (#%d)."),
-	/* NEWS_LOGON_DEL_SYNTAX */
-	_("Syntax: LOGONNEWS DEL {num | ALL}"),
-	/* NEWS_LOGON_DEL_NOT_FOUND */
-	_("Logon news item #%d not found!"),
-	/* NEWS_LOGON_DELETED */
-	_("Logon news item #%d deleted."),
-	/* NEWS_LOGON_DEL_NONE */
-	_("No logon news items to delete!"),
-	/* NEWS_LOGON_DELETED_ALL */
-	_("All logon news items deleted."),
-	/* NEWS_OPER_SYNTAX */
-	_("OPERNEWS {ADD|DEL|LIST} [text|num]"),
-	/* NEWS_OPER_LIST_HEADER */
-	_("Oper news items:"),
-	/* NEWS_OPER_LIST_NONE */
-	_("There is no oper news."),
-	/* NEWS_OPER_ADD_SYNTAX */
-	_("Syntax: OPERNEWS ADD text"),
-	/* NEWS_OPER_ADDED */
-	_("Added new oper news item (#%d)."),
-	/* NEWS_OPER_DEL_SYNTAX */
-	_("Syntax: OPERNEWS DEL {num | ALL}"),
-	/* NEWS_OPER_DEL_NOT_FOUND */
-	_("Oper news item #%d not found!"),
-	/* NEWS_OPER_DELETED */
-	_("Oper news item #%d deleted."),
-	/* NEWS_OPER_DEL_NONE */
-	_("No oper news items to delete!"),
-	/* NEWS_OPER_DELETED_ALL */
-	_("All oper news items deleted."),
-	/* NEWS_RANDOM_SYNTAX */
-	_("RANDOMNEWS {ADD|DEL|LIST} [text|num]"),
-	/* NEWS_RANDOM_LIST_HEADER */
-	_("Random news items:"),
-	/* NEWS_RANDOM_LIST_NONE */
-	_("There is no random news."),
-	/* NEWS_RANDOM_ADD_SYNTAX */
-	_("Syntax: RANDOMNEWS ADD text"),
-	/* NEWS_RANDOM_ADDED */
-	_("Added new random news item (#%d)."),
-	/* NEWS_RANDOM_DEL_SYNTAX */
-	_("Syntax: RANDOMNEWS DEL {num | ALL}"),
-	/* NEWS_RANDOM_DEL_NOT_FOUND */
-	_("Random news item #%d not found!"),
-	/* NEWS_RANDOM_DELETED */
-	_("Random news item #%d deleted."),
-	/* NEWS_RANDOM_DEL_NONE */
-	_("No random news items to delete!"),
-	/* NEWS_RANDOM_DELETED_ALL */
-	_("All random news items deleted."),
-	/* NEWS_HELP_LOGON */
-	_("Syntax: LOGONNEWS ADD text\n"
-	"        LOGONNEWS DEL {num | ALL}\n"
-	"        LOGONNEWS LIST\n"
-	" \n"
-	"Edits or displays the list of logon news messages.  When a\n"
-	"user connects to the network, these messages will be sent\n"
-	"to them.  (However, no more than %d messages will be\n"
-	"sent in order to avoid flooding the user.  If there are\n"
-	"more news messages, only the most recent will be sent.)\n"
-	"NewsCount can be configured in services.conf.\n"
-	" \n"
-	"LOGONNEWS may only be used by Services Operators."),
-	/* NEWS_HELP_OPER */
-	_("Syntax: OPERNEWS ADD text\n"
-	"        OPERNEWS DEL {num | ALL}\n"
-	"        OPERNEWS LIST\n"
-	" \n"
-	"Edits or displays the list of oper news messages.  When a\n"
-	"user opers up (with the /OPER command), these messages will\n"
-	"be sent to them.  (However, no more than %d messages will\n"
-	"be sent in order to avoid flooding the user.  If there are\n"
-	"more news messages, only the most recent will be sent.)\n"
-	"NewsCount can be configured in services.conf.\n"
-	" \n"
-	"OPERNEWS may only be used by Services Operators."),
-	/* NEWS_HELP_RANDOM */
-	_("Syntax: RANDOMNEWS ADD text\n"
-	"        RANDOMNEWS DEL {num | ALL}\n"
-	"        RANDOMNEWS LIST\n"
-	" \n"
-	"Edits or displays the list of random news messages.  When a\n"
-	"user connects to the network, one (and only one) of the\n"
-	"random news will be randomly chosen and sent to them.\n"
-	" \n"
-	"RANDOMNEWS may only be used by Services Operators."),
-	/* NICK_HELP_CMD_CONFIRM */
-	_("    CONFIRM    Confirm a nickserv auth code"),
-	/* NICK_HELP_CMD_RESEND */
-	_("    RESEND     Resend a nickserv auth code"),
-	/* NICK_HELP_CMD_REGISTER */
-	_("    REGISTER   Register a nickname"),
-	/* NICK_HELP_CMD_GROUP */
-	_("    GROUP      Join a group"),
-	/* NICK_HELP_CMD_UNGROUP */
-	_("    UNGROUP    Remove a nick from a group"),
-	/* NICK_HELP_CMD_IDENTIFY */
-	_("    IDENTIFY   Identify yourself with your password"),
-	/* NICK_HELP_CMD_ACCESS */
-	_("    ACCESS     Modify the list of authorized addresses"),
-	/* NICK_HELP_CMD_SET */
-	_("    SET        Set options, including kill protection"),
-	/* NICK_HELP_CMD_SASET */
-	_("    SASET      Set SET-options on another nickname"),
-	/* NICK_HELP_CMD_DROP */
-	_("    DROP       Cancel the registration of a nickname"),
-	/* NICK_HELP_CMD_RECOVER */
-	_("    RECOVER    Kill another user who has taken your nick"),
-	/* NICK_HELP_CMD_RELEASE */
-	_("    RELEASE    Regain custody of your nick after RECOVER"),
-	/* NICK_HELP_CMD_SENDPASS */
-	_("    SENDPASS   Forgot your password? Try this"),
-	/* NICK_HELP_CMD_RESETPASS */
-	_("    RESETPASS  Helps you reset lost passwords"),
-	/* NICK_HELP_CMD_GHOST */
-	_("    GHOST      Disconnects a \"ghost\" IRC session using your nick"),
-	/* NICK_HELP_CMD_ALIST */
-	_("    ALIST      List channels you have access on"),
-	/* NICK_HELP_CMD_GLIST */
-	_("    GLIST      Lists all nicknames in your group"),
-	/* NICK_HELP_CMD_INFO */
-	_("    INFO       Displays information about a given nickname"),
-	/* NICK_HELP_CMD_LIST */
-	_("    LIST       List all registered nicknames that match a given pattern"),
-	/* NICK_HELP_CMD_LOGOUT */
-	_("    LOGOUT     Reverses the effect of the IDENTIFY command"),
-	/* NICK_HELP_CMD_STATUS */
-	_("    STATUS     Returns the owner status of the given nickname"),
-	/* NICK_HELP_CMD_UPDATE */
-	_("    UPDATE     Updates your current status, i.e. it checks for new memos"),
-	/* NICK_HELP_CMD_GETPASS */
-	_("    GETPASS    Retrieve the password for a nickname"),
-	/* NICK_HELP_CMD_GETEMAIL */
-	_("    GETEMAIL   Matches and returns all users that registered using given email"),
-	/* NICK_HELP_CMD_FORBID */
-	_("    FORBID     Prevents a nickname from being registered"),
-	/* NICK_HELP_CMD_SUSPEND */
-	_("    SUSPEND    Suspend a given nick"),
-	/* NICK_HELP_CMD_UNSUSPEND */
-	_("    UNSUSPEND  Unsuspend a given nick"),
-	/* NICK_HELP_CMD_AJOIN */
-	_("    AJOIN      Manage your auto join list"),
-	/* NICK_HELP */
-	_("%S allows you to \"register\" a nickname and\n"
-	"prevent others from using it. The following\n"
-	"commands allow for registration and maintenance of\n"
-	"nicknames; to use them, type %R%S command.\n"
-	"For more information on a specific command, type\n"
-	"%R%S HELP command."),
-	/* NICK_HELP_FOOTER */
-	_(" \n"
-	"NOTICE: This service is intended to provide a way for\n"
-	"IRC users to ensure their identity is not compromised.\n"
-	"It is NOT intended to facilitate \"stealing\" of\n"
-	"nicknames or other malicious actions. Abuse of %S\n"
-	"will result in, at minimum, loss of the abused\n"
-	"nickname(s)."),
-	/* NICK_HELP_EXPIRES */
-	_("Nicknames that are not used anymore are subject to \n"
-	"the automatic expiration, i.e. they will be deleted\n"
-	"after %d days if not used."),
-	/* NICK_HELP_REGISTER */
-	_("Syntax: REGISTER password [email]\n"
-	" \n"
-	"Registers your nickname in the %S database. Once\n"
-	"your nick is registered, you can use the SET and ACCESS\n"
-	"commands to configure your nick's settings as you like\n"
-	"them. Make sure you remember the password you use when\n"
-	"registering - you'll need it to make changes to your nick\n"
-	"later. (Note that case matters! ANOPE, Anope, and \n"
-	"anope are all different passwords!)\n"
-	" \n"
-	"Guidelines on choosing passwords:\n"
-	" \n"
-	"Passwords should not be easily guessable. For example,\n"
-	"using your real name as a password is a bad idea. Using\n"
-	"your nickname as a password is a much worse idea ;) and,\n"
-	"in fact, %S will not allow it. Also, short\n"
-	"passwords are vulnerable to trial-and-error searches, so\n"
-	"you should choose a password at least 5 characters long.\n"
-	"Finally, the space character cannot be used in passwords.\n"
-	" \n"
-	"The parameter email is optional and will set the email\n"
-	"for your nick immediately. However, it may be required\n"
-	"on certain networks.\n"
-	"Your privacy is respected; this e-mail won't be given to\n"
-	"any third-party person.\n"
-	" \n"
-	"This command also creates a new group for your nickname,\n"
-	"that will allow you to register other nicks later sharing\n"
-	"the same configuration, the same set of memos and the\n"
-	"same channel privileges. For more information on this\n"
-	"feature, type %R%S HELP GROUP."),
-	/* NICK_HELP_GROUP */
-	_("Syntax: GROUP target password\n"
-	" \n"
-	"This command makes your nickname join the target nickname's \n"
-	"group. password is the password of the target nickname.\n"
-	" \n"
-	"Joining a group will allow you to share your configuration,\n"
-	"memos, and channel privileges with all the nicknames in the\n"
-	"group, and much more!\n"
-	" \n"
-	"A group exists as long as it is useful. This means that even\n"
-	"if a nick of the group is dropped, you won't lose the\n"
-	"shared things described above, as long as there is at\n"
-	"least one nick remaining in the group.\n"
-	" \n"
-	"You can use this command even if you have not registered\n"
-	"your nick yet. If your nick is already registered, you'll\n"
-	"need to identify yourself before using this command. Type\n"
-	"%R%S HELP IDENTIFY for more information. This\n"
-	"last may be not possible on your IRC network.\n"
-	" \n"
-	"It is recommended to use this command with a non-registered\n"
-	"nick because it will be registered automatically when \n"
-	"using this command. You may use it with a registered nick (to \n"
-	"change your group) only if your network administrators allowed \n"
-	"it.\n"
-	" \n"
-	"You can only be in one group at a time. Group merging is\n"
-	"not possible.\n"
-	" \n"
-	"Note: all the nicknames of a group have the same password."),
-	/* NICK_HELP_UNGROUP */
-	_("Syntax: UNGROUP [nick]\n"
-	" \n"
-	"This command ungroups your nick, or if given, the specificed nick,\n"
-	"from the group it is in. The ungrouped nick keeps its registration\n"
-	"time, password, email, greet, language, url, and icq. Everything\n"
-	"else is reset. You may not ungroup yourself if there is only one\n"
-	"nick in your group."),
-	/* NICK_HELP_IDENTIFY */
-	_("Syntax: IDENTIFY [account] password\n"
-	" \n"
-	"Tells %S that you are really the owner of this\n"
-	"nick.  Many commands require you to authenticate yourself\n"
-	"with this command before you use them.  The password\n"
-	"should be the same one you sent with the REGISTER\n"
-	"command."),
-	/* NICK_HELP_UPDATE */
-	_("Syntax: UPDATE\n"
-	"Updates your current status, i.e. it checks for new memos,\n"
-	"sets needed chanmodes (ModeonID) and updates your vhost and\n"
-	"your userflags (lastseentime, etc)."),
-	/* NICK_HELP_LOGOUT */
-	_("Syntax: LOGOUT\n"
-	" \n"
-	"This reverses the effect of the IDENTIFY command, i.e.\n"
-	"make you not recognized as the real owner of the nick\n"
-	"anymore. Note, however, that you won't be asked to reidentify\n"
-	"yourself."),
-	/* NICK_HELP_DROP */
-	_("Syntax: DROP [nickname | \037password\037]\n"
-	" \n"
-	"Drops your nickname from the %S database.  A nick\n"
-	"that has been dropped is free for anyone to re-register.\n"
-	" \n"
-	"You may drop a nick within your group by passing it\n"
-	"as the nick parameter.\n"
-	" \n"
-	"If you have a nickname registration pending but can not confirm\n"
-	"it for any reason, you can cancel your registration by passing\n"
-	"your password as the \002password\002 parameter.\n"
-	" \n"
-	"In order to use this command, you must first identify\n"
-	"with your password (%R%S HELP IDENTIFY for more\n"
-	"information)."),
-	/* NICK_HELP_ACCESS */
-	_("Syntax: ACCESS ADD mask\n"
-	"        ACCESS DEL mask\n"
-	"        ACCESS LIST\n"
-	" \n"
-	"Modifies or displays the access list for your nick.  This\n"
-	"is the list of addresses which will be automatically\n"
-	"recognized by %S as allowed to use the nick.  If\n"
-	"you want to use the nick from a different address, you\n"
-	"need to send an IDENTIFY command to make %S\n"
-	"recognize you.\n"
-	" \n"
-	"Examples:\n"
-	" \n"
-	"    ACCESS ADD anyone@*.bepeg.com\n"
-	"        Allows access to user anyone from any machine in\n"
-	"        the bepeg.com domain.\n"
-	" \n"
-	"    ACCESS DEL anyone@*.bepeg.com\n"
-	"        Reverses the previous command.\n"
-	" \n"
-	"    ACCESS LIST\n"
-	"        Displays the current access list."),
-	/* NICK_HELP_SET_HEAD */
-	_("Syntax: SET option parameters\n"
-	" \n"
-	"Sets various nickname options.  option can be one of:"),
-	/* NICK_HELP_CMD_SET_DISPLAY */
-	_("    DISPLAY    Set the display of your group in Services"),
-	/* NICK_HELP_CMD_SET_PASSWORD */
-	_("    PASSWORD   Set your nickname password"),
-	/* NICK_HELP_CMD_SET_LANGUAGE */
-	_("    LANGUAGE   Set the language Services will use when\n"
-	"                   sending messages to you"),
-	/* NICK_HELP_CMD_SET_EMAIL */
-	_("    EMAIL      Associate an E-mail address with your nickname"),
-	/* NICK_HELP_CMD_SET_GREET */
-	_("    GREET      Associate a greet message with your nickname"),
-	/* NICK_HELP_CMD_SET_KILL */
-	_("    KILL       Turn protection on or off"),
-	/* NICK_HELP_CMD_SET_SECURE */
-	_("    SECURE     Turn nickname security on or off"),
-	/* NICK_HELP_CMD_SET_PRIVATE */
-	_("    PRIVATE    Prevent your nickname from appearing in a\n"
-	"                   %R%S LIST"),
-	/* NICK_HELP_CMD_SET_HIDE */
-	_("    HIDE       Hide certain pieces of nickname information"),
-	/* NICK_HELP_CMD_SET_MSG */
-	_("    MSG        Change the communication method of Services"),
-	/* NICK_HELP_CMD_SET_AUTOOP */
-	_("    AUTOOP     Should services op you automatically.    "),
-	/* NICK_HELP_SET_TAIL */
-	_("In order to use this command, you must first identify\n"
-	"with your password (%R%S HELP IDENTIFY for more\n"
-	"information).\n"
-	" \n"
-	"Type %R%S HELP SET option for more information\n"
-	"on a specific option."),
-	/* NICK_HELP_SET_DISPLAY */
-	_("Syntax: SET DISPLAY new-display\n"
-	" \n"
-	"Changes the display used to refer to your nickname group in \n"
-	"Services. The new display MUST be a nick of your group."),
-	/* NICK_HELP_SET_PASSWORD */
-	_("Syntax: SET PASSWORD new-password\n"
-	" \n"
-	"Changes the password used to identify you as the nick's\n"
-	"owner."),
-	/* NICK_HELP_SET_LANGUAGE */
-	_("Syntax: SET LANGUAGE language\n"
-	" \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:"),
-	/* NICK_HELP_SET_EMAIL */
-	_("Syntax: SET EMAIL address\n"
-	" \n"
-	"Associates the given E-mail address with your nickname.\n"
-	"This address will be displayed whenever someone requests\n"
-	"information on the nickname with the INFO command."),
-	/* NICK_HELP_SET_GREET */
-	_("Syntax: SET GREET message\n"
-	" \n"
-	"Makes the given message the greet of your nickname, that\n"
-	"will be displayed when joining a channel that has GREET\n"
-	"option enabled, provided that you have the necessary \n"
-	"access on it."),
-	/* NICK_HELP_SET_KILL */
-	_("Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
-	" \n"
-	"Turns the automatic protection option for your nick\n"
-	"on or off.  With protection on, if another user\n"
-	"tries to take your nick, they will be given one minute to\n"
-	"change to another nick, after which %S will forcibly change\n"
-	"their nick.\n"
-	" \n"
-	"If you select QUICK, the user will be given only 20 seconds\n"
-	"to change nicks instead of the usual 60.  If you select\n"
-	"IMMED, user's nick will be changed immediately without being\n"
-	"warned first or given a chance to change their nick; please\n"
-	"do not use this option unless necessary. Also, your\n"
-	"network's administrators may have disabled this option."),
-	/* NICK_HELP_SET_SECURE */
-	_("Syntax: SET SECURE {ON | OFF}\n"
-	" \n"
-	"Turns %S's security features on or off for your\n"
-	"nick. With SECURE set, you must enter your password\n"
-	"before you will be recognized as the owner of the nick,\n"
-	"regardless of whether your address is on the access\n"
-	"list. However, if you are on the access list, %S\n"
-	"will not auto-kill you regardless of the setting of the\n"
-	"KILL option."),
-	/* NICK_HELP_SET_PRIVATE */
-	_("Syntax: SET PRIVATE {ON | OFF}\n"
-	" \n"
-	"Turns %S's privacy option on or off for your nick.\n"
-	"With PRIVATE set, your nickname will not appear in\n"
-	"nickname lists generated with %S's LIST command.\n"
-	"(However, anyone who knows your nickname can still get\n"
-	"information on it using the INFO command.)"),
-	/* NICK_HELP_SET_HIDE */
-	_("Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
-	" \n"
-	"Allows you to prevent certain pieces of information from\n"
-	"being displayed when someone does a %S INFO on your\n"
-	"nick.  You can hide your E-mail address (EMAIL), last seen\n"
-	"user@host mask (USERMASK), your services access status\n"
-	"(STATUS) and  last quit message (QUIT).\n"
-	"The second parameter specifies whether the information should\n"
-	"be displayed (OFF) or hidden (ON)."),
-	/* NICK_HELP_SET_MSG */
-	_("Syntax: SET MSG {ON | OFF}\n"
-	" \n"
-	"Allows you to choose the way Services are communicating with \n"
-	"you. With MSG set, Services will use messages, else they'll \n"
-	"use notices."),
-	/* NICK_HELP_SET_AUTOOP */
-	_("Syntax: SET AUTOOP {ON | OFF}\n"
-	" \n"
-	"Sets whether you will be opped automatically. Set to ON to \n"
-	"allow ChanServ to op you automatically when entering channels."),
-	/* NICK_HELP_SASET_HEAD */
-	_("Syntax: SASET nickname option parameters.\n"
-	" \n"
-	"Sets various nickname options. option can be one of:"),
-	/* NICK_HELP_CMD_SASET_DISPLAY */
-	_("    DISPLAY    Set the display of the group in Services"),
-	/* NICK_HELP_CMD_SASET_PASSWORD */
-	_("    PASSWORD   Set the nickname password"),
-	/* NICK_HELP_CMD_SASET_EMAIL */
-	_("    EMAIL      Associate an E-mail address with the nickname"),
-	/* NICK_HELP_CMD_SASET_GREET */
-	_("    GREET      Associate a greet message with the nickname"),
-	/* NICK_HELP_CMD_SASET_PRIVATE */
-	_("    PRIVATE    Prevent the nickname from appearing in a\n"
-	"                   %R%S LIST"),
-	/* NICK_HELP_CMD_SASET_NOEXPIRE */
-	_("    NOEXPIRE   Prevent the nickname from expiring"),
-	/* NICK_HELP_CMD_SASET_AUTOOP */
-	_("    AUTOOP     Turn autoop on or off"),
-	/* NICK_HELP_CMD_SASET_LANGUAGE */
-	_("    LANGUAGE   Set the language Services will use when\n"
-	"               sending messages to nickname"),
-	/* NICK_HELP_SASET_TAIL */
-	_("Type %R%S HELP SASET option for more information\n"
-	"on a specific option. The options will be set on the given\n"
-	"nickname."),
-	/* NICK_HELP_SASET_DISPLAY */
-	_("Syntax: SASET nickname DISPLAY new-display\n"
-	" \n"
-	"Changes the display used to refer to the nickname group in \n"
-	"Services. The new display MUST be a nick of the group."),
-	/* NICK_HELP_SASET_PASSWORD */
-	_("Syntax: SASET nickname PASSWORD new-password\n"
-	" \n"
-	"Changes the password used to identify as the nick's owner."),
-	/* NICK_HELP_SASET_EMAIL */
-	_("Syntax: SASET nickname EMAIL address\n"
-	" \n"
-	"Associates the given E-mail address with the nickname."),
-	/* NICK_HELP_SASET_GREET */
-	_("Syntax: SASET nickname GREET message\n"
-	" \n"
-	"Makes the given message the greet of the nickname, that\n"
-	"will be displayed when joining a channel that has GREET\n"
-	"option enabled, provided that the user has the necessary \n"
-	"access on it."),
-	/* NICK_HELP_SASET_KILL */
-	_("Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
-	" \n"
-	"Turns the automatic protection option for the nick\n"
-	"on or off. With protection on, if another user\n"
-	"tries to take the nick, they will be given one minute to\n"
-	"change to another nick, after which %S will forcibly change\n"
-	"their nick.\n"
-	" \n"
-	"If you select QUICK, the user will be given only 20 seconds\n"
-	"to change nicks instead of the usual 60. If you select\n"
-	"IMMED, user's nick will be changed immediately without being\n"
-	"warned first or given a chance to change their nick; please\n"
-	"do not use this option unless necessary. Also, your\n"
-	"network's administrators may have disabled this option."),
-	/* NICK_HELP_SASET_SECURE */
-	_("Syntax: SASET nickname SECURE {ON | OFF}\n"
-	" \n"
-	"Turns %S's security features on or off for your\n"
-	"nick. With SECURE set, you must enter your password\n"
-	"before you will be recognized as the owner of the nick,\n"
-	"regardless of whether your address is on the access\n"
-	"list. However, if you are on the access list, %S\n"
-	"will not auto-kill you regardless of the setting of the\n"
-	"KILL option."),
-	/* NICK_HELP_SASET_PRIVATE */
-	_("Syntax: SASET nickname PRIVATE {ON | OFF}\n"
-	" \n"
-	"Turns %S's privacy option on or off for the nick.\n"
-	"With PRIVATE set, the nickname will not appear in\n"
-	"nickname lists generated with %S's LIST command.\n"
-	"(However, anyone who knows the nickname can still get\n"
-	"information on it using the INFO command.)"),
-	/* NICK_HELP_SASET_HIDE */
-	_("Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
-	" \n"
-	"Allows you to prevent certain pieces of information from\n"
-	"being displayed when someone does a %S INFO on the\n"
-	"nick.  You can hide the E-mail address (EMAIL), last seen\n"
-	"user@host mask (USERMASK), the services access status\n"
-	"(STATUS) and  last quit message (QUIT).\n"
-	"The second parameter specifies whether the information should\n"
-	"be displayed (OFF) or hidden (ON)."),
-	/* NICK_HELP_SASET_MSG */
-	_("Syntax: SASET nickname MSG {ON | OFF}\n"
-	" \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."),
-	/* NICK_HELP_SASET_NOEXPIRE */
-	_("Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
-	" \n"
-	"Sets whether the given nickname will expire.  Setting this\n"
-	"to ON prevents the nickname from expiring."),
-	/* NICK_HELP_SASET_AUTOOP */
-	_("Syntax: SASET nickname AUTOOP {ON | OFF}\n"
-	" \n"
-	"Sets whether the given nickname will be opped automatically.\n"
-	"Set to ON to allow ChanServ to op the given nickname \n"
-	"automatically when joining channels."),
-	/* NICK_HELP_SASET_LANGUAGE */
-	_("Syntax: SASET nickname LANGUAGE language\n"
-	" \n"
-	"Changes the language Services uses when sending messages to\n"
-	"nickname (for example, when responding to a command he sends).\n"
-	"language should be chosen from a list of supported languages\n"
-	"that you can get by typing %R%S HELP SET LANGUAGE."),
-	/* NICK_HELP_RECOVER */
-	_("Syntax: RECOVER nickname [password]\n"
-	" \n"
-	"Allows you to recover your nickname if someone else has\n"
-	"taken it; this does the same thing that %S does\n"
-	"automatically if someone tries to use a kill-protected\n"
-	"nick.\n"
-	" \n"
-	"When you give this command, %S will bring a fake\n"
-	"user online with the same nickname as the user you're\n"
-	"trying to recover your nick from.  This causes the IRC\n"
-	"servers to disconnect the other user.  This fake user will\n"
-	"remain online for %s to ensure that the other\n"
-	"user does not immediately reconnect; after that time, you\n"
-	"can reclaim your nick.  Alternatively, use the RELEASE\n"
-	"command (%R%S HELP RELEASE) to get the nick\n"
-	"back sooner.\n"
-	" \n"
-	"In order to use the RECOVER command for a nick, your\n"
-	"current address as shown in /WHOIS must be on that nick's\n"
-	"access list, you must be identified and in the group of\n"
-	"that nick, or you must supply the correct password for\n"
-	"the nickname."),
-	/* NICK_HELP_RELEASE */
-	_("Syntax: RELEASE nickname [password]\n"
-	" \n"
-	"Instructs %S to remove any hold on your nickname\n"
-	"caused by automatic kill protection or use of the RECOVER\n"
-	"command. This holds lasts for %s;\n"
-	"this command gets rid of them sooner.\n"
-	" \n"
-	"In order to use the RELEASE command for a nick, your\n"
-	"current address as shown in /WHOIS must be on that nick's\n"
-	"access list, you must be identified and in the group of\n"
-	"that nick, or you must supply the correct password for\n"
-	"the nickname."),
-	/* NICK_HELP_GHOST */
-	_("Syntax: GHOST nickname [password]\n"
-	" \n"
-	"Terminates a \"ghost\" IRC session using your nick.  A\n"
-	"\"ghost\" session is one which is not actually connected,\n"
-	"but which the IRC server believes is still online for one\n"
-	"reason or another. Typically, this happens if your\n"
-	"computer crashes or your Internet or modem connection\n"
-	"goes down while you're on IRC.\n"
-	" \n"
-	"In order to use the GHOST command for a nick, your\n"
-	"current address as shown in /WHOIS must be on that nick's\n"
-	"access list, you must be identified and in the group of\n"
-	"that nick, or you must supply the correct password for\n"
-	"the nickname."),
-	/* NICK_HELP_INFO */
-	_("Syntax: INFO nickname\n"
-	" \n"
-	"Displays information about the given nickname, such as\n"
-	"the nick's owner, last seen address and time, and nick\n"
-	"options."),
-	/* NICK_HELP_LIST */
-	_("Syntax: LIST pattern\n"
-	" \n"
-	"Lists all registered nicknames which match the given\n"
-	"pattern, in nick!user@host format.  Nicks with the\n"
-	"PRIVATE option set will not be displayed.\n"
-	" \n"
-	"Examples:\n"
-	" \n"
-	"    LIST *!joeuser@foo.com\n"
-	"        Lists all nicks owned by joeuser@foo.com.\n"
-	" \n"
-	"    LIST *Bot*!*@*\n"
-	"        Lists all registered nicks with Bot in their\n"
-	"        names (case insensitive).\n"
-	" \n"
-	"    LIST *!*@*.bar.org\n"
-	"        Lists all nicks owned by users in the bar.org\n"
-	"        domain."),
-	/* NICK_HELP_ALIST */
-	_("Syntax: ALIST [level]\n"
-	" \n"
-	"Lists all channels you have access on. Optionally, you can specify\n"
-	"a level in XOP or ACCESS format. The resulting list will only\n"
-	"include channels where you have the given level of access.\n"
-	"Examples:\n"
-	"    ALIST Founder\n"
-	"        Lists all channels where you have Founder\n"
-	"        access.\n"
-	"    ALIST AOP\n"
-	"        Lists all channels where you have AOP\n"
-	"        access or greater.\n"
-	"    ALIST 10\n"
-	"        Lists all channels where you have level 10\n"
-	"        access or greater.\n"
-	"Channels that have the NOEXPIRE option set will be\n"
-	"prefixed by an exclamation mark."),
-	/* NICK_HELP_GLIST */
-	_("Syntax: GLIST\n"
-	" \n"
-	"Lists all nicks in your group."),
-	/* NICK_HELP_STATUS */
-	_("Syntax: STATUS nickname...\n"
-	" \n"
-	"Returns whether the user using the given nickname is\n"
-	"recognized as the owner of the nickname. The response has\n"
-	"this format:\n"
-	" \n"
-	"    nickname status-code account\n"
-	" \n"
-	"where nickname is the nickname sent with the command,\n"
-	"status-code is one of the following, and account\n"
-	"is the account they are logged in as.\n"
-	" \n"
-	"    0 - no such user online or nickname not registered\n"
-	"    1 - user not recognized as nickname's owner\n"
-	"    2 - user recognized as owner via access list only\n"
-	"    3 - user recognized as owner via password identification\n"
-	" \n"
-	"Up to sixteen nicknames may be sent with each command; the\n"
-	"rest will be ignored. If no nickname is given, your status\n"
-	"will be returned."),
-	/* NICK_HELP_SENDPASS */
-	_("Syntax: SENDPASS nickname\n"
-	" \n"
-	"Send the password of the given nickname to the e-mail address\n"
-	"set in the nickname record. This command is really useful\n"
-	"to deal with lost passwords.\n"
-	" \n"
-	"May be limited to IRC operators on certain networks."),
-	/* NICK_HELP_RESETPASS */
-	_("Syntax: RESETPASS nickname\n"
-	"Sends a code key to the nickname with instructions on how to\n"
-	"reset their password."),
-	/* NICK_HELP_CONFIRM */
-	_("Syntax: CONFIRM passcode\n"
-	" \n"
-	"This is the second step of nickname registration process.\n"
-	"You must perform this command in order to get your nickname\n"
-	"registered with %S. The passcode (or called auth code also)\n"
-	"is sent to your e-mail address in the first step of the\n"
-	"registration process. For more information about the first\n"
-	"stage of the registration process, type: %R%S HELP REGISTER\n"
-	" \n"
-	"This is also used after the RESETPASS command has been used to\n"
-	"force identify you to your nick so you may change your password."),
-	/* NICK_HELP_CONFIRM_OPER */
-	_("Additionally, Services Operators with the nickserv/confirm permission can\n"
-	"replace passcode with a users nick to force validate them."),
-	/* NICK_HELP_RESEND */
-	_("Syntax: RESEND\n"
-	" \n"
-	"This command will re-send the auth code (also called passcode)\n"
-	"to the e-mail address of the user whom is performing it."),
-	/* NICK_HELP_AJOIN */
-	_("Syntax: \002AJOIN {ADD | DEL | LIST} [\037channel\037] [\037key\037]\002\n"
-	" \n"
-	"This command manages your auto join list. When you identify\n"
-	"you will automatically join the channels on your auto join list"),
-	/* NICK_SERVADMIN_HELP */
-	_(" \n"
-	"Services Operators can also drop any nickname without needing\n"
-	"to identify for the nick, and may view the access list for\n"
-	"any nickname (%R%S ACCESS LIST nick)."),
-	/* NICK_SERVADMIN_HELP_LOGOUT */
-	_("Syntax: LOGOUT [nickname [REVALIDATE]]\n"
-	" \n"
-	"Without a parameter, reverses the effect of the IDENTIFY \n"
-	"command, i.e. make you not recognized as the real owner of the nick\n"
-	"anymore. Note, however, that you won't be asked to reidentify\n"
-	"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"
-	"to re-identify. This use limited to Services Operators."),
-	/* NICK_SERVADMIN_HELP_DROP */
-	_("Syntax: DROP [nickname]\n"
-	" \n"
-	"Without a parameter, drops your nickname from the\n"
-	"%S database.\n"
-	" \n"
-	"With a parameter, drops the named nick from the database.\n"
-	"You may drop any nick within your group without any \n"
-	"special privileges. Dropping any nick is limited to \n"
-	"Services Operators."),
-	/* NICK_SERVADMIN_HELP_LIST */
-	_("Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
-	" \n"
-	"Lists all registered nicknames which match the given\n"
-	"pattern, in nick!user@host format.  Nicks with the PRIVATE\n"
-	"option set will only be displayed to Services Operators.  Nicks\n"
-	"with the NOEXPIRE option set will have a ! appended to\n"
-	"the nickname for Services Operators.\n"
-	" \n"
-	"If the FORBIDDEN, SUSPENDED, NOEXPIRE or UNCONFIRMED options are given, only\n"
-	"nicks which, respectively, are FORBIDDEN, SUSPENDED, UNCONFIRMED or have the\n"
-	"NOEXPIRE flag set will be displayed. If multiple options are\n"
-	"given, all nicks matching at least one option will be displayed.\n"
-	"These options are limited to Services Operators.  \n"
-	"Examples:\n"
-	" \n"
-	"    LIST *!joeuser@foo.com\n"
-	"        Lists all registered nicks owned by joeuser@foo.com.\n"
-	" \n"
-	"    LIST *Bot*!*@*\n"
-	"        Lists all registered nicks with Bot in their\n"
-	"        names (case insensitive).\n"
-	" \n"
-	"    LIST * NOEXPIRE\n"
-	"        Lists all registered nicks which have been set to\n"
-	"        not expire."),
-	/* NICK_SERVADMIN_HELP_ALIST */
-	_("Syntax: ALIST [nickname] [level]\n"
-	" \n"
-	"With no parameters, lists channels you have access on. With\n"
-	"one parameter, lists channels that nickname has access \n"
-	"on. With two parameters lists channels that nickname has \n"
-	"level access or greater on.\n"
-	"This use limited to Services Operators."),
-	/* NICK_SERVADMIN_HELP_GLIST */
-	_("Syntax: GLIST [nickname]\n"
-	" \n"
-	"Without a parameter, lists all nicknames that are in\n"
-	"your group.\n"
-	" \n"
-	"With a parameter, lists all nicknames that are in the\n"
-	"group of the given nick.\n"
-	"This use limited to Services Operators."),
-	/* NICK_SERVADMIN_HELP_GETPASS */
-	_("Syntax: GETPASS nickname\n"
-	" \n"
-	"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.\n"
-	" \n"
-	"This command is unavailable when encryption is enabled."),
-	/* NICK_SERVADMIN_HELP_GETEMAIL */
-	_("Syntax: GETEMAIL user@emailhost\n"
-	"Returns the matching nicks that used given email. Note that\n"
-	"you can not use wildcards for either user or emailhost. Whenever\n"
-	"this command is used, a message including the person who issued\n"
-	"the command and the email it was used on will be logged."),
-	/* NICK_SERVADMIN_HELP_FORBID */
-	_("Syntax: FORBID nickname [reason]\n"
-	" \n"
-	"Disallows a nickname from being registered or used by\n"
-	"anyone.  May be cancelled by dropping the nick.\n"
-	" \n"
-	"On certain networks, reason is required."),
-	/* NICK_SERVADMIN_HELP_SUSPEND */
-	_("Syntax: SUSPEND nickname reason\n"
-	"SUSPENDs a nickname from being used."),
-	/* NICK_SERVADMIN_HELP_UNSUSPEND */
-	_("Syntax: UNSUSPEND nickname\n"
-	"UNSUSPENDS a nickname from being used."),
-	/* CHAN_HELP_CMD_REGISTER */
-	_("    REGISTER   Register a channel"),
-	/* CHAN_HELP_CMD_FORBID */
-	_("    FORBID     Prevent a channel from being used"),
-	/* CHAN_HELP_CMD_SUSPEND */
-	_("    SUSPEND    Prevent a channel from being used preserving\n"
-	"               channel data and settings"),
-	/* CHAN_HELP_CMD_UNSUSPEND */
-	_("    UNSUSPEND  Releases a suspended channel"),
-	/* CHAN_HELP_CMD_STATUS */
-	_("    STATUS     Returns the current access level of a user\n"
-	"               on a channel"),
-	/* CHAN_HELP_CMD_SET */
-	_("    SET        Set channel options and information"),
-	/* CHAN_HELP_CMD_SASET */
-	_("    SASET      Forcefully set channel options and information"),
-	/* CHAN_HELP_CMD_QOP */
-	_("    QOP        Modify the list of QOP users"),
-	/* CHAN_HELP_CMD_AOP */
-	_("    AOP        Modify the list of AOP users"),
-	/* CHAN_HELP_CMD_SOP */
-	_("    SOP        Modify the list of SOP users"),
-	/* CHAN_HELP_CMD_ACCESS */
-	_("    ACCESS     Modify the list of privileged users"),
-	/* CHAN_HELP_CMD_LEVELS */
-	_("    LEVELS     Redefine the meanings of access levels"),
-	/* CHAN_HELP_CMD_AKICK */
-	_("    AKICK      Maintain the AutoKick list"),
-	/* CHAN_HELP_CMD_DROP */
-	_("    DROP       Cancel the registration of a channel"),
-	/* CHAN_HELP_CMD_BAN */
-	_("    BAN        Bans a selected nick on a channel"),
-	/* CHAN_HELP_CMD_CLEARUSERS */
-	_("    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"),
-	/* CHAN_HELP_CMD_DEVOICE */
-	_("    DEVOICE    Devoices a selected nick on a channel"),
-	/* CHAN_HELP_CMD_GETKEY */
-	_("    GETKEY     Returns the key of the given channel"),
-	/* CHAN_HELP_CMD_INFO */
-	_("    INFO       Lists information about the named registered channel"),
-	/* CHAN_HELP_CMD_INVITE */
-	_("    INVITE     Tells ChanServ to invite you into a channel"),
-	/* CHAN_HELP_CMD_KICK */
-	_("    KICK       Kicks a selected nick from a channel"),
-	/* CHAN_HELP_CMD_LIST */
-	_("    LIST       Lists all registered channels matching the given pattern"),
-	/* CHAN_HELP_CMD_OP */
-	_("    OP         Gives Op status to a selected nick on a channel"),
-	/* CHAN_HELP_CMD_TOPIC */
-	_("    TOPIC      Manipulate the topic of the specified channel"),
-	/* CHAN_HELP_CMD_UNBAN */
-	_("    UNBAN      Remove all bans preventing a user from entering a channel"),
-	/* CHAN_HELP_CMD_VOICE */
-	_("    VOICE      Voices a selected nick on a channel"),
-	/* CHAN_HELP_CMD_VOP */
-	_("    VOP        Maintains the VOP (VOicePeople) list for a channel"),
-	/* CHAN_HELP_CMD_DEHALFOP */
-	_("    DEHALFOP   Dehalfops a selected nick on a channel"),
-	/* CHAN_HELP_CMD_DEOWNER */
-	_("    DEOWNER    Removes your owner status on a channel"),
-	/* CHAN_HELP_CMD_DEPROTECT */
-	_("    DEPROTECT  Deprotects a selected nick on a channel"),
-	/* CHAN_HELP_CMD_HALFOP */
-	_("    HALFOP     Halfops a selected nick on a channel"),
-	/* CHAN_HELP_CMD_HOP */
-	_("    HOP        Maintains the HOP (HalfOP) list for a channel"),
-	/* CHAN_HELP_CMD_OWNER */
-	_("    OWNER      Gives you owner status on channel"),
-	/* CHAN_HELP_CMD_PROTECT */
-	_("    PROTECT    Protects a selected nick on a channel"),
-	/* CHAN_HELP_CMD_DEOP */
-	_("    DEOP       Deops a selected nick on a channel"),
-	/* CHAN_HELP_CMD_CLONE */
-	_("    CLONE      Copy all settings from one channel to another"),
-	/* CHAN_HELP_CMD_MODE */
-	_("    MODE       Control modes and mode locks on a channel"),
-	/* CHAN_HELP_CMD_ENTRYMSG */
-	_("    ENTRYMSG   Manage the channel's entrymsgs"),
-	/* CHAN_HELP */
-	_("%S allows you to register and control various\n"
-	"aspects of channels. %S can often prevent\n"
-	"malicious users from \"taking over\" channels by limiting\n"
-	"who is allowed channel operator privileges. Available\n"
-	"commands are listed below; to use them, type\n"
-	"%R%S command. For more information on a\n"
-	"specific command, type %R%S HELP command."),
-	/* CHAN_HELP_EXPIRES */
-	_("Note that any channel which is not used for %d days\n"
-	"(i.e. which no user on the channel's access list enters\n"
-	"for that period of time) will be automatically dropped."),
-	/* CHAN_HELP_REGISTER */
-	_("Syntax: REGISTER channel description\n"
-	" \n"
-	"Registers a channel in the %S database.  In order\n"
-	"to use this command, you must first be a channel operator\n"
-	"on the channel you're trying to register.\n"
-	"The description, which must be included, is a\n"
-	"general description of the channel's purpose.\n"
-	" \n"
-	"When you register a channel, you are recorded as the\n"
-	"\"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.\n"
-	"See the ACCESS command (%R%S HELP ACCESS) for\n"
-	"information on giving a subset of these privileges to\n"
-	"other channel users.\n"
-	" \n"
-	"NOTICE: In order to register a channel, you must have\n"
-	"first registered your nickname.  If you haven't,\n"
-	"%R%s HELP for information on how to do so."),
-	/* CHAN_HELP_DROP */
-	_("Syntax: DROP channel\n"
-	" \n"
-	"Unregisters the named channel.  Can only be used by\n"
-	"channel founder."),
-	/* CHAN_HELP_SASET_HEAD */
-	_("Syntax: SASET channel option parameters\n"
-	" \n"
-	"Allows Services Operators to forcefully change settings\n"
-	"on channels.\n"
-	" \n"
-	"Available options:"),
-	/* CHAN_HELP_SET_HEAD */
-	_("Syntax: SET channel option parameters\n"
-	" \n"
-	"Allows the channel founder to set various channel options\n"
-	"and other information.\n"
-	" \n"
-	"Available options:"),
-	/* CHAN_HELP_CMD_SET_FOUNDER */
-	_("    FOUNDER       Set the founder of a channel"),
-	/* CHAN_HELP_CMD_SET_SUCCESSOR */
-	_("    SUCCESSOR     Set the successor for a channel"),
-	/* CHAN_HELP_CMD_SET_DESC */
-	_("    DESC          Set the channel description"),
-	/* CHAN_HELP_CMD_SET_BANTYPE */
-	_("    BANTYPE       Set how Services make bans on the channel"),
-	/* CHAN_HELP_CMD_SET_KEEPTOPIC */
-	_("    KEEPTOPIC     Retain topic when channel is not in use"),
-	/* CHAN_HELP_CMD_SET_OPNOTICE */
-	_("    OPNOTICE      Send a notice when OP/DEOP commands are used"),
-	/* CHAN_HELP_CMD_SET_PEACE */
-	_("    PEACE         Regulate the use of critical commands"),
-	/* CHAN_HELP_CMD_SET_PRIVATE */
-	_("    PRIVATE       Hide channel from LIST command"),
-	/* CHAN_HELP_CMD_SET_RESTRICTED */
-	_("    RESTRICTED    Restrict access to the channel"),
-	/* CHAN_HELP_CMD_SET_SECURE */
-	_("    SECURE        Activate %S security features"),
-	/* CHAN_HELP_CMD_SET_SECUREOPS */
-	_("    SECUREOPS     Stricter control of chanop status"),
-	/* CHAN_HELP_CMD_SET_SECUREFOUNDER */
-	_("    SECUREFOUNDER Stricter control of channel founder status"),
-	/* CHAN_HELP_CMD_SET_SIGNKICK */
-	_("    SIGNKICK      Sign kicks that are done with KICK command"),
-	/* CHAN_HELP_CMD_SET_TOPICLOCK */
-	_("    TOPICLOCK     Topic can only be changed with TOPIC"),
-	/* CHAN_HELP_CMD_SET_XOP */
-	_("    XOP           Toggle the user privilege system"),
-	/* CHAN_HELP_CMD_SET_PERSIST */
-	_("    PERSIST       Set the channel as permanent"),
-	/* CHAN_HELP_CMD_SET_NOEXPIRE */
-	_("    NOEXPIRE      Prevent the channel from expiring"),
-	/* CHAN_HELP_SET_TAIL */
-	_("Type %R%S HELP SET option for more information on a\n"
-	"particular option."),
-	/* CHAN_HELP_SASET_TAIL */
-	_("Type %R%S HELP SASET option for more information on a\n"
-	"particular option."),
-	/* CHAN_HELP_SET_FOUNDER */
-	_("Syntax: %s channel FOUNDER nick\n"
-	" \n"
-	"Changes the founder of a channel. The new nickname must\n"
-	"be a registered one."),
-	/* CHAN_HELP_SET_SUCCESSOR */
-	_("Syntax: %s channel SUCCESSOR nick\n"
-	" \n"
-	"Changes the successor of a channel. If the founder's\n"
-	"nickname expires or is dropped while the channel is still\n"
-	"registered, the successor will become the new founder of the\n"
-	"channel.  However, if the successor already has too many\n"
-	"channels registered (%d), the channel will be dropped\n"
-	"instead, just as if no successor had been set.  The new\n"
-	"nickname must be a registered one."),
-	/* CHAN_HELP_SET_DESC */
-	_("Syntax: %s channel DESC description\n"
-	" \n"
-	"Sets the description for the channel, which shows up with\n"
-	"the LIST and INFO commands."),
-	/* CHAN_HELP_SET_BANTYPE */
-	_("Syntax: %s channel BANTYPE bantype\n"
-	" \n"
-	"Sets the ban type that will be used by services whenever\n"
-	"they need to ban someone from your channel.\n"
-	" \n"
-	"bantype is a number between 0 and 3 that means:\n"
-	" \n"
-	"0: ban in the form *!user@host\n"
-	"1: ban in the form *!*user@host\n"
-	"2: ban in the form *!*@host\n"
-	"3: ban in the form *!*user@*.domain"),
-	/* CHAN_HELP_SET_KEEPTOPIC */
-	_("Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
-	" \n"
-	"Enables or disables the topic retention option for a	\n"
-	"channel. When topic retention is set, the topic for the\n"
-	"channel will be remembered by %S even after the\n"
-	"last user leaves the channel, and will be restored the\n"
-	"next time the channel is created."),
-	/* CHAN_HELP_SET_TOPICLOCK */
-	_("Syntax: %s channel TOPICLOCK {ON | OFF}\n"
-	" \n"
-	"Enables or disables the topic lock option for a channel.\n"
-	"When topic lock is set, %S will not allow the\n"
-	"channel topic to be changed except via the TOPIC\n"
-	"command."),
-	/* CHAN_HELP_SET_PEACE */
-	_("Syntax: %s channel PEACE {ON | OFF}\n"
-	" \n"
-	"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."),
-	/* CHAN_HELP_SET_PRIVATE */
-	_("Syntax: %s channel PRIVATE {ON | OFF}\n"
-	" \n"
-	"Enables or disables the private option for a channel.\n"
-	"When private is set, a %R%S LIST will not\n"
-	"include the channel in any lists."),
-	/* CHAN_HELP_SET_RESTRICTED */
-	_("Syntax: %s channel RESTRICTED {ON | OFF}\n"
-	" \n"
-	"Enables or disables the restricted access option for a\n"
-	"channel. When restricted access is set, users not on the access list will\n"
-	"instead be kicked and banned from the channel."),
-	/* CHAN_HELP_SET_SECURE */
-	_("Syntax: %s channel SECURE {ON | OFF}\n"
-	" \n"
-	"Enables or disables %S's security features for a\n"
-	"channel. When SECURE is set, only users who have\n"
-	"registered their nicknames with %s and IDENTIFY'd\n"
-	"with their password will be given access to the channel\n"
-	"as controlled by the access list."),
-	/* CHAN_HELP_SET_SECUREOPS */
-	_("Syntax: %s channel SECUREOPS {ON | OFF}\n"
-	" \n"
-	"Enables or disables the secure ops option for a channel.\n"
-	"When secure ops is set, users who are not on the userlist\n"
-	"will not be allowed chanop status."),
-	/* CHAN_HELP_SET_SECUREFOUNDER */
-	_("Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
-	" \n"
-	"Enables or disables the secure founder option for a channel.\n"
-	"When secure founder is set, only the real founder will be\n"
-	"able to drop the channel, change its password, its founder and its\n"
-	"successor, and not those who have founder level access through\n"
-	"the access/qop command."),
-	/* CHAN_HELP_SET_SIGNKICK */
-	_("Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}\n"
-	" \n"
-	"Enables or disables signed kicks for a\n"
-	"channel.  When SIGNKICK is set, kicks issued with\n"
-	"%S KICK command will have the nick that used the\n"
-	"command in their reason.\n"
-	" \n"
-	"If you use LEVEL, those who have a level that is superior \n"
-	"or equal to the SIGNKICK level on the channel won't have their \n"
-	"kicks signed. See %R%S HELP LEVELS for more information."),
-	/* CHAN_HELP_SET_XOP */
-	_("Syntax: %s channel XOP {ON | OFF}\n"
-	" \n"
-	"Enables or disables the xOP lists system for a channel.\n"
-	"When XOP is set, you have to use the AOP/SOP/VOP\n"
-	"commands in order to give channel privileges to\n"
-	"users, else you have to use the ACCESS command.\n"
-	" \n"
-	"Technical Note: when you switch from access list to xOP \n"
-	"lists system, your level definitions and user levels will be\n"
-	"changed, so you won't find the same values if you\n"
-	"switch back to access system! \n"
-	" \n"
-	"You should also check that your users are in the good xOP \n"
-	"list after the switch from access to xOP lists, because the \n"
-	"guess is not always perfect... in fact, it is not recommended \n"
-	"to use the xOP lists if you changed level definitions with \n"
-	"the LEVELS command.\n"
-	" \n"
-	"Switching from xOP lists system to access list system\n"
-	"causes no problem though."),
-	/* CHAN_HELP_SET_PERSIST */
-	_("Syntax: %s channel PERSIST {ON | OFF}\n"
-	"Enables or disables the persistant channel setting.\n"
-	"When persistant is set, the service bot will remain\n"
-	"in the channel when it has emptied of users.\n"
-	" \n"
-	"If your IRCd does not a permanent (persistant) channel\n"
-	"mode you must have a service bot in your channel to\n"
-	"set persist on, and it can not be unassigned while persist\n"
-	"is on.\n"
-	" \n"
-	"If this network does not have BotServ enabled and does\n"
-	"not have a permanent channel mode, ChanServ will\n"
-	"join your channel when you set persist on (and leave when\n"
-	"it has been set off).\n"
-	" \n"
-	"If your IRCd has a permanent (persistant) channel mode\n"
-	"and is is set or unset (for any reason, including MLOCK),\n"
-	"persist is automatically set and unset for the channel aswell.\n"
-	"Additionally, services will set or unset this mode when you\n"
-	"set persist on or off."),
-	/* CHAN_HELP_SET_OPNOTICE */
-	_("Syntax: %s channel OPNOTICE {ON | OFF}\n"
-	" \n"
-	"Enables or disables the op-notice option for a channel.\n"
-	"When op-notice is set, %S will send a notice to the\n"
-	"channel whenever the OP or DEOP commands are used for a user\n"
-	"in the channel."),
-	/* CHAN_HELP_QOP */
-	_("Syntax: QOP channel ADD mask\n"
-	"        QOP channel DEL {mask | entry-num | list}\n"
-	"        QOP channel LIST [mask | list]\n"
-	"        QOP channel CLEAR\n"
-	" \n"
-	"Maintains the QOP (AutoOwner) list for a channel. The QOP \n"
-	"list gives users the right to be auto-owner on your channel,\n"
-	"which gives them almost (or potentially, total) access.\n"
-	" \n"
-	"The QOP ADD command adds the given nickname to the\n"
-	"QOP list.\n"
-	" \n"
-	"The QOP DEL command removes the given nick from the\n"
-	"QOP list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	" \n"
-	"The QOP LIST command displays the QOP list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   QOP #channel LIST 2-5,7-9\n"
-	"      Lists QOP entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	"      \n"
-	"The QOP CLEAR command clears all entries of the\n"
-	"QOP list.\n"
-	" \n"
-	"The QOP commands are limited to\n"
-	"founders (unless SECUREOPS is off). However, any user on the\n"
-	"QOP list may use the QOP LIST command.\n"
-	" \n"
-	"This command may have been disabled for your channel, and\n"
-	"in that case you need to use the access list. See \n"
-	"%R%S HELP ACCESS for information about the access list,\n"
-	"and %R%S HELP SET XOP to know how to toggle between \n"
-	"the access list and xOP list systems."),
-	/* CHAN_HELP_AOP */
-	_("Syntax: AOP channel ADD mask\n"
-	"        AOP channel DEL {mask | entry-num | list}\n"
-	"        AOP channel LIST [mask | list]\n"
-	"        AOP channel CLEAR\n"
-	" \n"
-	"Maintains the AOP (AutoOP) list for a channel. The AOP \n"
-	"list gives users the right to be auto-opped on your channel,\n"
-	"to unban or invite themselves if needed, to have their\n"
-	"greet message showed on join, and so on.\n"
-	" \n"
-	"The AOP ADD command adds the given nickname to the\n"
-	"AOP list.\n"
-	" \n"
-	"The AOP DEL command removes the given nick from the\n"
-	"AOP list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	" \n"
-	"The AOP LIST command displays the AOP list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   AOP #channel LIST 2-5,7-9\n"
-	"      Lists AOP entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	"      \n"
-	"The AOP CLEAR command clears all entries of the\n"
-	"AOP list.\n"
-	" \n"
-	"The AOP ADD and AOP DEL commands are limited to\n"
-	"SOPs or above, while the AOP CLEAR command can only\n"
-	"be used by the channel founder. However, any user on the\n"
-	"AOP list may use the AOP LIST command.\n"
-	" \n"
-	"This command may have been disabled for your channel, and\n"
-	"in that case you need to use the access list. See \n"
-	"%R%S HELP ACCESS for information about the access list,\n"
-	"and %R%S HELP SET XOP to know how to toggle between \n"
-	"the access list and xOP list systems."),
-	/* CHAN_HELP_HOP */
-	_("Syntax: HOP channel ADD mask\n"
-	"        HOP channel DEL {mask | entry-num | list}\n"
-	"        HOP channel LIST [mask | list]\n"
-	"        HOP channel CLEAR\n"
-	" \n"
-	"Maintains the HOP (HalfOP) list for a channel. The HOP \n"
-	"list gives users the right to be auto-halfopped on your \n"
-	"channel.\n"
-	" \n"
-	"The HOP ADD command adds the given nickname to the\n"
-	"HOP list.\n"
-	" \n"
-	"The HOP DEL command removes the given nick from the\n"
-	"HOP list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	" \n"
-	"The HOP LIST command displays the HOP list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   HOP #channel LIST 2-5,7-9\n"
-	"      Lists HOP entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	"      \n"
-	"The HOP CLEAR command clears all entries of the\n"
-	"HOP list.\n"
-	" \n"
-	"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-	"limited to AOPs or above, while the HOP CLEAR command \n"
-	"can only be used by the channel founder.\n"
-	" \n"
-	"This command may have been disabled for your channel, and\n"
-	"in that case you need to use the access list. See \n"
-	"%R%S HELP ACCESS for information about the access list,\n"
-	"and %R%S HELP SET XOP to know how to toggle between \n"
-	"the access list and xOP list systems."),
-	/* CHAN_HELP_SOP */
-	_("Syntax: SOP channel ADD mask\n"
-	"        SOP channel DEL {mask | entry-num | list}\n"
-	"        SOP channel LIST [mask | list]\n"
-	"        SOP channel CLEAR\n"
-	" \n"
-	"Maintains the SOP (SuperOP) list for a channel. The SOP \n"
-	"list gives users all rights given by the AOP list, and adds\n"
-	"those needed to use the AutoKick and the BadWords lists, \n"
-	"to send and read channel memos, and so on.\n"
-	" \n"
-	"The SOP ADD command adds the given nickname to the\n"
-	"SOP list.\n"
-	" \n"
-	"The SOP DEL command removes the given nick from the\n"
-	"SOP list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	" \n"
-	"The SOP LIST command displays the SOP list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   SOP #channel LIST 2-5,7-9\n"
-	"      Lists AOP entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	"      \n"
-	"The SOP CLEAR command clears all entries of the\n"
-	"SOP list.\n"
-	" \n"
-	"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-	"limited to the channel founder. However, any user on the\n"
-	"AOP list may use the SOP LIST command.\n"
-	" \n"
-	"This command may have been disabled for your channel, and\n"
-	"in that case you need to use the access list. See \n"
-	"%R%S HELP ACCESS for information about the access list,\n"
-	"and %R%S HELP SET XOP to know how to toggle between \n"
-	"the access list and xOP list systems."),
-	/* CHAN_HELP_VOP */
-	_("Syntax: VOP channel ADD mask\n"
-	"        VOP channel DEL {mask | entry-num | list}\n"
-	"        VOP channel LIST [mask | list]\n"
-	"        VOP channel CLEAR\n"
-	" \n"
-	"Maintains the VOP (VOicePeople) list for a channel.  \n"
-	"The VOP list allows users to be auto-voiced and to voice \n"
-	"themselves if they aren't.\n"
-	" \n"
-	"The VOP ADD command adds the given nickname to the\n"
-	"VOP list.\n"
-	" \n"
-	"The VOP DEL command removes the given nick from the\n"
-	"VOP list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	" \n"
-	"The VOP LIST command displays the VOP list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   VOP #channel LIST 2-5,7-9\n"
-	"      Lists VOP entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	"      \n"
-	"The VOP CLEAR command clears all entries of the\n"
-	"VOP list.\n"
-	" \n"
-	"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-	"limited to AOPs or above, while the VOP CLEAR command \n"
-	"can only be used by the channel founder.\n"
-	" \n"
-	"This command may have been disabled for your channel, and\n"
-	"in that case you need to use the access list. See \n"
-	"%R%S HELP ACCESS for information about the access list,\n"
-	"and %R%S HELP SET XOP to know how to toggle between \n"
-	"the access list and xOP list systems."),
-	/* CHAN_HELP_ACCESS */
-	_("Syntax: ACCESS channel ADD mask level\n"
-	"        ACCESS channel DEL {mask | entry-num | list}\n"
-	"        ACCESS channel LIST [mask | list]\n"
-	"        ACCESS channel VIEW [mask | list]\n"
-	"        ACCESS channel CLEAR\n"
-	" \n"
-	"Maintains the access list for a channel.  The access\n"
-	"list specifies which users are allowed chanop status or\n"
-	"access to %S commands on the channel.  Different\n"
-	"user levels allow for access to different subsets of\n"
-	"privileges; %R%S HELP ACCESS LEVELS for more\n"
-	"specific information.  Any nick not on the access list has\n"
-	"a user level of 0.\n"
-	" \n"
-	"The ACCESS ADD command adds the given mask to the\n"
-	"access list with the given user level; if the mask is\n"
-	"already present on the list, its access level is changed to\n"
-	"the level specified in the command.  The level specified\n"
-	"must be less than that of the user giving the command, and\n"
-	"if the mask is already on the access list, the current\n"
-	"access level of that nick must be less than the access level\n"
-	"of the user giving the command. When a user joins the channel\n"
-	"the access they receive is from the highest level entry in the\n"
-	"access list.\n"
-	" \n"
-	"The ACCESS DEL command removes the given nick from the\n"
-	"access list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	"You may remove yourself from an access list, even if you\n"
-	"do not have access to modify that list otherwise.\n"
-	" \n"
-	"The ACCESS LIST command displays the access list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   ACCESS #channel LIST 2-5,7-9\n"
-	"      Lists access entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	" \n"
-	"The ACCESS VIEW command displays the access list similar\n"
-	"to ACCESS LIST but shows the creator and last used time.\n"
-	" \n"
-	"The ACCESS CLEAR command clears all entries of the\n"
-	"access list."),
-	/* CHAN_HELP_ACCESS_LEVELS */
-	_("User access levels\n"
-	" \n"
-	"By default, the following access levels are defined:\n"
-	" \n"
-	"   Founder   Full access to %S functions; automatic\n"
-	"                     opping upon entering channel.  Note\n"
-	"                     that only one person may have founder\n"
-	"                     status (it cannot be given using the\n"
-	"                     ACCESS command).\n"
-	"        10   Access to AKICK command; automatic opping.\n"
-	"         5   Automatic opping.\n"
-	"         3   Automatic voicing.\n"
-	"         0   No special privileges; can be opped by other\n"
-	"                     ops (unless secure-ops is set).\n"
-	"        <0   May not be opped.\n"
-	" \n"
-	"These levels may be changed, or new ones added, using the\n"
-	"LEVELS command; type %R%S HELP LEVELS for\n"
-	"information."),
-	/* CHAN_HELP_AKICK */
-	_("Syntax: AKICK channel ADD {nick | mask} [reason]\n"
-	"        AKICK channel DEL {nick | mask | entry-num | list}\n"
-	"        AKICK channel LIST [mask | entry-num | list]\n"
-	"        AKICK channel VIEW [mask | entry-num | list]\n"
-	"        AKICK channel ENFORCE\n"
-	"        AKICK channel CLEAR\n"
-	" \n"
-	"Maintains the AutoKick list for a channel.  If a user\n"
-	"on the AutoKick list attempts to join the channel,\n"
-	"%S will ban that user from the channel, then kick\n"
-	"the user.\n"
-	" \n"
-	"The AKICK ADD command adds the given nick or usermask\n"
-	"to the AutoKick list.  If a reason is given with\n"
-	"the command, that reason will be used when the user is\n"
-	"kicked; if not, the default reason is \"You have been\n"
-	"banned from the channel\".\n"
-	"When akicking a registered nick the nickserv account\n"
-	"will be added to the akick list instead of the mask.\n"
-	"All users within that nickgroup will then be akicked.\n"
-	" \n"
-	"The AKICK DEL command removes the given nick or mask\n"
-	"from the AutoKick list.  It does not, however, remove any\n"
-	"bans placed by an AutoKick; those must be removed\n"
-	"manually.\n"
-	" \n"
-	"The AKICK LIST command displays the AutoKick list, or\n"
-	"optionally only those AutoKick entries which match the\n"
-	"given mask.\n"
-	" \n"
-	"The AKICK VIEW command is a more verbose version of\n"
-	"AKICK LIST command.\n"
-	" \n"
-	"The AKICK ENFORCE command causes %S to enforce the\n"
-	"current AKICK list by removing those users who match an\n"
-	"AKICK mask.\n"
-	" \n"
-	"The AKICK CLEAR command clears all entries of the\n"
-	"akick list."),
-	/* CHAN_HELP_LEVELS */
-	_("Syntax: LEVELS channel SET type level\n"
-	"          LEVELS channel {DIS | DISABLE} type\n"
-	"          LEVELS channel LIST\n"
-	"          LEVELS channel RESET\n"
-	" \n"
-	"The LEVELS command allows fine control over the meaning of\n"
-	"the numeric access levels used for channels.  With this\n"
-	"command, you can define the access level required for most\n"
-	"of %S's functions. (The SET FOUNDER and this command\n"
-	"are always restricted to the channel founder.)\n"
-	" \n"
-	"LEVELS SET allows the access level for a function or group of\n"
-	"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).\n"
-	" \n"
-	"LEVELS LIST shows the current levels for each function or\n"
-	"group of functions. LEVELS RESET resets the levels to the\n"
-	"default levels of a newly-created channel (see\n"
-	"HELP ACCESS LEVELS).\n"
-	" \n"
-	"For a list of the features and functions whose levels can be\n"
-	"set, see HELP LEVELS DESC."),
-	/* CHAN_HELP_LEVELS_DESC */
-	_("The following feature/function names are understood. Note\n"
-	"that the leves for NOJOIN is the maximum level,\n"
-	"while all others are minimum levels."),
-	/* CHAN_HELP_LEVELS_DESC_FORMAT */
-	_("    %-*s  %s"),
-	/* CHAN_HELP_INFO */
-	_("Syntax: INFO channel\n"
-	" \n"
-	"Lists information about the named registered channel,\n"
-	"including its founder, time of registration, last time\n"
-	"used, description, and mode lock, if any. If ALL is \n"
-	"specified, the entry message and successor will also \n"
-	"be displayed."),
-	/* CHAN_HELP_LIST */
-	_("Syntax: LIST pattern\n"
-	" \n"
-	"Lists all registered channels matching the given pattern.\n"
-	"(Channels with the PRIVATE option set are not listed.)\n"
-	"Note that a preceding '#' specifies a range, channel names\n"
-	"are to be written without '#'."),
-	/* CHAN_HELP_OP */
-	_("Syntax: OP [#channel] [nick]\n"
-	" \n"
-	"Ops a selected nick on a channel. If nick is not given,\n"
-	"it will op you. If channel is not given, it will op you\n"
-	"on every channel.\n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 access \n"
-	"and above on the channel."),
-	/* CHAN_HELP_DEOP */
-	_("Syntax: DEOP [#channel] [nick]\n"
-	" \n"
-	"Deops a selected nick on a channel. If nick is not given,\n"
-	"it will deop you. If channel is not given, it will deop\n"
-	"you on every channel.\n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 access \n"
-	"and above on the channel."),
-	/* CHAN_HELP_VOICE */
-	_("Syntax: VOICE [#channel] [nick]\n"
-	" \n"
-	"Voices a selected nick on a channel. If nick is not given,\n"
-	"it will voice you. If channel is not given, it will voice you\n"
-	"on every channel.\n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 access \n"
-	"and above on the channel, or to VOPs or those with level 3 \n"
-	"and above for self voicing."),
-	/* CHAN_HELP_DEVOICE */
-	_("Syntax: DEVOICE [#channel] [nick]\n"
-	" \n"
-	"Devoices a selected nick on a channel. If nick is not given,\n"
-	"it will devoice you. If channel is not given, it will devoice\n"
-	"you on every channel.\n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 access \n"
-	"and above on the channel, or to VOPs or those with level 3 \n"
-	"and above for self devoicing."),
-	/* CHAN_HELP_HALFOP */
-	_("Syntax: HALFOP [#channel] [nick]\n"
-	" \n"
-	"Halfops a selected nick on a channel. If nick is not given,\n"
-	"it will halfop you. If channel is not given, it will halfop\n"
-	"you on every channel.\n"
-	" \n"
-	"By default, limited to AOPs and those with level 5 access \n"
-	"and above on the channel, or to HOPs or those with level 4 \n"
-	"and above for self halfopping."),
-	/* CHAN_HELP_DEHALFOP */
-	_("Syntax: DEHALFOP [#channel] [nick]\n"
-	" \n"
-	"Dehalfops a selected nick on a channel. If nick is not given,\n"
-	"it will dehalfop you. If channel is not given, it will dehalfop\n"
-	"you on every channel.\n"
-	" \n"
-	"By default, limited to AOPs and those with level 5 access \n"
-	"and above on the channel, or to HOPs or those with level 4 \n"
-	"and above for self dehalfopping."),
-	/* CHAN_HELP_PROTECT */
-	_("Syntax: PROTECT [#channel] [nick]\n"
-	" \n"
-	"Protects a selected nick on a channel. If nick is not given,\n"
-	"it will protect you. If channel is not given, it will protect\n"
-	"you on every channel.\n"
-	" \n"
-	"By default, limited to the founder, or to SOPs or those with \n"
-	"level 10 and above on the channel for self protecting."),
-	/* CHAN_HELP_DEPROTECT */
-	_("Syntax: DEPROTECT [#channel] [nick]\n"
-	" \n"
-	"Deprotects a selected nick on a channel. If nick is not given,\n"
-	"it will deprotect you. If channel is not given, it will deprotect\n"
-	"you on every channel.\n"
-	" \n"
-	"By default, limited to the founder, or to SOPs or those with \n"
-	"level 10 and above on the channel for self deprotecting."),
-	/* CHAN_HELP_OWNER */
-	_("Syntax: OWNER [#channel] [\037nick\037]\n"
-	" \n"
-	"Gives the selected nick owner status on channel. If nick is not\n"
-	"given, it will give you owner. If channel is not given, it will\n"
-	"give you owner on every channel.\n"
-	" \n"
-	"Limited to those with founder access on the channel."),
-	/* CHAN_HELP_DEOWNER */
-	_("Syntax: DEOWNER [#channel] [\037nick\037]\n"
-	" \n"
-	"Removes owner status from the selected nick on channel. If nick\n"
-	"is not given, it will deowner you. If channel is not given, it will\n"
-	"deowner you on every channel.\n"
-	" \n"
-	"Limited to those with founder access on the channel."),
-	/* CHAN_HELP_INVITE */
-	_("Syntax: INVITE channel\n"
-	" \n"
-	"Tells %S to invite you into the given channel.  \n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 and above\n"
-	"on the channel."),
-	/* CHAN_HELP_UNBAN */
-	_("Syntax: UNBAN channel [nick]\n"
-	" \n"
-	"Tells %S to remove all bans preventing you or the given\n"
-	"user from entering the given channel.  \n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 and above\n"
-	"on the channel."),
-	/* CHAN_HELP_KICK */
-	_("Syntax: KICK #channel nick [reason]\n"
-	" \n"
-	"Kicks a selected nick on a channel.\n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 access \n"
-	"and above on the channel."),
-	/* CHAN_HELP_BAN */
-	_("Syntax: BAN #channel nick [reason]\n"
-	" \n"
-	"Bans a selected nick on a channel.\n"
-	" \n"
-	"By default, limited to AOPs or those with level 5 access \n"
-	"and above on the channel."),
-	/* CHAN_HELP_TOPIC */
-	_("Syntax: TOPIC channel [topic]\n"
-	" \n"
-	"Causes %S to set the channel topic to the one\n"
-	"specified. If topic is not given, then an empty topic\n"
-	"is set. This command is most useful in conjunction\n"
-	"with SET TOPICLOCK. See %R%S HELP SET TOPICLOCK\n"
-	"for more information.\n"
-	" \n"
-	"By default, limited to those with founder access on the\n"
-	"channel."),
-	/* CHAN_HELP_CLEARUSERS */
-	_("Syntax: CLEARUSERS channel\n"
-	" \n"
-	"Tells %S to clear (kick) all users certain settings on a channel."
-	" \n"
-	"By default, limited to those with founder access on the\n"
-	"channel."),
-	/* CHAN_HELP_GETKEY */
-	_("Syntax: GETKEY channel\n"
-	" \n"
-	"Returns the key of the given channel."),
-	/* CHAN_HELP_CLONE */
-	_("Syntax: \002CLONE \037channel\037 \037target\037 [all | access | akick | badwords]\002\n"
-	" \n"
-	"Copies all settings, access, akicks, etc from channel to the\n"
-	"target channel. If access, akick, or badwords is specified then only\n"
-	"the respective settings are transferred. You must have founder level\n"
-	"access to \037channel\037 and \037target\037."),
-	/* CHAN_HELP_MODE */
-	_("Syntax: \002MODE \037channel\037 LOCK {ADD|DEL|LIST} [\037what\037]\002\n"
-	"        \002MODE \037channel\037 SET \037modes\037\002\n"
-	" \n"
-	"Mainly controls mode locks and mode access (which is different from channel access)\n"
-	"on a channel.\n"
-	" \n"
-	"The \002MODE LOCK\002 command allows you to add, delete, and view mode locks on a channel.\n"
-	"If a mode is locked on or off, services will not allow that mode to be changed.\n"
-	"Example:\n"
-	"     \002MODE #channel LOCK ADD +bmnt *!*@*aol*\002\n"
-	" \n"
-	"The \002MODE SET\002 command allows you to set modes through services. Wildcards * and ? may\n"
-	"be given as parameters for list and status modes.\n"
-	"Example:\n"
-	"     \002MODE #channel SET +v *\002\n"
-	"       Sets voice status to all users in the channel.\n"
-	" \n"
-	"     \002MODE #channel SET -b ~c:*\n"
-	"       Clears all extended bans that start with ~c:"),
-	/* CHAN_HELP_ENTRYMSG */
-	_("Syntax: \002ENTRYMSG \037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]\002\n"
-	" \n"
-	"Controls what messages will be sent to users when they join the channel."),
-	/* CHAN_SERVADMIN_HELP */
-	_(" \n"
-	"Services Operators can also drop any channel without needing\n"
-	"to identify via password, and may view the access, AKICK,\n"
-	"and level setting lists for any channel."),
-	/* CHAN_SERVADMIN_HELP_DROP */
-	_("Syntax: DROP channel\n"
-	" \n"
-	"Unregisters the named channel.  Only Services Operators\n"
-	"can drop a channel for which they have not identified."),
-	/* CHAN_SERVADMIN_HELP_SET_NOEXPIRE */
-	_("Syntax: SET channel NOEXPIRE {ON | OFF}\n"
-	" \n"
-	"Sets whether the given channel will expire.  Setting this\n"
-	"to ON prevents the channel from expiring."),
-	/* CHAN_SERVADMIN_HELP_FORBID */
-	_("Syntax: FORBID channel [reason]\n"
-	" \n"
-	"Disallows anyone from registering or using the given\n"
-	"channel.  May be cancelled by dropping the channel.\n"
-	" \n"
-	"Reason may be required on certain networks."),
-	/* CHAN_SERVADMIN_HELP_SUSPEND */
-	_("Syntax: SUSPEND channel [reason]\n"
-	" \n"
-	"Disallows anyone from registering or using the given\n"
-	"channel.  May be cancelled by using the UNSUSPEND\n"
-	"command to preserve all previous channel data/settings.\n"
-	" \n"
-	"Reason may be required on certain networks."),
-	/* CHAN_SERVADMIN_HELP_UNSUSPEND */
-	_("Syntax: UNSUSPEND channel\n"
-	" \n"
-	"Releases a suspended channel. All data and settings\n"
-	"are preserved from before the suspension."),
-	/* CHAN_SERVADMIN_HELP_STATUS */
-	_("Syntax: STATUS channel nickname\n"
-	" \n"
-	"Returns the current access level of the given nick on the\n"
-	"given channel.  The reply is of the form:\n"
-	" \n"
-	"    STATUS channel nickname access-level\n"
-	" \n"
-	"If an error occurs, the reply will be in the form:\n"
-	" \n"
-	"    STATUS ERROR error-message"),
-	/* MEMO_HELP_CMD_SEND */
-	_("    SEND   Send a memo to a nick or channel"),
-	/* MEMO_HELP_CMD_CANCEL */
-	_("    CANCEL Cancel last memo you sent"),
-	/* MEMO_HELP_CMD_LIST */
-	_("    LIST   List your memos"),
-	/* MEMO_HELP_CMD_READ */
-	_("    READ   Read a memo or memos"),
-	/* MEMO_HELP_CMD_DEL */
-	_("    DEL    Delete a memo or memos"),
-	/* MEMO_HELP_CMD_SET */
-	_("    SET    Set options related to memos"),
-	/* MEMO_HELP_CMD_INFO */
-	_("    INFO   Displays information about your memos"),
-	/* MEMO_HELP_CMD_RSEND */
-	_("    RSEND  Sends a memo and requests a read receipt"),
-	/* MEMO_HELP_CMD_CHECK */
-	_("    CHECK  Checks if last memo to a nick was read"),
-	/* MEMO_HELP_CMD_SENDALL */
-	_("    SENDALL  Send a memo to all registered users"),
-	/* MEMO_HELP_CMD_STAFF */
-	_("    STAFF  Send a memo to all opers/admins"),
-	/* MEMO_HELP_CMD_IGNORE */
-	_("    IGNORE Manage your memo ignore list"),
-	/* MEMO_HELP_HEADER */
-	_("%S is a utility allowing IRC users to send short\n"
-	"messages to other IRC users, whether they are online at\n"
-	"the time or not, or to channels(*). Both the sender's\n"
-	"nickname and the target nickname or channel must be\n"
-	"registered in order to send a memo.\n"
-	"%S's commands include:"),
-	/* MEMO_HELP_FOOTER */
-	_("Type %R%S HELP command for help on any of the\n"
-	"above commands.\n"
-	"(*) By default, any user with at least level 10 access on a\n"
-	"    channel can read that channel's memos. This can be\n"
-	"    changed with the %s LEVELS command."),
-	/* MEMO_HELP_SEND */
-	_("Syntax: SEND {nick | channel} memo-text\n"
-	" \n"
-	"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"
-	"nickname/channel must be registered."),
-	/* MEMO_HELP_CANCEL */
-	_("Syntax: CANCEL {nick | channel}\n"
-	" \n"
-	"Cancels the last memo you sent to the given nick or channel,\n"
-	"provided it has not been read at the time you use the command."),
-	/* MEMO_HELP_LIST */
-	_("Syntax: LIST [channel] [list | NEW]\n"
-	" \n"
-	"Lists any memos you currently have. With NEW, lists only\n"
-	"new (unread) memos. Unread memos are marked with a \"*\"\n"
-	"to the left of the memo number. You can also specify a list\n"
-	"of numbers, as in the example below:\n"
-	"   LIST 2-5,7-9\n"
-	"      Lists memos numbered 2 through 5 and 7 through 9."),
-	/* MEMO_HELP_READ */
-	_("Syntax: READ [channel] {num | list | LAST | NEW}\n"
-	" \n"
-	"Sends you the text of the memos specified. If LAST is\n"
-	"given, sends you the memo you most recently received. If\n"
-	"NEW is given, sends you all of your new memos.  Otherwise,\n"
-	"sends you memo number num. You can also give a list of\n"
-	"numbers, as in this example:\n"
-	" \n"
-	"   READ 2-5,7-9\n"
-	"      Displays memos numbered 2 through 5 and 7 through 9."),
-	/* MEMO_HELP_DEL */
-	_("Syntax: DEL [channel] {num | list | LAST | ALL}\n"
-	" \n"
-	"Deletes the specified memo or memos. You can supply\n"
-	"multiple memo numbers or ranges of numbers instead of a\n"
-	"single number, as in the second example below.\n"
-	" \n"
-	"If LAST is given, the last memo will be deleted.\n"
-	"If ALL is given, deletes all of your memos.\n"
-	" \n"
-	"Examples:\n"
-	" \n"
-	"   DEL 1\n"
-	"      Deletes your first memo.\n"
-	" \n"
-	"   DEL 2-5,7-9\n"
-	"      Deletes memos numbered 2 through 5 and 7 through 9."),
-	/* MEMO_HELP_SET */
-	_("Syntax: SET option parameters\n"
-	"Sets various memo options.  option can be one of:\n"
-	" \n"
-	"    NOTIFY      Changes when you will be notified about\n"
-	"                   new memos (only for nicknames)\n"
-	"    LIMIT       Sets the maximum number of memos you can\n"
-	"                   receive\n"
-	" \n"
-	"Type %R%S HELP SET option for more information\n"
-	"on a specific option."),
-	/* MEMO_HELP_SET_NOTIFY */
-	_("Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
-	"Changes when you will be notified about new memos:\n"
-	" \n"
-	"    ON      You will be notified of memos when you log on,\n"
-	"               when you unset /AWAY, and when they are sent\n"
-	"               to you.\n"
-	"    LOGON   You will only be notified of memos when you log\n"
-	"               on or when you unset /AWAY.\n"
-	"    NEW     You will only be notified of memos when they\n"
-	"               are sent to you.\n"
-	"    MAIL    You will be notified of memos by email aswell as\n"
-	"               any other settings you have.\n"
-	"    NOMAIL  You will not be notified of memos by email.\n"
-	"    OFF     You will not receive any notification of memos.\n"
-	" \n"
-	"ON is essentially LOGON and NEW combined."),
-	/* MEMO_HELP_SET_LIMIT */
-	_("Syntax: SET LIMIT [channel] limit\n"
-	" \n"
-	"Sets the maximum number of memos you (or the given channel)\n"
-	"are allowed to have. If you set this to 0, no one will be\n"
-	"able to send any memos to you.  However, you cannot set\n"
-	"this any higher than %d."),
-	/* MEMO_HELP_INFO */
-	_("Syntax: INFO [channel]\n"
-	" \n"
-	"Displays information on the number of memos you have, how\n"
-	"many of them are unread, and how many total memos you can\n"
-	"receive.  With a parameter, displays the same information\n"
-	"for the given channel."),
-	/* MEMO_SERVADMIN_HELP_SET_LIMIT */
-	_("Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
-	" \n"
-	"Sets the maximum number of memos a user or channel is\n"
-	"allowed to have.  Setting the limit to 0 prevents the user\n"
-	"from receiving any memos; setting it to NONE allows the\n"
-	"user to receive and keep as many memos as they want.  If\n"
-	"you do not give a nickname or channel, your own limit is\n"
-	"set.\n"
-	" \n"
-	"Adding HARD prevents the user from changing the limit.  Not\n"
-	"adding HARD has the opposite effect, allowing the user to\n"
-	"change the limit (even if a previous limit was set with\n"
-	"HARD).\n"
-	"This use of the SET LIMIT command is limited to Services\n"
-	"admins.  Other users may only enter a limit for themselves\n"
-	"or a channel on which they have such privileges, may not\n"
-	"remove their limit, may not set a limit above %d, and may\n"
-	"not set a hard limit."),
-	/* MEMO_SERVADMIN_HELP_INFO */
-	_("Syntax: INFO [nick | channel]\n"
-	"Without a parameter, displays information on the number of\n"
-	"memos you have, how many of them are unread, and how many\n"
-	"total memos you can receive.\n"
-	" \n"
-	"With a channel parameter, displays the same information for\n"
-	"the given channel.\n"
-	" \n"
-	"With a nickname parameter, displays the same information\n"
-	"for the given nickname.  This use limited to Services\n"
-	"admins."),
-	/* MEMO_HELP_STAFF */
-	_("Syntax: STAFF memo-text\n"
-	"Sends all services staff a memo containing memo-text."),
-	/* MEMO_HELP_SENDALL */
-	_("Syntax: SENDALL memo-text\n"
-	"Sends all registered users a memo containing memo-text."),
-	/* MEMO_HELP_RSEND */
-	_("Syntax: RSEND {nick | channel} memo-text\n"
-	" \n"
-	"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"
-	"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"
-	"has been read."),
-	/* MEMO_HELP_CHECK */
-	_("Syntax: CHECK nick\n"
-	" \n"
-	"Checks whether the _last_ memo you sent to nick has been read\n"
-	"or not. Note that this does only work with nicks, not with chans."),
-	/* MEMO_HELP_IGNORE */
-	_("Syntax: \002IGNORE [\037channek\037] {\002ADD|DEL|LIST\002} [\037entry\037]\n"
-	" \n"
-	"Allows you to ignore users by nick or host from memoing you. If someone on your\n"
-	"memo ignore list tries to memo you, they will not be told that you have them ignored."),
-	/* OPER_HELP_CMD_GLOBAL */
-	_("    GLOBAL      Send a message to all users"),
-	/* OPER_HELP_CMD_STATS */
-	_("    STATS       Show status of Services and network"),
-	/* OPER_HELP_CMD_STAFF */
-	_("    STAFF       Display Services staff and online status"),
-	/* OPER_HELP_CMD_MODE */
-	_("    MODE        Change a channel's modes"),
-	/* OPER_HELP_CMD_KICK */
-	_("    KICK        Kick a user from a channel"),
-	/* OPER_HELP_CMD_AKILL */
-	_("    AKILL       Manipulate the AKILL list"),
-	/* OPER_HELP_CMD_SNLINE */
-	_("    SNLINE      Manipulate the SNLINE list"),
-	/* OPER_HELP_CMD_SQLINE */
-	_("    SQLINE      Manipulate the SQLINE list"),
-	/* OPER_HELP_CMD_SZLINE */
-	_("    SZLINE      Manipulate the SZLINE list"),
-	/* OPER_HELP_CMD_CHANLIST */
-	_("    CHANLIST    Lists all channel records"),
-	/* OPER_HELP_CMD_USERLIST */
-	_("    USERLIST    Lists all user records"),
-	/* OPER_HELP_CMD_LOGONNEWS */
-	_("    LOGONNEWS   Define messages to be shown to users at logon"),
-	/* OPER_HELP_CMD_RANDOMNEWS */
-	_("    RANDOMNEWS  Define messages to be randomly shown to users \n"
-	"                at logon"),
-	/* OPER_HELP_CMD_OPERNEWS */
-	_("    OPERNEWS    Define messages to be shown to users who oper"),
-	/* OPER_HELP_CMD_SESSION */
-	_("    SESSION     View the list of host sessions"),
-	/* OPER_HELP_CMD_EXCEPTION */
-	_("    EXCEPTION   Modify the session-limit exception list"),
-	/* OPER_HELP_CMD_NOOP */
-	_("    NOOP        Temporarily remove all O:lines of a server \n"
-	"                remotely"),
-	/* OPER_HELP_CMD_JUPE */
-	_("    JUPE        \"Jupiter\" a server"),
-	/* OPER_HELP_CMD_IGNORE */
-	_("    IGNORE      Modify the Services ignore list"),
-	/* OPER_HELP_CMD_SET */
-	_("    SET         Set various global Services options"),
-	/* OPER_HELP_CMD_RELOAD */
-	_("    RELOAD      Reload services' configuration file"),
-	/* OPER_HELP_CMD_UPDATE */
-	_("    UPDATE      Force the Services databases to be\n"
-	"                updated on disk immediately"),
-	/* OPER_HELP_CMD_RESTART */
-	_("    RESTART     Save databases and restart Services"),
-	/* OPER_HELP_CMD_QUIT */
-	_("    QUIT        Terminate the Services program with no save"),
-	/* OPER_HELP_CMD_SHUTDOWN */
-	_("    SHUTDOWN    Terminate the Services program with save"),
-	/* OPER_HELP_CMD_DEFCON */
-	_("    DEFCON      Manipulate the DefCon system"),
-	/* OPER_HELP_CMD_CHANKILL */
-	_("    CHANKILL    AKILL all users on a specific channel"),
-	/* OPER_HELP_CMD_OLINE */
-	_("    OLINE       Give Operflags to a certain user"),
-	/* OPER_HELP_CMD_UMODE */
-	_("    UMODE       Change a user's modes"),
-	/* OPER_HELP_CMD_SVSNICK */
-	_("    SVSNICK     Forcefully change a user's nickname"),
-	/* OPER_HELP_CMD_MODLOAD */
-	_("    MODLOAD     Load a module"),
-	/* OPER_HELP_CMD_MODUNLOAD */
-	_("    MODUNLOAD   Un-Load a module"),
-	/* OPER_HELP_CMD_MODRELOAD */
-	_("    MODRELOAD   Reload a module"),
-	/* OPER_HELP_CMD_MODINFO */
-	_("    MODINFO     Info about a loaded module"),
-	/* OPER_HELP_CMD_MODLIST */
-	_("    MODLIST     List loaded modules"),
-	/* OPER_HELP */
-	_("%S commands:"),
-	/* OPER_HELP_LOGGED */
-	_("Notice: All commands sent to %S are logged!"),
-	/* OPER_HELP_GLOBAL */
-	_("Syntax: GLOBAL message\n"
-	" \n"
-	"Allows Administrators to send messages to all users on the \n"
-	"network. The message will be sent from the nick %s."),
-	/* OPER_HELP_STATS */
-	_("Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
-	" \n"
-	"Without any option, shows the current number of users and\n"
-	"IRCops online (excluding Services), the highest number of\n"
-	"users online since Services was started, and the length of\n"
-	"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"
-	" \n"
-	"The RESET option currently resets the maximum user count\n"
-	"to the number of users currently present on the network.\n"
-	" \n"
-	"The MEMORY option displays information on the memory\n"
-	"usage of Services. Using this option can freeze Services for\n"
-	"a short period of time on large networks; don't overuse it!\n"
-	" \n"
-	"The UPLINK option displays information about the current\n"
-	"server Anope uses as an uplink to the network.\n"
-	" \n"
-	"The ALL displays the user and uptime statistics, and\n"
-	"everything you'd see with MEMORY and UPLINK options."),
-	/* OPER_HELP_IGNORE */
-	_("Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
-	" \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"
-	"When adding a mask, it should be in the format user@host\n"
-	"or nick!user@host, everything else will be considered a nick.\n"
-	"Wildcards are permitted.\n"
-	" \n"
-	"Ignores will not be enforced on IRC Operators."),
-	/* OPER_HELP_MODE */
-	_("Syntax: MODE channel modes\n"
-	" \n"
-	"Allows Services operators to set channel modes for any\n"
-	"channel.  Parameters are the same as for the standard /MODE\n"
-	"command."),
-	/* OPER_HELP_UMODE */
-	_("Syntax: UMODE user modes\n"
-	" \n"
-	"Allows Services Opers to set user modes for any user.\n"
-	"Parameters are the same as for the standard /MODE\n"
-	"command."),
-	/* OPER_HELP_OLINE */
-	_("Syntax: OLINE user flags\n"
-	" \n"
-	"Allows Services Opers 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."),
-	/* OPER_HELP_KICK */
-	_("Syntax: KICK channel user reason\n"
-	" \n"
-	"Allows staff to kick a user from any channel.\n"
-	"Parameters are the same as for the standard /KICK\n"
-	"command. The kick message will have the nickname of the\n"
-	"IRCop sending the KICK command prepended; for example:\n"
-	" \n"
-	"*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))"),
-	/* OPER_HELP_SVSNICK */
-	_("Syntax: SVSNICK nick newnick\n"
-	" \n"
-	"Forcefully changes a user's nickname from nick to newnick."),
-	/* OPER_HELP_AKILL */
-	_("Syntax: AKILL ADD [+expiry] mask reason\n"
-	"        AKILL DEL {mask | entry-num | list}\n"
-	"        AKILL LIST [mask | list]\n"
-	"        AKILL VIEW [mask | list]\n"
-	"        AKILL CLEAR\n"
-	" \n"
-	"Allows Services operators to manipulate the AKILL list. If\n"
-	"a user matching an AKILL mask attempts to connect, Services\n"
-	"will issue a KILL for that user and, on supported server\n"
-	"types, will instruct all servers to add a ban (K-line) for\n"
-	"the mask which the user matched.\n"
-	" \n"
-	"AKILL ADD adds the given nick or user@host/ip mask to the AKILL\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"
-	"1h30m) are not permitted.  If a unit specifier is not \n"
-	"included, the default is days (so +30 by itself means 30 \n"
-	"days). To add an AKILL which does not expire, use +0. If the\n"
-	"usermask to be added starts with a +, an expiry time must\n"
-	"be given, even if it is the same as the default. The\n"
-	"current AKILL default expiry time can be found with the\n"
-	"STATS AKILL command.\n"
-	" \n"
-	"The AKILL DEL command removes the given mask from the\n"
-	"AKILL list if it is present.  If a list of entry numbers is \n"
-	"given, those entries are deleted.  (See the example for LIST \n"
-	"below.)\n"
-	" \n"
-	"The AKILL LIST command displays the AKILL list.  \n"
-	"If a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   AKILL LIST 2-5,7-9\n"
-	"      Lists AKILL entries numbered 2 through 5 and 7 \n"
-	"      through 9.\n"
-	"      \n"
-	"AKILL VIEW is a more verbose version of AKILL LIST, and \n"
-	"will show who added an AKILL, the date it was added, and when \n"
-	"it expires, as well as the user@host/ip mask and reason.\n"
-	" \n"
-	"AKILL CLEAR clears all entries of the AKILL list."),
-	/* OPER_HELP_SNLINE */
-	_("Syntax: SNLINE ADD [+expiry] mask:reason\n"
-	"    SNLINE DEL {mask | entry-num | list}\n"
-	"        SNLINE LIST [mask | list]\n"
-	"        SNLINE VIEW [mask | list]\n"
-	"        SNLINE CLEAR\n"
-	" \n"
-	"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"
-	"session.\n"
-	" \n"
-	"SNLINE ADD adds the given realname mask to the SNLINE\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"
-	"1h30m) are not permitted.  If a unit specifier is not \n"
-	"included, the default is days (so +30 by itself means 30 \n"
-	"days).  To add an SNLINE which does not expire, use +0.  If the\n"
-	"realname mask to be added starts with a +, an expiry time must\n"
-	"be given, even if it is the same as the default.  The\n"
-	"current SNLINE default expiry time can be found with the\n"
-	"STATS AKILL command.\n"
-	"Note: because the realname mask may contain spaces, the\n"
-	"separator between it and the reason is a colon.\n"
-	" \n"
-	"The SNLINE DEL command removes the given mask from the\n"
-	"SNLINE list if it is present.  If a list of entry numbers is \n"
-	"given, those entries are deleted.  (See the example for LIST \n"
-	"below.)\n"
-	" \n"
-	"The SNLINE LIST command displays the SNLINE list.  \n"
-	"If a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   SNLINE LIST 2-5,7-9\n"
-	"      Lists SNLINE entries numbered 2 through 5 and 7 \n"
-	"      through 9.\n"
-	"      \n"
-	"SNLINE VIEW is a more verbose version of SNLINE LIST, and \n"
-	"will show who added an SNLINE, the date it was added, and when \n"
-	"it expires, as well as the realname mask and reason.\n"
-	" \n"
-	"SNLINE CLEAR clears all entries of the SNLINE list."),
-	/* OPER_HELP_SQLINE */
-	_("Syntax: SQLINE ADD [+expiry] mask reason\n"
-	"        SQLINE DEL {mask | entry-num | list}\n"
-	"        SQLINE LIST [mask | list]\n"
-	"        SQLINE VIEW [mask | list]\n"
-	"        SQLINE CLEAR\n"
-	" \n"
-	"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"
-	"session.\n"
-	"If the first character of the mask is #, services will \n"
-	"prevent the use of matching channels (on IRCds that \n"
-	"support it).\n"
-	" \n"
-	"SQLINE ADD adds the given (nick's) 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"
-	"1h30m) are not permitted. If a unit specifier is not \n"
-	"included, the default is days (so +30 by itself means 30 \n"
-	"days). To add an SQLINE which does not expire, use +0.  \n"
-	"If the mask to be added starts with a +, an expiry time \n"
-	"must be given, even if it is the same as the default. The\n"
-	"current SQLINE default expiry time can be found with the\n"
-	"STATS AKILL command.\n"
-	" \n"
-	"The SQLINE DEL command removes the given mask from the\n"
-	"SQLINE list if it is present. If a list of entry numbers is \n"
-	"given, those entries are deleted. (See the example for LIST \n"
-	"below.)\n"
-	" \n"
-	"The SQLINE LIST command displays the SQLINE list.\n"
-	"If a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed. If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   SQLINE LIST 2-5,7-9\n"
-	"      Lists SQLINE entries numbered 2 through 5 and 7 \n"
-	"      through 9.\n"
-	"      \n"
-	"SQLINE VIEW is a more verbose version of SQLINE LIST, and \n"
-	"will show who added an SQLINE, the date it was added, and when \n"
-	"it expires, as well as the mask and reason.\n"
-	" \n"
-	"SQLINE CLEAR clears all entries of the SQLINE list."),
-	/* OPER_HELP_SZLINE */
-	_("Syntax: SZLINE ADD [+expiry] mask reason\n"
-	"        SZLINE DEL {mask | entry-num | list}\n"
-	"        SZLINE LIST [mask | list]\n"
-	"        SZLINE VIEW [mask | list]\n"
-	"        SZLINE CLEAR\n"
-	" \n"
-	"Allows Services operators to manipulate the SZLINE list.  If\n"
-	"a user with an IP matching an SZLINE mask attempts to \n"
-	"connect, Services will not allow it to pursue his IRC\n"
-	"session (and this, whether the IP has a PTR RR or not).\n"
-	" \n"
-	"SZLINE ADD adds the given (nick's) IP mask to the SZLINE\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"
-	"1h30m) are not permitted. If a unit specifier is not \n"
-	"included, the default is days (so +30 by itself means 30 \n"
-	"days).  To add an SZLINE which does not expire, use +0.  If the\n"
-	"realname mask to be added starts with a +, an expiry time must\n"
-	"be given, even if it is the same as the default. The\n"
-	"current SZLINE default expiry time can be found with the\n"
-	"STATS AKILL command.\n"
-	" \n"
-	"The SZLINE DEL command removes the given mask from the\n"
-	"SZLINE list if it is present. If a list of entry numbers is \n"
-	"given, those entries are deleted. (See the example for LIST \n"
-	"below.)\n"
-	" \n"
-	"The SZLINE LIST command displays the SZLINE list.\n"
-	"If a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed. If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   SZLINE LIST 2-5,7-9\n"
-	"      Lists SZLINE entries numbered 2 through 5 and 7 \n"
-	"      through 9.\n"
-	"      \n"
-	"SZLINE VIEW is a more verbose version of SZLINE LIST, and \n"
-	"will show who added an SZLINE, the date it was added, and when\n"
-	"it expires, as well as the IP mask and reason.\n"
-	" \n"
-	"SZLINE CLEAR clears all entries of the SZLINE list."),
-	/* OPER_HELP_SET */
-	_("Syntax: SET option setting\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"
-	"    NOEXPIRE   Activate or deactivate no expire mode\n"
-	"    SUPERADMIN Activate or deactivate super-admin mode\n"
-	"    LIST       List the options"),
-	/* OPER_HELP_SET_READONLY */
-	_("Syntax: SET 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"
-	"including channel and nickname access lists, etc.  IRCops\n"
-	"with sufficient Services privileges will be able to modify\n"
-	"Services' AKILL list and drop or forbid nicknames and\n"
-	"channels, but any such changes will not be saved unless\n"
-	"read-only mode is deactivated before Services is terminated\n"
-	"or restarted.\n"
-	" \n"
-	"This option is equivalent to the command-line option\n"
-	"-readonly."),
-	/* OPER_HELP_SET_DEBUG */
-	_("Syntax: SET DEBUG {ON | OFF | num}\n"
-	" \n"
-	"Sets debug mode on or off.  In debug mode, all data sent to\n"
-	"and from Services as well as a number of other debugging\n"
-	"messages are written to the log file. If num is\n"
-	"given, debug mode is activated, with the debugging level set\n"
-	"to num.\n"
-	"This option is equivalent to the command-line option\n"
-	"-debug."),
-	/* OPER_HELP_SET_NOEXPIRE */
-	_("Syntax: SET NOEXPIRE {ON | OFF}\n"
-	"Sets no expire mode on or off. In no expire mode, nicks,\n"
-	"channels, akills and exceptions won't expire until the\n"
-	"option is unset.\n"
-	"This option is equivalent to the command-line option\n"
-	"-noexpire."),
-	/* OPER_HELP_SET_SUPERADMIN */
-	_("Syntax: SET SUPERADMIN {ON | OFF}\n"
-	"Setting this will grant you extra privileges such as the\n"
-	"ability to be \"founder\" on all channel's etc...\n"
-	"This option is not persistent, and should only be used when\n"
-	"needed, and set back to OFF when no longer needed."),
-	/* OPER_HELP_SET_LIST */
-	_("Syntax: SET LIST\n"
-	"Display the various %S settings"),
-	/* OPER_HELP_NOOP */
-	_("Syntax: NOOP SET server\n"
-	"          NOOP REVOKE server\n"
-	"NOOP SET remove all O:lines of the given\n"
-	"server and kill all IRCops currently on it to\n"
-	"prevent them from rehashing the server (because this\n"
-	"would just cancel the effect).\n"
-	"NOOP REVOKE makes all removed O:lines available again\n"
-	"on the given server.\n"
-	"Note: The server is not checked at all by the\n"
-	"Services."),
-	/* OPER_HELP_JUPE */
-	_("Syntax: JUPE server [reason]\n"
-	" \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"
-	"otherwise, the server information field will contain the\n"
-	"text \"Juped by <nick>\", showing the nickname of the\n"
-	"person who jupitered the server."),
-	/* OPER_HELP_UPDATE */
-	_("Syntax: UPDATE\n"
-	" \n"
-	"Causes Services to update all database files as soon as you\n"
-	"send the command."),
-	/* OPER_HELP_RELOAD */
-	_("Syntax: RELOAD\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.)"),
-	/* OPER_HELP_QUIT */
-	_("Syntax: QUIT\n"
-	" \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.  For normal shutdowns, use the\n"
-	"SHUTDOWN command."),
-	/* OPER_HELP_SHUTDOWN */
-	_("Syntax: SHUTDOWN\n"
-	" \n"
-	"Causes Services to save all databases and then shut down."),
-	/* OPER_HELP_RESTART */
-	_("Syntax: RESTART\n"
-	" \n"
-	"Causes Services to save all databases and then restart\n"
-	"(i.e. exit and immediately re-run the executable)."),
-	/* OPER_HELP_CHANLIST */
-	_("Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
-	" \n"
-	"Lists all channels currently in use on the IRC network, whether they\n"
-	"are registered or not.\n"
-	"If pattern is given, lists only channels that match it. If a nickname\n"
-	"is given, lists only the channels the user using it is on. If SECRET is\n"
-	"specified, lists only channels matching pattern that have the +s or\n"
-	"+p mode."),
-	/* OPER_HELP_USERLIST */
-	_("Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
-	" \n"
-	"Lists all users currently online on the IRC network, whether their\n"
-	"nick is registered or not.\n"
-	" \n"
-	"If pattern is given, lists only users that match it (it must be in\n"
-	"the format nick!user@host). If channel is given, lists only users\n"
-	"that are on the given channel. If INVISIBLE is specified, only users\n"
-	"with the +i flag will be listed."),
-	/* OPER_HELP_MODLOAD */
-	_("Syntax: MODLOAD FileName\n"
-	" \n"
-	"This command loads the module named FileName from the modules\n"
-	"directory."),
-	/* OPER_HELP_MODUNLOAD */
-	_("Syntax: MODUNLOAD FileName\n"
-	" \n"
-	"This command unloads the module named FileName from the modules\n"
-	"directory."),
-	/* OPER_HELP_MODRELOAD */
-	_("Syntax: \002MODRELOAD\002 \002FileName\002\n"
-	" \n"
-	"This command reloads the module named FileName."),
-	/* OPER_HELP_MODINFO */
-	_("Syntax: MODINFO FileName\n"
-	" \n"
-	"This command lists information about the specified loaded module"),
-	/* OPER_HELP_MODLIST */
-	_("Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
-	" \n"
-	"Lists all currently loaded modules."),
-	/* BOT_HELP_CMD_BOTLIST */
-	_("    BOTLIST        Lists available bots"),
-	/* BOT_HELP_CMD_ASSIGN */
-	_("    ASSIGN         Assigns a bot to a channel"),
-	/* BOT_HELP_CMD_SET */
-	_("    SET            Configures bot options"),
-	/* BOT_HELP_CMD_KICK */
-	_("    KICK           Configures kickers"),
-	/* BOT_HELP_CMD_BADWORDS */
-	_("    BADWORDS       Maintains bad words list"),
-	/* BOT_HELP_CMD_ACT */
-	_("    ACT            Makes the bot do the equivalent of a \"/me\" command"),
-	/* BOT_HELP_CMD_INFO */
-	_("    INFO           Allows you to see BotServ information about a channel or a bot"),
-	/* BOT_HELP_CMD_SAY */
-	_("    SAY            Makes the bot say the given text on the given channel"),
-	/* BOT_HELP_CMD_UNASSIGN */
-	_("    UNASSIGN       Unassigns a bot from a channel"),
-	/* BOT_HELP_CMD_BOT */
-	_("    BOT            Maintains network bot list"),
-	/* BOT_HELP */
-	_("%S allows you to have a bot on your own channel.\n"
-	"It has been created for users that can't host or\n"
-	"configure a bot, or for use on networks that don't\n"
-	"allow user bots. Available commands are listed \n"
-	"below; to use them, type %R%S command.  For \n"
-	"more information on a specific command, type %R\n"
-	"%S HELP command."),
-	/* BOT_HELP_FOOTER */
-	_("Bot will join a channel whenever there is at least\n"
-	"%d user(s) on it. Additionally, all %s commands\n"
-	"can be used if fantasy is enabled by prefixing the command\n"
-	"name with a %c."),
-	/* BOT_HELP_BOTLIST */
-	_("Syntax: BOTLIST\n"
-	" \n"
-	"Lists all available bots on this network."),
-	/* BOT_HELP_ASSIGN */
-	_("Syntax: ASSIGN chan nick\n"
-	" \n"
-	"Assigns a bot pointed out by nick to the channel chan. You\n"
-	"can then configure the bot for the channel so it fits\n"
-	"your needs."),
-	/* BOT_HELP_UNASSIGN */
-	_("Syntax: UNASSIGN chan\n"
-	" \n"
-	"Unassigns a bot from a channel. When you use this command,\n"
-	"the bot won't join the channel anymore. However, bot\n"
-	"configuration for the channel is kept, so you will always\n"
-	"be able to reassign a bot later without have to reconfigure\n"
-	"it entirely."),
-	/* BOT_HELP_INFO */
-	_("Syntax: INFO {chan | nick}\n"
-	" \n"
-	"Allows you to see %S information about a channel or a bot.\n"
-	"If the parameter is a channel, then you'll get information\n"
-	"such as enabled kickers. If the parameter is a nick,\n"
-	"you'll get information about a bot, such as creation\n"
-	"time or number of channels it is on."),
-	/* BOT_HELP_SET */
-	_("Syntax: SET (channel | bot) option parameters\n"
-	" \n"
-	"Configures bot options.  option can be one of:\n"
-	" \n"
-	"    DONTKICKOPS      To protect ops against bot kicks\n"
-	"    DONTKICKVOICES   To protect voices against bot kicks\n"
-	"    GREET            Enable greet messages\n"
-	"    FANTASY          Enable fantaisist commands\n"
-	"    SYMBIOSIS        Allow the bot to act as a real bot\n"
-	"    MSG              Configure how fantasy commands should be replied to\n"
-	" \n"
-	"Type %R%S HELP SET option for more information\n"
-	"on a specific option.\n"
-	"Note: access to this command is controlled by the\n"
-	"level SET."),
-	/* BOT_HELP_SET_DONTKICKOPS */
-	_("Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
-	" \n"
-	"Enables or disables ops protection mode on a channel.\n"
-	"When it is enabled, ops won't be kicked by the bot\n"
-	"even if they don't match the NOKICK level."),
-	/* BOT_HELP_SET_DONTKICKVOICES */
-	_("Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
-	" \n"
-	"Enables or disables voices protection mode on a channel.\n"
-	"When it is enabled, voices won't be kicked by the bot\n"
-	"even if they don't match the NOKICK level."),
-	/* BOT_HELP_SET_FANTASY */
-	_("Syntax: SET channel FANTASY {ON|OFF}\n"
-	"Enables or disables fantasy mode on a channel.\n"
-	"When it is enabled, users will be able to use\n"
-	"commands !op, !deop, !voice, !devoice,\n"
-	"!kick, !kb, !unban, !seen on a channel (find how \n"
-	"to use them; try with or without nick for each, \n"
-	"and with a reason for some?).\n"
-	" \n"
-	"Note that users wanting to use fantaisist\n"
-	"commands MUST have enough level for both\n"
-	"the FANTASIA and another level depending\n"
-	"of the command if required (for example, to use \n"
-	"!op, user must have enough access for the OPDEOP\n"
-	"level)."),
-	/* BOT_HELP_SET_GREET */
-	_("Syntax: SET channel GREET {ON|OFF}\n"
-	" \n"
-	"Enables or disables greet mode on a channel.\n"
-	"When it is enabled, the bot will display greet\n"
-	"messages of users joining the channel, provided\n"
-	"they have enough access to the channel."),
-	/* BOT_HELP_SET_SYMBIOSIS */
-	_("Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
-	" \n"
-	"Enables or disables symbiosis mode on a channel.\n"
-	"When it is enabled, the bot will do everything\n"
-	"normally done by %s on channels, such as MODEs,\n"
-	"KICKs, and even the entry message."),
-	/* BOT_HELP_SET_MSG */
-	_("Syntax: \002SET \037channel\037 MSG {\037OFF|PRIVMSG|NOTICE|NOTICEOPS\037}\002\n"
-	" \n"
-	"Configures how fantasy commands should be returned to the channel. Off disables\n"
-	"fantasy from replying to the channel. Privmsg, notice, and noticeops message the\n"
-	"channel, notice the channel, and notice the channel ops respectively.\n"
-	" \n"
-	"Note that replies over one line will not use this setting to prevent spam, and will\n"
-	"go directly to the user who executed it."),
-	/* BOT_HELP_KICK */
-	_("Syntax: KICK channel option parameters\n"
-	" \n"
-	"Configures bot kickers.  option can be one of:\n"
-	" \n"
-	"    AMSGS         Sets if the bot kicks for amsgs\n"
-	"    BOLDS         Sets if the bot kicks bolds\n"
-	"    BADWORDS      Sets if the bot kicks bad words\n"
-	"    CAPS          Sets if the bot kicks caps\n"
-	"    COLORS        Sets if the bot kicks colors\n"
-	"    FLOOD         Sets if the bot kicks flooding users\n"
-	"    REPEAT        Sets if the bot kicks users who repeat\n"
-	"                       themselves\n"
-	"    REVERSES      Sets if the bot kicks reverses\n"
-	"    UNDERLINES    Sets if the bot kicks underlines\n"
-	"    ITALICS       Sets if the bot kicks italics\n"
-	" \n"
-	"Type %R%S HELP KICK option for more information\n"
-	"on a specific option.\n"
-	" \n"
-	"Note: access to this command is controlled by the\n"
-	"level SET."),
-	/* BOT_HELP_KICK_BOLDS */
-	_("Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
-	"Sets the bolds kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who use bolds.\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_COLORS */
-	_("Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
-	"Sets the colors kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who use colors.\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_REVERSES */
-	_("Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
-	"Sets the reverses kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who use reverses.\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_UNDERLINES */
-	_("Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
-	"Sets the underlines kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who use underlines.\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_CAPS */
-	_("Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
-	"Sets the caps kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who are talking in\n"
-	"CAPS.\n"
-	"The bot kicks only if there are at least min caps\n"
-	"and they constitute at least percent%% of the total \n"
-	"text line (if not given, it defaults to 10 characters\n"
-	"and 25%%).\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_FLOOD */
-	_("Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
-	"Sets the flood kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who are flooding\n"
-	"the channel using at least ln lines in secs seconds\n"
-	"(if not given, it defaults to 6 lines in 10 seconds).\n"
-	" \n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_REPEAT */
-	_("Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
-	"Sets the repeat kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who are repeating\n"
-	"themselves num times (if num is not given, it\n"
-	"defaults to 3).\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_BADWORDS */
-	_("Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
-	"Sets the bad words kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who say certain words\n"
-	"on the channels.\n"
-	"You can define bad words for your channel using the\n"
-	"BADWORDS command. Type %R%S HELP BADWORDS for\n"
-	"more information.\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_ITALICS */
-	_("Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
-	"Sets the italics kicker on or off. When enabled, this\n"
-	"option tells the bot to kick users who use italics.\n"
-	"ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_KICK_AMSGS */
-	_("Syntax: \002KICK \037channel\037 AMSGS {\037ON|OFF\037} [\037ttb\037]\002\n"
-	"Sets the amsg kicker on or off. When enabled, the bot will\n"
-	"kick users who send the same message to multiple channels\n"
-	"where BotServ bots are.\n"
-	"Ttb is the number of times a user can be kicked\n"
-	"before it get banned. Don't give ttb to disable\n"
-	"the ban system once activated."),
-	/* BOT_HELP_BADWORDS */
-	_("Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
-	"        BADWORDS channel DEL {word | entry-num | list}\n"
-	"        BADWORDS channel LIST [mask | list]\n"
-	"        BADWORDS channel CLEAR\n"
-	" \n"
-	"Maintains the bad words list for a channel. The bad\n"
-	"words list determines which words are to be kicked\n"
-	"when the bad words kicker is enabled. For more information,\n"
-	"type %R%S HELP KICK BADWORDS.\n"
-	" \n"
-	"The BADWORDS ADD command adds the given word to the\n"
-	"badword list. If SINGLE is specified, a kick will be\n"
-	"done only if a user says the entire word. If START is \n"
-	"specified, a kick will be done if a user says a word\n"
-	"that starts with word. If END is specified, a kick\n"
-	"will be done if a user says a word that ends with\n"
-	"word. If you don't specify anything, a kick will\n"
-	"be issued every time word is said by a user.\n"
-	" \n"
-	"The BADWORDS DEL command removes the given word from the\n"
-	"bad words list.  If a list of entry numbers is given, those\n"
-	"entries are deleted.  (See the example for LIST below.)\n"
-	" \n"
-	"The BADWORDS LIST command displays the bad words list.  If\n"
-	"a wildcard mask is given, only those entries matching the\n"
-	"mask are displayed.  If a list of entry numbers is given,\n"
-	"only those entries are shown; for example:\n"
-	"   BADWORDS #channel LIST 2-5,7-9\n"
-	"      Lists bad words entries numbered 2 through 5 and\n"
-	"      7 through 9.\n"
-	"      \n"
-	"The BADWORDS CLEAR command clears all entries of the\n"
-	"bad words list."),
-	/* BOT_HELP_SAY */
-	_("Syntax: SAY channel text\n"
-	" \n"
-	"Makes the bot say the given text on the given channel."),
-	/* BOT_HELP_ACT */
-	_("Syntax: ACT channel text\n"
-	" \n"
-	"Makes the bot do the equivalent of a \"/me\" command\n"
-	"on the given channel using the given text."),
-	/* BOT_SERVADMIN_HELP_BOT */
-	_("Syntax: BOT ADD nick user host real\n"
-	"        BOT CHANGE oldnick newnick [user [host [real]]]\n"
-	"        BOT DEL nick\n"
-	" \n"
-	"Allows Services Operators to create, modify, and delete\n"
-	"bots that users will be able to use on their own\n"
-	"channels.\n"
-	" \n"
-	"BOT ADD adds a bot with the given nickname, username,\n"
-	"hostname and realname. Since no integrity checks are done \n"
-	"for these settings, be really careful.\n"
-	"BOT CHANGE allows to change nickname, username, hostname\n"
-	"or realname of a bot without actually delete it (and all\n"
-	"the data associated with it).\n"
-	"BOT DEL removes the given bot from the bot list.  \n"
-	" \n"
-	"Note: you cannot create a bot that has a nick that is\n"
-	"currently registered. If an unregistered user is currently\n"
-	"using the nick, they will be killed."),
-	/* BOT_SERVADMIN_HELP_SET */
-	_("These options are reserved to Services Operators:\n"
-	" \n"
-	"    NOBOT            Prevent a bot from being assigned to \n"
-	"                        a channel\n"
-	"    PRIVATE          Prevent a bot from being assigned by\n"
-	"                        non IRC operators"),
-	/* BOT_SERVADMIN_HELP_SET_NOBOT */
-	_("Syntax: SET channel NOBOT {ON|OFF}\n"
-	" \n"
-	"This option makes a channel be unassignable. If a bot \n"
-	"is already assigned to the channel, it is unassigned\n"
-	"automatically when you enable the option."),
-	/* BOT_SERVADMIN_HELP_SET_PRIVATE */
-	_("Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
-	"This option prevents a bot from being assigned to a\n"
-	"channel by users that aren't IRC operators."),
-	/* HOST_ENTRY */
-	_("#%d Nick:%s, vhost:%s (%s - %s)"),
-	/* HOST_IDENT_ENTRY */
-	_("#%d Nick:%s, vhost:%s@%s (%s - %s)"),
-	/* HOST_SET */
-	_("vhost for %s set to %s."),
-	/* HOST_IDENT_SET */
-	_("vhost for %s set to %s@%s."),
-	/* HOST_SETALL */
-	_("vhost for group %s set to %s."),
-	/* HOST_DELALL */
-	_("vhosts for group %s have been removed."),
-	/* HOST_DELALL_SYNTAX */
-	_("DELALL <nick>."),
-	/* HOST_IDENT_SETALL */
-	_("vhost for group %s set to %s@%s."),
-	/* HOST_SET_ERROR */
-	_("A vhost must be in the format of a valid hostmask."),
-	/* HOST_SET_IDENT_ERROR */
-	_("A vhost ident must be in the format of a valid ident"),
-	/* HOST_SET_TOOLONG */
-	_("Error! The vhost is too long, please use a host shorter than %d characters."),
-	/* HOST_SET_IDENTTOOLONG */
-	_("Error! The Ident is too long, please use an ident shorter than %d characters."),
-	/* HOST_NOREG */
-	_("User %s not found in the nickserv db."),
-	/* HOST_SET_SYNTAX */
-	_("SET <nick> <hostmask>."),
-	/* HOST_SETALL_SYNTAX */
-	_("SETALL <nick> <hostmask>."),
-	/* HOST_NOT_ASSIGNED */
-	_("Please contact an Operator to get a vhost assigned to this nick."),
-	/* HOST_ACTIVATED */
-	_("Your vhost of %s is now activated."),
-	/* HOST_IDENT_ACTIVATED */
-	_("Your vhost of %s@%s is now activated."),
-	/* HOST_DEL */
-	_("vhost for %s removed."),
-	/* HOST_DEL_SYNTAX */
-	_("DEL <nick>."),
-	/* HOST_OFF */
-	_("Your vhost was removed and the normal cloaking restored."),
-	/* HOST_NO_VIDENT */
-	_("Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug"),
-	/* HOST_GROUP */
-	_("All vhost's in the group %s have been set to %s"),
-	/* HOST_IDENT_GROUP */
-	_("All vhost's in the group %s have been set to %s@%s"),
-	/* HOST_LIST_FOOTER */
-	_("Displayed all records (Count: %d)"),
-	/* HOST_LIST_RANGE_FOOTER */
-	_("Displayed records from %d to %d"),
-	/* HOST_LIST_KEY_FOOTER */
-	_("Displayed records matching key %s (Count: %d)"),
-	/* HOST_HELP_CMD_ON */
-	_("    ON          Activates your assigned vhost"),
-	/* HOST_HELP_CMD_OFF */
-	_("    OFF         Deactivates your assigned vhost"),
-	/* HOST_HELP_CMD_GROUP */
-	_("    GROUP       Syncs the vhost for all nicks in a group"),
-	/* HOST_HELP_CMD_SET */
-	_("    SET         Set the vhost of another user"),
-	/* HOST_HELP_CMD_SETALL */
-	_("    SETALL      Set the vhost for all nicks in a group"),
-	/* HOST_HELP_CMD_DEL */
-	_("    DEL         Delete the vhost of another user"),
-	/* HOST_HELP_CMD_DELALL */
-	_("    DELALL      Delete the vhost for all nicks in a group"),
-	/* HOST_HELP_CMD_LIST */
-	_("    LIST        Displays one or more vhost entries."),
-	/* HOST_HELP_ON */
-	_("Syntax: ON\n"
-	"Activates the vhost currently assigned to the nick in use.\n"
-	"When you use this command any user who performs a /whois\n"
-	"on you will see the vhost instead of your real IP address."),
-	/* HOST_HELP_SET */
-	_("Syntax: SET <nick> <hostmask>.\n"
-	"Sets the vhost for the given nick to that of the given\n"
-	"hostmask.  If your IRCD supports vIdents, then using\n"
-	"SET <nick> <ident>@<hostmask> set idents for users as \n"
-	"well as vhosts."),
-	/* HOST_HELP_DELALL */
-	_("Syntax: DELALL <nick>.\n"
-	"Deletes the vhost for all nicks in the same group as\n"
-	"that of the given nick."),
-	/* HOST_HELP_SETALL */
-	_("Syntax: SETALL <nick> <hostmask>.\n"
-	"Sets the vhost for all nicks in the same group as that\n"
-	"of the given nick.  If your IRCD supports vIdents, then\n"
-	"using SETALL <nick> <ident>@<hostmask> will set idents\n"
-	"for users as well as vhosts.\n"
-	"* NOTE, this will not update the vhost for any nicks\n"
-	"added to the group after this command was used."),
-	/* HOST_HELP_OFF */
-	_("Syntax: OFF\n"
-	"Deactivates the vhost currently assigned to the nick in use.\n"
-	"When you use this command any user who performs a /whois\n"
-	"on you will see your real IP address."),
-	/* HOST_HELP_DEL */
-	_("Syntax: DEL <nick>\n"
-	"Deletes the vhost assigned to the given nick from the\n"
-	"database."),
-	/* HOST_HELP_LIST */
-	_("Syntax: LIST [<key>|<#X-Y>]\n"
-	"This command lists registered vhosts to the operator\n"
-	"if a Key is specified, only entries whos nick or vhost match\n"
-	"the pattern given in <key> are displayed e.g. Rob* for all\n"
-	"entries beginning with \"Rob\"\n"
-	"If a #X-Y style is used, only entries between the range of X\n"
-	"and Y will be displayed, e.g. #1-3 will display the first 3\n"
-	"nick/vhost entries.\n"
-	"The list uses the value of NSListMax as a hard limit for the\n"
-	"number of items to display to a operator at any 1 time."),
-	/* HOST_HELP_GROUP */
-	_("Syntax: GROUP\n"
-	" \n"
-	"This command allows users to set the vhost of their\n"
-	"CURRENT nick to be the vhost for all nicks in the same\n"
-	"group."),
-	/* OPER_SUPER_ADMIN_NOT_ENABLED */
-	_("SuperAdmin setting not enabled in services.conf"),
-	/* OPER_HELP_SYNC */
-	_("Syntax: SQLSYNC\n"
-	" \n"
-	"This command syncs your databases with SQL. You should\n"
-	"only have to execute this command once, when you initially\n"
-	"import your databases into SQL."),
-	/* OPER_HELP_CMD_SQLSYNC */
-	_("    SQLSYNC     Import your databases to SQL"),
-	/* OPER_SYNC_UPDATED */
-	_("Updating MySQL.")
-};
diff --git a/src/mail.cpp b/src/mail.cpp
index fdbd05dd9..3a07f7e49 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -43,11 +43,11 @@ bool Mail(User *u, NickRequest *nr, BotInfo *service, const Anope::string &subje
 		return false;
 
 	if (!Config->UseMail)
-		u->SendMessage(service, MAIL_DISABLED);
+		u->SendMessage(service, _("Services have been configured to not send mail."));
 	else if (Anope::CurTime - u->lastmail < Config->MailDelay)
-		u->SendMessage(service, MAIL_DELAYED, Config->MailDelay - Anope::CurTime - u->lastmail);
+		u->SendMessage(service, _("Please wait \002%d\002 seconds and retry."), Config->MailDelay - Anope::CurTime - u->lastmail);
 	else if (nr->email.empty())
-		u->SendMessage(service, MAIL_INVALID, nr->nick.c_str());
+		u->SendMessage(service, _("E-mail for \002%s\002 is invalid."), nr->nick.c_str());
 	else
 	{
 		u->lastmail = nr->lastmail = Anope::CurTime;
@@ -64,11 +64,11 @@ bool Mail(User *u, NickCore *nc, BotInfo *service, const Anope::string &subject,
 		return false;
 
 	if (!Config->UseMail)
-		u->SendMessage(service, MAIL_DISABLED);
+		u->SendMessage(service, _("Services have been configured to not send mail."));
 	else if (Anope::CurTime - u->lastmail < Config->MailDelay)
-		u->SendMessage(service, MAIL_DELAYED, Config->MailDelay - Anope::CurTime - u->lastmail);
+		u->SendMessage(service, _("Please wait \002%d\002 seconds and retry."), Config->MailDelay - Anope::CurTime - u->lastmail);
 	else if (nc->email.empty())
-		u->SendMessage(service, MAIL_INVALID, nc->display.c_str());
+		u->SendMessage(service, _("E-mail for \002%s\002 is invalid."), nc->display.c_str());
 	else
 	{
 		u->lastmail = nc->lastmail = Anope::CurTime;
diff --git a/src/memoserv.cpp b/src/memoserv.cpp
index 5d4943e0b..14cc344ba 100644
--- a/src/memoserv.cpp
+++ b/src/memoserv.cpp
@@ -57,9 +57,9 @@ void check_memos(User *u)
 	}
 	if (newcnt > 0)
 	{
-		u->SendMessage(MemoServ, newcnt == 1 ? MEMO_HAVE_NEW_MEMO : MEMO_HAVE_NEW_MEMOS, newcnt);
+		u->SendMessage(MemoServ, newcnt == 1 ? _("You have 1 new memo.") : _("You have %d new memos."), newcnt);
 		if (newcnt == 1 && (nc->memos.memos[i - 1]->HasFlag(MF_UNREAD)))
-			u->SendMessage(MemoServ, MEMO_TYPE_READ_LAST, Config->s_MemoServ.c_str());
+			u->SendMessage(MemoServ, _("Type \002%R%s READ LAST\002 to read it."), Config->s_MemoServ.c_str());
 		else if (newcnt == 1)
 		{
 			for (i = 0; i < end; ++i)
@@ -67,17 +67,17 @@ void check_memos(User *u)
 				if (nc->memos.memos[i]->HasFlag(MF_UNREAD))
 					break;
 			}
-			u->SendMessage(MemoServ, MEMO_TYPE_READ_NUM, Config->s_MemoServ.c_str(), i);
+			u->SendMessage(MemoServ, _("Type \002%R%s READ %d\002 to read it."), Config->s_MemoServ.c_str(), i);
 		}
 		else
-			u->SendMessage(MemoServ, MEMO_TYPE_LIST_NEW, Config->s_MemoServ.c_str());
+			u->SendMessage(MemoServ, _("Type \002%R%s LIST NEW\002 to list them."), Config->s_MemoServ.c_str());
 	}
 	if (nc->memos.memomax > 0 && nc->memos.memos.size() >= nc->memos.memomax)
 	{
 		if (nc->memos.memos.size() > nc->memos.memomax)
-			u->SendMessage(MemoServ, MEMO_OVER_LIMIT, nc->memos.memomax);
+			u->SendMessage(MemoServ, _("Warning: You are over your maximum number of memos (%d).  You will be unable to receive any new memos until you delete some of your current ones."), nc->memos.memomax);
 		else
-			u->SendMessage(MemoServ, MEMO_AT_LIMIT, nc->memos.memomax);
+			u->SendMessage(MemoServ, _("Warning: You have reached your maximum number of memos (%d).  You will be unable to receive any new memos until you delete some of your current ones."), nc->memos.memomax);
 	}
 }
 
@@ -170,53 +170,53 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
 	int is_servoper = u && u->Account() && u->Account()->IsServicesOper();
 
 	if (readonly)
-		u->SendMessage(MemoServ, MEMO_SEND_DISABLED);
+		u->SendMessage(MemoServ, LanguageString::MEMO_SEND_DISABLED);
 	else if (text.empty())
 	{
 		if (!z)
-			SyntaxError(source, "SEND", MEMO_SEND_SYNTAX);
+			SyntaxError(source, "SEND", LanguageString::MEMO_SEND_SYNTAX);
 
 		if (z == 3)
-			SyntaxError(source, "RSEND", MEMO_RSEND_SYNTAX);
+			SyntaxError(source, "RSEND", _("{\037nick\037 | \037channel\037} \037memo-text\037")); // XXX?
 	}
 	else if (!u->IsIdentified() && !u->IsRecognized())
 	{
 		if (!z || z == 3)
-			source.Reply(NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
+			source.Reply(LanguageString::NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
 	}
 	else if (!(mi = getmemoinfo(name, ischan, isforbid)))
 	{
 		if (!z || z == 3)
 		{
 			if (isforbid)
-				source.Reply(ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name.c_str());
+				source.Reply(ischan ? LanguageString::CHAN_X_FORBIDDEN : LanguageString::NICK_X_FORBIDDEN, name.c_str());
 			else
-				source.Reply(ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name.c_str());
+				source.Reply(ischan ? LanguageString::CHAN_X_NOT_REGISTERED : LanguageString::NICK_X_NOT_REGISTERED, name.c_str());
 		}
 	}
 	else if (z != 2 && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > Anope::CurTime)
 	{
 		u->lastmemosend = Anope::CurTime;
 		if (!z)
-			source.Reply(MEMO_SEND_PLEASE_WAIT, Config->MSSendDelay);
+			source.Reply(_("Please wait %d seconds before using the SEND command again."), Config->MSSendDelay);
 
 		if (z == 3)
-			source.Reply(MEMO_RSEND_PLEASE_WAIT, Config->MSSendDelay);
+			source.Reply(_("Please wait %d seconds before using the RSEND command again."), Config->MSSendDelay);
 	}
 	else if (!mi->memomax && !is_servoper)
 	{
 		if (!z || z == 3)
-			source.Reply(MEMO_X_GETS_NO_MEMOS, name.c_str());
+			source.Reply(_("%s cannot receive memos."), name.c_str());
 	}
 	else if (mi->memomax > 0 && mi->memos.size() >= mi->memomax && !is_servoper)
 	{
 		if (!z || z == 3)
-			source.Reply(MEMO_X_HAS_TOO_MANY_MEMOS, name.c_str());
+			source.Reply(_("%s currently has too many memos and cannot receive more."), name.c_str());
 	}
 	else
 	{
 		if (!z || z == 3)
-			source.Reply(MEMO_SENT, name.c_str());
+			source.Reply(_("Memo sent to \002%s\002."), name.c_str());
 		if ((!u->Account() || !u->Account()->IsServicesOper()) && mi->HasIgnore(u))
 			return;
 
@@ -248,13 +248,13 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
 						NickAlias *na = *it;
 						User *user = finduser(na->nick);
 						if (user && user->IsIdentified())
-							user->SendMessage(MemoServ, MEMO_NEW_MEMO_ARRIVED, sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
+							user->SendMessage(MemoServ, LanguageString::MEMO_NEW_MEMO_ARRIVED, sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
 					}
 				}
 				else
 				{
 					if ((u = finduser(name)) && u->IsIdentified() && nc->HasFlag(NI_MEMO_RECEIVE))
-						u->SendMessage(MemoServ, MEMO_NEW_MEMO_ARRIVED, sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
+						u->SendMessage(MemoServ, LanguageString::MEMO_NEW_MEMO_ARRIVED, sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
 				} /* if (flags & MEMO_RECEIVE) */
 			}
 			/* if (MSNotifyAll) */
@@ -277,7 +277,7 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
 					if (check_access(cu->user, c->ci, CA_MEMO))
 					{
 						if (cu->user->Account() && cu->user->Account()->HasFlag(NI_MEMO_RECEIVE))
-							cu->user->SendMessage(MemoServ, MEMO_NEW_X_MEMO_ARRIVED, c->ci->name.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
+							cu->user->SendMessage(MemoServ, LanguageString::MEMO_NEW_X_MEMO_ARRIVED, c->ci->name.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
 					}
 				}
 			} /* MSNotifyAll */
@@ -328,9 +328,16 @@ static bool SendMemoMail(NickCore *nc, MemoInfo *mi, Memo *m)
 {
 	char message[BUFSIZE];
 
-	snprintf(message, sizeof(message), GetString(nc, NICK_MAIL_TEXT).c_str(), nc->display.c_str(), m->sender.c_str(), mi->GetIndex(m), m->text.c_str());
+	snprintf(message, sizeof(message), GetString(nc,
+	"Hi %s\n"
+	" \n"
+	"You've just received a new memo from %s. This is memo number %d.\n"
+	" \n"
+	"Memo text:\n"
+	" \n"
+	"%s").c_str(), nc->display.c_str(), m->sender.c_str(), mi->GetIndex(m), m->text.c_str());
 
-	return Mail(nc, GetString(nc, MEMO_MAIL_SUBJECT), message);
+	return Mail(nc, GetString(nc, _("New memo")), message);
 }
 
 /*************************************************************************/
@@ -358,16 +365,17 @@ void rsend_notify(CommandSource &source, Memo *m, const Anope::string &chan)
 		   nick or channel */
 		char text[256];
 		if (!chan.empty())
-			snprintf(text, sizeof(text), GetString(na->nc, MEMO_RSEND_CHAN_MEMO_TEXT).c_str(), chan.c_str());
+			snprintf(text, sizeof(text), GetString(na->nc, _("\002[auto-memo]\002 The memo you sent to %s has been viewed.")).c_str(), chan.c_str());
 		else
-			snprintf(text, sizeof(text), "%s", GetString(na->nc, MEMO_RSEND_NICK_MEMO_TEXT).c_str());
+			snprintf(text, sizeof(text), "%s", GetString(na->nc, _("\002[auto-memo]\002 The memo you sent has been viewed.")).c_str());
 
 		/* Send notification */
 		memo_send(source, m->sender, text, 2);
 
 		/* Notify recepient of the memo that a notification has
 		   been sent to the sender */
-		source.Reply(MEMO_RSEND_USER_NOTIFICATION, nc->display.c_str());
+		source.Reply(_("A notification memo has been sent to %s informing him/her you have\n"
+				"read his/her memo."), nc->display.c_str());
 	}
 
 	/* Remove receipt flag from the original memo */
diff --git a/src/misc.cpp b/src/misc.cpp
index 8547923b5..340207cb0 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -256,7 +256,7 @@ Anope::string duration(NickCore *nc, time_t seconds)
 
 	if (!days && !hours && !minutes)
 	{
-		snprintf(buf, sizeof(buf), GetString(nc, seconds <= 1 ? DURATION_SECOND : DURATION_SECONDS).c_str(), seconds);
+		snprintf(buf, sizeof(buf), GetString(nc, "%d second%s").c_str(), seconds, seconds != 1 ? "s" : "");
 		buffer = buf;
 	}
 	else
@@ -264,19 +264,19 @@ Anope::string duration(NickCore *nc, time_t seconds)
 		bool need_comma = false;
 		if (days)
 		{
-			snprintf(buf, sizeof(buf), GetString(nc, days == 1 ? DURATION_DAY : DURATION_DAYS).c_str(), days);
+			snprintf(buf, sizeof(buf), GetString(nc, "%d day%s").c_str(), days, days != 1 ? "s" : "");
 			buffer = buf;
 			need_comma = true;
 		}
 		if (hours)
 		{
-			snprintf(buf, sizeof(buf), GetString(nc, hours == 1 ? DURATION_HOUR : DURATION_HOURS).c_str(), hours);
+			snprintf(buf, sizeof(buf), GetString(nc, "%d hour%s").c_str(), hours, hours != 1 ? "s" : "");
 			buffer += Anope::string(need_comma ? ", " : "") + buf;
 			need_comma = true;
 		}
 		if (minutes)
 		{
-			snprintf(buf, sizeof(buf), GetString(nc, minutes == 1 ? DURATION_MINUTE : DURATION_MINUTES).c_str(), minutes);
+			snprintf(buf, sizeof(buf), GetString(nc, "%d minute%s").c_str(), minutes != 1 ? "s" : "");
 			buffer += Anope::string(need_comma ? ", " : "") + buf;
 		}
 	}
@@ -306,9 +306,9 @@ Anope::string do_strftime(const time_t &t)
 Anope::string expire_left(NickCore *nc, time_t expires)
 {
 	if (!expires)
-		return GetString(nc, NO_EXPIRE);
+		return GetString(nc, LanguageString::NO_EXPIRE);
 	else if (expires <= Anope::CurTime)
-		return GetString(nc, EXPIRES_SOON);
+		return GetString(nc, _("expires at next database update"));
 	else
 	{
 		char buf[256];
@@ -317,21 +317,21 @@ Anope::string expire_left(NickCore *nc, time_t expires)
 		if (diff >= 86400)
 		{
 			int days = diff / 86400;
-			snprintf(buf, sizeof(buf), GetString(nc, days == 1 ? EXPIRES_1D : EXPIRES_D).c_str(), days);
+			snprintf(buf, sizeof(buf), GetString(nc, days == 1 ? _("expires in %d day") : _("expires in %d days")).c_str(), days);
 		}
 		else
 		{
 			if (diff <= 3600)
 			{
 				int minutes = diff / 60;
-				snprintf(buf, sizeof(buf), GetString(nc, minutes == 1 ? EXPIRES_1M : EXPIRES_M).c_str(), minutes);
+				snprintf(buf, sizeof(buf), GetString(nc, minutes == 1 ? _("expires in %d minute") : _("expires in %d minutes")).c_str(), minutes);
 			}
 			else
 			{
 				int hours = diff / 3600, minutes;
 				diff -= hours * 3600;
 				minutes = diff / 60;
-				snprintf(buf, sizeof(buf), GetString(nc, hours == 1 && minutes == 1 ? EXPIRES_1H1M : (hours == 1 && minutes != 1 ? EXPIRES_1HM : (hours != 1 && minutes == 1 ? EXPIRES_H1M : EXPIRES_HM))).c_str(), hours, minutes);
+				snprintf(buf, sizeof(buf), GetString(nc, hours == 1 && minutes == 1 ? _("expires in %d hour, %d minute") : (hours == 1 && minutes != 1 ? _("expires in %d hour, %d minutes") : (hours != 1 && minutes == 1 ? _("expires in %d hours, %d minute") : _("expires in %d hours, %d minutes")))).c_str(), hours, minutes);
 			}
 		}
 
diff --git a/src/modules.cpp b/src/modules.cpp
index 3f6cf5ce0..51ae4acb9 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -289,19 +289,22 @@ void Module::SendMessage(CommandSource &source, const char *fmt, ...)
 {
 	Anope::string language = (source.u && source.u->Account() ? source.u->Account()->language : "");
 	
-	Anope::string message = GetString(this->name.c_str(), language, fmt);
+	PushLanguage(this->name, language);
+	fmt = anope_gettext(fmt);
 
 	va_list args;
 	char buf[4096];
 	va_start(args, fmt);
-	vsnprintf(buf, sizeof(buf) - 1, message.c_str(), args);
+	vsnprintf(buf, sizeof(buf) - 1, fmt, args);
 	va_end(args);
 
 	sepstream sep(buf, '\n');
 	Anope::string token;
 
 	while (sep.GetToken(token))
-		source.Reply(token.c_str());
+		source.Reply(token);
+	
+	PopLanguage();
 }
 
 Service::Service(Module *o, const Anope::string &n) : owner(o), name(n)
diff --git a/src/nickserv.cpp b/src/nickserv.cpp
index f841ced10..920eaa6b2 100644
--- a/src/nickserv.cpp
+++ b/src/nickserv.cpp
@@ -172,7 +172,7 @@ int validate_user(User *u)
 	NickRequest *nr = findrequestnick(u->nick);
 	if (nr)
 	{
-		u->SendMessage(NickServ, NICK_IS_PREREG);
+		u->SendMessage(NickServ, LanguageString::NICK_IS_PREREG);
 		return 0;
 	}
 
@@ -182,14 +182,14 @@ int validate_user(User *u)
 
 	if (na->HasFlag(NS_FORBIDDEN))
 	{
-		u->SendMessage(NickServ, NICK_MAY_NOT_BE_USED);
+		u->SendMessage(NickServ, _("This nickname may not be used.  Please choose another one."));
 		u->Collide(na);
 		return 0;
 	}
 
 	if (na->nc->HasFlag(NI_SUSPENDED))
 	{
-		u->SendMessage(NickServ, NICK_X_SUSPENDED, u->nick.c_str());
+		u->SendMessage(NickServ, LanguageString::NICK_X_SUSPENDED, u->nick.c_str());
 		u->Collide(na);
 		return 0;
 	}
@@ -209,26 +209,26 @@ int validate_user(User *u)
 	if (u->IsRecognized() || !na->nc->HasFlag(NI_KILL_IMMED))
 	{
 		if (na->nc->HasFlag(NI_SECURE))
-			u->SendMessage(NickServ, NICK_IS_SECURE, Config->s_NickServ.c_str());
+			u->SendMessage(NickServ, LanguageString::NICK_IS_SECURE, Config->s_NickServ.c_str());
 		else
-			u->SendMessage(NickServ, NICK_IS_REGISTERED, Config->s_NickServ.c_str());
+			u->SendMessage(NickServ, LanguageString::NICK_IS_REGISTERED, Config->s_NickServ.c_str());
 	}
 
 	if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized())
 	{
 		if (na->nc->HasFlag(NI_KILL_IMMED))
 		{
-			u->SendMessage(NickServ, FORCENICKCHANGE_NOW);
+			u->SendMessage(NickServ, LanguageString::FORCENICKCHANGE_NOW);
 			u->Collide(na);
 		}
 		else if (na->nc->HasFlag(NI_KILL_QUICK))
 		{
-			u->SendMessage(NickServ, FORCENICKCHANGE_IN_20_SECONDS);
+			u->SendMessage(NickServ, _("If you do not change within 20 seconds, I will change your nick."));
 			new NickServCollide(u, 20);
 		}
 		else
 		{
-			u->SendMessage(NickServ, FORCENICKCHANGE_IN_1_MINUTE);
+			u->SendMessage(NickServ, _("If you do not change within one minute, I will change your nick."));
 			new NickServCollide(u, 60);
 		}
 	}
diff --git a/src/operserv.cpp b/src/operserv.cpp
index c08a0e53d..4e915117c 100644
--- a/src/operserv.cpp
+++ b/src/operserv.cpp
@@ -481,21 +481,21 @@ XLine *SGLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 	if (mask.find('!') != Anope::string::npos)
 	{
 		if (bi && u)
-			u->SendMessage(bi, OPER_AKILL_NO_NICK);
+			u->SendMessage(bi, _("\002Reminder\002: AKILL masks cannot contain nicknames; make sure you have \002not\002 included a nick portion in your mask."));
 		return NULL;
 	}
 
 	if (mask.find('@') == Anope::string::npos)
 	{
 		if (bi && u)
-			u->SendMessage(bi, BAD_USERHOST_MASK);
+			u->SendMessage(bi, LanguageString::BAD_USERHOST_MASK);
 		return NULL;
 	}
 
 	if (mask.find_first_not_of("~@.*?") == Anope::string::npos)
 	{
 		if (bi && u)
-			u->SendMessage(bi, USERHOST_MASK_TOO_WIDE, mask.c_str());
+			u->SendMessage(bi, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 		return NULL;
 	}
 
@@ -505,11 +505,11 @@ XLine *SGLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 		if (bi && u)
 		{
 			if (canAdd.first == 1)
-				u->SendMessage(bi, OPER_AKILL_EXISTS, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 already exists on the AKILL list."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 2)
-				u->SendMessage(bi, OPER_EXPIRY_CHANGED, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("Expiry time of \002%s\002 changed."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 3)
-				u->SendMessage(bi, OPER_ALREADY_COVERED, mask.c_str(), canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 is already covered by %s."), mask.c_str(), canAdd.second->Mask.c_str());
 		}
 
 		return NULL;
@@ -563,7 +563,7 @@ XLine *SNLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 	if (!mask.empty() && mask.find_first_not_of("*?") == Anope::string::npos)
 	{
 		if (bi && u)
-			u->SendMessage(bi, USERHOST_MASK_TOO_WIDE, mask.c_str());
+			u->SendMessage(bi, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 		return NULL;
 	}
 
@@ -573,11 +573,11 @@ XLine *SNLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 		if (bi && u)
 		{
 			if (canAdd.first == 1)
-				u->SendMessage(bi, OPER_SNLINE_EXISTS, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 already exists on the SNLINE list."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 2)
-				u->SendMessage(bi, OPER_EXPIRY_CHANGED, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("Expiry time of \002%s\002 changed."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 3)
-				u->SendMessage(bi, OPER_ALREADY_COVERED, mask.c_str(), canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 is already covered by %s."), mask.c_str(), canAdd.second->Mask.c_str());
 		}
 
 		return NULL;
@@ -666,14 +666,14 @@ XLine *SQLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 	if (mask.find_first_not_of("*") == Anope::string::npos)
 	{
 		if (bi && u)
-			u->SendMessage(OperServ, USERHOST_MASK_TOO_WIDE, mask.c_str());
+			u->SendMessage(OperServ, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 		return NULL;
 	}
 
 	if (mask[0] == '#' && !ircd->chansqline)
 	{
 		if (bi && u)
-			u->SendMessage(OperServ, OPER_SQLINE_CHANNELS_UNSUPPORTED);
+			u->SendMessage(OperServ, _("Channel SQLINEs are not supported by your IRCd, so you can't use them."));
 		return NULL;
 	}
 
@@ -683,11 +683,11 @@ XLine *SQLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 		if (bi && u)
 		{
 			if (canAdd.first == 1)
-				u->SendMessage(bi, OPER_SQLINE_EXISTS, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 already exists on the SQLINE list."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 2)
-				u->SendMessage(bi, OPER_EXPIRY_CHANGED, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("Expiry time of \002%s\002 changed."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 3)
-				u->SendMessage(bi, OPER_ALREADY_COVERED, mask.c_str(), canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 is already covered by %s."), mask.c_str(), canAdd.second->Mask.c_str());
 		}
 
 		return NULL;
@@ -792,13 +792,13 @@ XLine *SZLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 {
 	if (mask.find('!') != Anope::string::npos || mask.find('@') != Anope::string::npos)
 	{
-		u->SendMessage(OperServ, OPER_SZLINE_ONLY_IPS);
+		u->SendMessage(OperServ, _("\002Reminder:\002 you can only add IP masks to the SZLINE list."));
 		return NULL;
 	}
 
 	if (mask.find_first_not_of("*?") == Anope::string::npos)
 	{
-		u->SendMessage(OperServ, USERHOST_MASK_TOO_WIDE, mask.c_str());
+		u->SendMessage(OperServ, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
 		return NULL;
 	}
 
@@ -808,11 +808,11 @@ XLine *SZLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
 		if (bi && u)
 		{
 			if (canAdd.first == 1)
-				u->SendMessage(bi, OPER_SZLINE_EXISTS, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 already exists on the SZLINE list."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 2)
-				u->SendMessage(bi, OPER_EXPIRY_CHANGED, canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("Expiry time of \002%s\002 changed."), canAdd.second->Mask.c_str());
 			else if (canAdd.first == 3)
-				u->SendMessage(bi, OPER_ALREADY_COVERED, mask.c_str(), canAdd.second->Mask.c_str());
+				u->SendMessage(bi, _("\002%s\002 is already covered by %s."), mask.c_str(), canAdd.second->Mask.c_str());
 		}
 
 		return NULL;
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 4a85f8df6..56d559768 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -380,7 +380,7 @@ bool IRCdMessage::OnPrivmsg(const Anope::string &source, const std::vector<Anope
 
 		BotInfo *bi = findbot(receiver);
 		if (bi)
-			ircdproto->SendMessage(bi, source, "%s", GetString(USER_RECORD_NOT_FOUND).c_str());
+			ircdproto->SendMessage(bi, source, "%s", "Internal error - unable to process request.");
 
 		return true;
 	}
@@ -411,7 +411,7 @@ bool IRCdMessage::OnPrivmsg(const Anope::string &source, const std::vector<Anope
 			if (!bi)
 				return true;
 			Log(LOG_DEBUG) << "Ignored PRIVMSG without @ from " << source;
-			u->SendMessage(bi, INVALID_TARGET, receiver.c_str(), receiver.c_str(), Config->ServerName.c_str(), receiver.c_str());
+			u->SendMessage(bi, _("\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."), receiver.c_str(), receiver.c_str(), Config->ServerName.c_str(), receiver.c_str());
 			return true;
 		}
 
@@ -441,14 +441,14 @@ bool IRCdMessage::OnPrivmsg(const Anope::string &source, const std::vector<Anope
 			else if (bi == ChanServ)
 			{
 				if (!u->HasMode(UMODE_OPER) && Config->CSOpersOnly)
-					u->SendMessage(ChanServ, ACCESS_DENIED);
+					u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
 				else
 					mod_run_cmd(bi, u, message, false);
 			}
 			else if (bi == HostServ)
 			{
 				if (!ircd->vhost)
-					u->SendMessage(HostServ, SERVICE_OFFLINE, Config->s_HostServ.c_str());
+					u->SendMessage(HostServ, _("%s is currently offline."), Config->s_HostServ.c_str());
 				else
 					mod_run_cmd(bi, u, message, false);
 			}
@@ -456,7 +456,7 @@ bool IRCdMessage::OnPrivmsg(const Anope::string &source, const std::vector<Anope
 			{
 				if (!u->HasMode(UMODE_OPER) && Config->OSOpersOnly)
 				{
-					u->SendMessage(OperServ, ACCESS_DENIED);
+					u->SendMessage(OperServ, LanguageString::ACCESS_DENIED);
 					if (Config->WallBadOS)
 						ircdproto->SendGlobops(OperServ, "Denied access to %s from %s!%s@%s (non-oper)", Config->s_OperServ.c_str(), u->nick.c_str(), u->GetIdent().c_str(), u->host.c_str());
 				}
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index 16e90bebb..b1d7c77dc 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -744,7 +744,7 @@ bool ChannelInfo::CheckKick(User *user)
 	if (!user->HasMode(UMODE_OPER) && (this->HasFlag(CI_SUSPENDED) || this->HasFlag(CI_FORBIDDEN)))
 	{
 		get_idealban(this, user, mask);
-		reason = this->forbidreason.empty() ? GetString(user, CHAN_MAY_NOT_BE_USED) : this->forbidreason;
+		reason = this->forbidreason.empty() ? GetString(user->Account(), _("This channel may not be used.")) : this->forbidreason;
 		set_modes = true;
 		do_kick = true;
 	}
@@ -785,7 +785,7 @@ bool ChannelInfo::CheckKick(User *user)
 	if (!do_kick && check_access(user, this, CA_NOJOIN))
 	{
 		get_idealban(this, user, mask);
-		reason = GetString(user, CHAN_NOT_ALLOWED_TO_JOIN);
+		reason = GetString(user->Account(), LanguageString::CHAN_NOT_ALLOWED_TO_JOIN);
 		do_kick = true;
 	}
 
diff --git a/src/sessions.cpp b/src/sessions.cpp
index 7ff165346..d1b0fcfdd 100644
--- a/src/sessions.cpp
+++ b/src/sessions.cpp
@@ -257,13 +257,13 @@ int exception_add(User *u, const Anope::string &mask, unsigned limit, const Anop
 			{
 				e->limit = limit;
 				if (u)
-					u->SendMessage(OperServ, OPER_EXCEPTION_CHANGED, mask.c_str(), e->limit);
+					u->SendMessage(OperServ, _("Exception for \002%s\002 has been updated to %d."), mask.c_str(), e->limit);
 				return -2;
 			}
 			else
 			{
 				if (u)
-					u->SendMessage(OperServ, OPER_EXCEPTION_EXISTS, mask.c_str());
+					u->SendMessage(OperServ, _("\002%s\002 already exists on the EXCEPTION list."), mask.c_str());
 				return -1;
 			}
 		}
diff --git a/src/users.cpp b/src/users.cpp
index 970b70c64..d9a6149cf 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -247,34 +247,6 @@ void User::SendMessage(BotInfo *source, const Anope::string &msg)
 		ircdproto->SendNotice(source, this->nick, "%s", msg.c_str());
 }
 
-void User::SendMessage(BotInfo *source, LanguageString message, ...)
-{
-	if (!source)
-	{
-		Log(LOG_DEBUG) << "Tried to send message " << message << " with nonexistant source!";
-		return;
-	}
-
-	Anope::string m = GetString(this, message);
-
-	m = m.replace_all_cs("%S", source->nick);
-
-	if (m.length() >= 4096)
-		Log() << "Warning, language string " << message << " is longer than 4096 bytes";
-
-	va_list args;
-	char buf[4096];
-	va_start(args, message);
-	vsnprintf(buf, sizeof(buf) - 1, m.c_str(), args);
-	va_end(args);
-
-	sepstream sep(buf, '\n');
-	Anope::string line;
-
-	while (sep.GetToken(line))
-		this->SendMessage(source, line.empty() ? " " : line);
-}
-
 /** Collides a nick.
  *
  * First, it marks the nick (if the user is on a registered nick, we don't use it without but it could be)
@@ -345,7 +317,7 @@ void User::Collide(NickAlias *na)
 			guestnick = Config->NSGuestNickPrefix + stringify(getrandom16());
 		} while (finduser(guestnick));
 
-		this->SendMessage(NickServ, FORCENICKCHANGE_CHANGING, guestnick.c_str());
+		this->SendMessage(NickServ, _("Your nickname is now being changed to \002%s\002"), guestnick.c_str());
 		ircdproto->SendForceNickChange(this, guestnick, Anope::CurTime);
 	}
 	else