Initialise 1.8.2-SVN and update README.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2371 5417fbe8-f217-4b02-8779-1006273d7864
Added ChanServ HELP CLEAR INVITES to documentation
2026-06-19 11:04:45 +02:00 · 2009-07-11 12:52:18 +00:00 · 2009-07-10 05:32:13 +00:00 · 2009-07-07 21:02:38 +00:00 · 2009-07-06 16:03:48 +00:00 · 2009-07-05 15:13:55 +00:00
50 changed files with 765 additions and 2262 deletions
@@ -1,19 +1,62 @@
 Anope Version 1.8 SVN
 -------------------
+
+Anope Version 1.8.2
+-------------------
+07/06 F Fix unsetting founder_chans when logging out other users         [  #00]
+07/07 F Fix a crash when mysql is used without MysqlSecure defined.      [  #00]
+
+Anope Version 1.8.1
+-------------------
 Provided by Anope Dev. <team@anope.org> - 2009
+03/30 R Removed InspIRCd 1.0 support.                                    [  #00]
 01/03 F Updated install.js url for windows build help.                   [  #00]
 01/17 F Fixed MySQL DB saving failing due to unsafe queries.             [ #994]
 01/18 F Fixed check for backtrace() in configure.                        [  #00]
 01/22 F Do not allow invalied nicks to be grouped.                       [#1000]
 01/26 F Do not allow empty vIdent when loading from MySQL.               [  #00]
 01/26 F Readonly/noexpire are now checked before saving on shutdown.     [  #00]
-
-Provided by mooncup <mooncup@anonnet.org> - 2009
-02/04 F Automatically reapply vhost on hs off for unreal32.		 [  #00]
+02/12 F Fixed timestamps blowing away on JOIN in InspIRCd 1.1.           [  #00]
+02/12 F Fixed dropped mode changes coming from Anope on TS6 IRCds.       [  #00]
+02/23 F Added missing FD_ZERO() call before FD_SET().                    [  #00]
+02/23 F Send correct akill timestamp on  InspIRCd 1.1.                   [  #00]
+03/10 F MLOCK +f parameter isn't correctly read on DB load.              [#1020]
+03/10 F Buggy message when deleting invalid number from ACCESS/XOP list. [#1025]
+03/18 F Hide password for ignored users in log/logchan.                  [#1054]
+03/23 F Some BS cmds no longer send error msgs to users without access.  [#1062]
+03/23 F Fixed NS RECOVER sending "(null)" in some places.                [#1064]
+03/23 F Force a user off a nick when it is suspended.                    [#1065]
+03/23 F Fixed CS SET MLOCK requiring a param to allow clearing.          [#1044]
+03/30 F Fantasy commands in CTCP ACTIONs will now be ignored.            [#1073]
+04/03 F SECUREOPS now igores modechanges from ulined servers.            [#1004]
+04/06 F Patch to update documentation on CS RESTRICTED...                [#1039]
+04/18 F Don't enforce akicks/forbidden/.. on clients on ulined servers.  [  #00]
+06/02 F Fixing CS HELP output to not imply you can invite anyone...      [#1081]
+06/11 F Remove check for NSModeOnID from NS UPDATE.                      [#1082]
+06/26 F Fixed several bugs in parsing TS6 encoded commands.              [  #00]

 Provided by Adam <Adam@SubZeroIRC.net> - 2009
-07/03 F Channel list re-ordering.					 [#1024]
 01/28 F Added internal support for +j channelmodes.                      [#1001]
+02/07 F CS OP/PROTECT/etc now enforced SECUREOPS setting.                [#1006]
+03/07 F Channel list re-ordering.                                        [#1024]
+03/22 F Log message about the deleting from channel access list.         [#1030]
+05/08 F Allow jupe on all bar uplink and self.                           [#1076]
+05/10 F MySQL query should no longer fail when password/salt are long    [#1078]
+06/11 F Fixed potential crash in Charybdis protocol module.              [  #00]
+06/15 F Fix memory leak in NS SUSPEND.                                   [  #00]
+
+Provided by mooncup <mooncup@anonnet.org> - 2009
+02/04 F Automatically reapply vhost on hs off for unreal32.              [  #00]
+04/03 F MS STAFF sends wrong syntax error.                               [#1050]
+
+Provided by DukePyrolator <> - 2009
+03/15 F Log error when NSMemoReceipt isn't defined in config.            [  #00]
+03/22 F Fixed memleak in channels.c.                                     [  #00]
+05/06 F CS founder status not always correctly removed on LOGOUT.        [  #00]
+05/17 F Change sizeof() to strlen() in db_mysql_secure().                [  #00]
+
+Provided by Szymek <> - 2009
+03/30 F Fix HS OFF to work in all cases on InspIRCd.                     [#1075]

 Anope Version 1.8.0
 -------------------
@@ -1,4 +1,7 @@
 Anope Version 1.8 SVN
+---------------------
+
+Anope Version 1.8.2
 -------------------
 ** ADDED    CONFIGURATION DIRECTIVES **

@@ -6,6 +9,55 @@ Anope Version 1.8 SVN

 ** DELETED  CONFIGURATION DIRECTIVES **

+Anope Version 1.8.1
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+# IRCDModule <module_name>  [REQUIRED]
+#     The ircd protocol module should be used when connecting anope to your
+#     chosen IRCD.  This should be one of the following options, or a file 
+#     provided by your IRCD author.
+#
+#     Bahamut 1.4.27 [or later]         - "bahamut"
+#     Charybdis 1.0 [or later]          - "charybdis"
+#     DreamForge 4.6.7                  - "dreamforge"
+#     Hybrid IRCd 7.0 [experimental]    - "hybrid"
+#     InspIRCd 1.1 [beta 8 or later]    - "inspircd11"
+#     Plexus 3.0 [or later]             - "plexus3"
+#     Plexus 2.0 [or later]             - "plexus2"
+#     PTLink 6.15.0 [experimental]      - "ptlink"
+#     RageIRCd 2.0.x                    - "rageircd"
+#     Ratbox 2.0.6 [or later]           - "ratbox"
+#     ShadowIRCD 4.0x [beta 7 or later] - "shadowircd"
+#     Solid IRCD 3.4.x [3.4.6 or later] - "solidircd"
+#     UltimateIRCd 3.0.0 [or later]     - "ultimate3"
+#     UltimateIRCd 2.8.2 [or later]     - "ultimate2"
+#     Unreal 3.2 [beta-19 or later]     - "unreal32"
+#     Unreal 3.1.1 [or later]           - "unreal31"
+#     ViagraIRCd 1.3.x [or later]       - "viagra"
+#
+
+#IRCDModule "unreal32"
+
+
+# SuperAdmin  [OPTIONAL]
+#    When enabled, Services Roots will be able to use SuperAdmin [ON|OFF]
+#    which will temporarily grant them extra privileges, such as being a
+#    founder of _all_ channels, ability to adjust another users modes etc..
+
+#SuperAdmin
+
+
+# UnRestrictSAdmin [OPTIONAL]
+#     On many ircd Anope removes the umode of +a from users whom are not
+#     Service Admin in Anope. This mode is NOT used by Anope for any form
+#     of access. Thus this option allows them to keep the mode without having
+#     to be a Service Admin in Anope
+#UnRestrictSAdmin
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
 Anope Version 1.8.0
 -------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
@@ -1,4 +1,15 @@
 Anope Version 1.8 SVN
+---------------------
+
+Anope Version 1.8.2
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+Anope Version 1.8.1
 -------------------
 *** New Strings:
 	HOST_OFF
@@ -6,7 +17,6 @@ Anope Version 1.8 SVN

 *** Del Strings:

-
 Anope Version 1.8.0
 -------------------
 *** New Strings:
@@ -1,4 +1,11 @@
 Anope Version 1.8 SVN
+---------------------
+
+Anope Version 1.8.2
+-------------------
+- NONE
+
+Anope Version 1.8.1
 -------------------
 - NONE

@@ -79,7 +79,6 @@
 #     Charybdis 1.0 [or later]          - "charybdis"
 #     DreamForge 4.6.7                  - "dreamforge"
 #     Hybrid IRCd 7.0 [experimental]    - "hybrid"
-#     InspIRCd 1.0 [beta 5 or later]    - "inspircd10"
 #     InspIRCd 1.1 [beta 8 or later]    - "inspircd11"
 #     Plexus 3.0 [or later]             - "plexus3"
 #     Plexus 2.0 [or later]             - "plexus2"
@@ -604,7 +603,7 @@ GlobalOnCycleUP "Services are now back online - have a nice day"
 #     Service Admin in Anope. This mode is NOT used by Anope for any form
 #     of access. Thus this option allows them to keep the mode without having
 #     to be a Service Admin in Anope
-#UnRestrictSAdmin
+UnRestrictSAdmin

 # UlineServers  [OPTIONAL]
 #
@@ -1146,7 +1145,7 @@ BSGentleBWReason
 #ServicesRoot   "dengel anope"

 # SuperAdmin  [OPTIONAL]
-#    When enabled, Services admins will be able to use SuperAdmin [ON|OFF]
+#    When enabled, Services Roots will be able to use SuperAdmin [ON|OFF]
 #    which will temporarily grant them extra privileges, such as being a
 #    founder of _all_ channels, ability to adjust another users modes etc..

@@ -137,7 +137,7 @@ Note: You should also read the README and FAQ files!
    If you're unable to get a link with your IRCd after reading this section,
    you might try the interactive link maker, which is located at:

-        http://anope.org/~heinz/ilm.php
+        http://anope.org/ilm.php

 4) Starting Anope

@@ -73,6 +73,7 @@ Table of Contents
    Anope credits:

        * Adam Kramer <ribosome@anope.org>
+        * Adam <adam@anope.org>
        * Alvaro Toledo <atoledo@keldon.org>
        * Amanda Folson <amanda@anope.org>
        * Andrew Berquist <vash@anope.org> 
@@ -87,6 +88,7 @@ Table of Contents
        * Florian Schulze <certus@anope.org>
        * Gabriel Acevedo H. <drstein@anope.org>
        * Jan Milants <viper@anope.org>
+        * Jens Voss <dukepyrolator@anope.org>
        * JH <jh@irc-chat.net>
        * Joris Vink <joris@anope.org>
        * Lucas Nussbaum <lucas@lucas-nussbaum.net>
@@ -851,6 +851,7 @@ struct server_ {

 #define SERVER_ISME  0x0001
 #define SERVER_JUPED 0x0002
+#define SERVER_ISUPLINK	0x0004

 /*************************************************************************/

@@ -1821,6 +1821,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	A massmemo has been sent to all registered users.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | canal}
@@ -1887,7 +1891,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s ara et notificara dels teus memos quant et conectis i quant et siguin enviats.
 MEMO_SET_NOTIFY_LOGON
@@ -2949,6 +2953,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 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.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2968,7 +2974,7 @@ OPER_CANNOT_RESTART

 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -3060,7 +3066,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	This service is temporarly disabled, please try again later
 OPER_DEFCON_NO_CONF
@@ -3333,7 +3339,7 @@ NEWS_RANDOM_TEXT
 	[Notícies al Atzar - %s] %s

 NEWS_LOGON_SYNTAX
-	Sintaxis: LOGONNEWS {ADD|DEL|LIST} [text|numero]
+	LOGONNEWS {ADD|DEL|LIST} [text|numero]
 NEWS_LOGON_LIST_HEADER
 	Notícies d'entrada:
 NEWS_LOGON_LIST_ENTRY
@@ -3342,13 +3348,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	No hi ha notícies de entrada.
 NEWS_LOGON_ADD_SYNTAX
-	Sintaxis: LOGONNEWS ADD texto
+	LOGONNEWS ADD texto
 NEWS_LOGON_ADD_FULL
 	La llista de notícies esta plena!
 NEWS_LOGON_ADDED
 	Noves notícies d'entrada afegida (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Sintaxis: LOGONNEWS DEL {numero | ALL}
+	LOGONNEWS DEL {numero | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Notícia d'entrada #%d no trobada!
 NEWS_LOGON_DELETED
@@ -3385,7 +3391,7 @@ NEWS_OPER_DELETED_ALL
 	Totes les notícies de oper esborrades.

 NEWS_RANDOM_SYNTAX
-	Sintaxis: RANDOMNEWS {ADD|DEL|LIST} [text|numero]
+	RANDOMNEWS {ADD|DEL|LIST} [text|numero]
 NEWS_RANDOM_LIST_HEADER
 	Notícies al Azar:
 NEWS_RANDOM_LIST_ENTRY
@@ -3394,13 +3400,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	No hi ha notícies al azar.
 NEWS_RANDOM_ADD_SYNTAX
-	Sintaxis: RANDOMNEWS ADD text
+	RANDOMNEWS ADD text
 NEWS_RANDOM_ADD_FULL
 	La llista de notícies esta plena!
 NEWS_RANDOM_ADDED
 	Nova noticia a l'atzar afegida (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Sintaxis: RANDOMNEWS DEL {numero | ALL}
+	RANDOMNEWS DEL {numero | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Noticia a l'atzar #%d no trobada!
 NEWS_RANDOM_DELETED
@@ -4347,7 +4353,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4632,13 +4638,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Sintàxi: SET canal RESTRICTED {ON | OFF}
 	
-	Habilita o deshabilita l'opció de accés restringit
-	per a un canal. Quan l' accés restringit està
-	establert, Els usuaris seran inhabilitats de tenir
-	privilegis d'operador de canal. (usuaris amb accés
-	negatiu i, si seguretat de ops està establerta,
-	usuaris no a la llista de accés) seran 
-	kickeajats i banejats del canal.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Sintàxi: SET canal SECURE {ON | OFF}
@@ -5221,6 +5223,7 @@ CHAN_HELP_CLEAR
 	                  neteja els Modes i,k,l,m,n,p,s,t).
 	     BANS     neteja tots els bans en el canal.
 	     EXCEPTS  neteja tots els excepts en el canal.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Esborra estatus d'operador de canal(Mode +o)
 	                  de tots els operadors de canal.
 	     HOPS     Removes channel-halfoperator status (mode +h) from
@@ -5503,7 +5506,7 @@ MEMO_HELP_SET
 	sobre una opció específica.

 MEMO_HELP_SET_NOTIFY
-	Sintàxi: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintàxi: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Canvia quan se't notificarà de nous memos:
 	
@@ -5514,6 +5517,9 @@ MEMO_HELP_SET_NOTIFY
 	               o quan treguis /AWAY.
 	    NEW     Sols seras notificat de memos quan se't 
 	               enviin.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     No rebràs cap notificació per memos.
 	
 	ON és escencialment LOGON i NEW combinats.
@@ -6713,7 +6719,7 @@ HOST_SETALL
 HOST_DELALL
 	vhosts for group %s have been removed.
 HOST_DELALL_SYNTAX
-	Syntax: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost for group %s set to %s@%s.
 HOST_SET_ERROR
@@ -6745,7 +6751,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost for %s removed.
 HOST_DEL_SYNTAX
-	Syntax: %R%s del <nick>.
+	DEL <nick>.

 ###########################################################################
 #
@@ -11,9 +11,7 @@
 # Translated by chemical <chem@gmx.net>,shine <dh@shinewelt.de> bis 28.02.2003
 # - Solltest du irgendwelche Rechtschreibfehler oder sonstige
 #   Verbesserungsvorschläge haben, immer her damit!
-#
-# letzte Änderung: 28.02.2003
-#
+##########################################################################
 #
 # This program is free but copyrighted software; see the file COPYING for
 # details.
@@ -49,7 +47,7 @@
 # (including empty lines).  This has to be a tab, not spaces.
 ##########################################################################
 #
-# INFO ::: Letzte Änderung:	19.10.2008	-- Han` --
+# INFO ::: Letzte Änderung:	05.07.2009	-- Han` -- Han@mefalcon.org --
 #
 ##########################################################################

@@ -1130,7 +1128,7 @@ CHAN_LOGOUT_SERVADMIN_SYNTAX
 CHAN_LOGOUT_SUCCEEDED
 	Der User %s wurde vom Channel %s ausgeloggt.
 CHAN_LOGOUT_ALL_SUCCEEDED
-	Alle identifizierten User wurden vom Channel ausgeloggt %s (except the channel founder).
+	Alle identifizierten User wurden vom Channel ausgeloggt %s (außer dem Channel Founder).

 # DROP responses
 CHAN_DROP_SYNTAX
@@ -1160,7 +1158,7 @@ CHAN_SUCCESSOR_CHANGED
 CHAN_SUCCESSOR_UNSET
 	Der Eintrag des Vertreters für %s wurde entfernt.
 CHAN_SUCCESSOR_IS_FOUNDER
-	%s kann nicht gleichzeitig Gründer und Vertreter im Channel %s sein.
+	%s kann nicht gleichzeitig Founder und Vertreter im Channel %s sein.

 # SET PASSWORD responses
 CHAN_SET_PASSWORD_FAILED
@@ -1559,7 +1557,7 @@ CHAN_LEVELS_LIST_HEADER
 CHAN_LEVELS_LIST_DISABLED
 	    %-*s  (deaktiviert)
 CHAN_LEVELS_LIST_FOUNDER
-	    %-*s  (nur Gründer)
+	    %-*s  (nur Founder)
 CHAN_LEVELS_LIST_NORMAL
 	    %-*s  %d
 CHAN_LEVELS_RESET
@@ -1583,9 +1581,9 @@ CHAN_INFO_SYNTAX
 CHAN_INFO_HEADER
 	Informationen über den Channel %s:
 CHAN_INFO_FOUNDER
-	           Gründer: %s (%s)
+	           Founder: %s (%s)
 CHAN_INFO_NO_FOUNDER
-	           Gründer: %s
+	           Founder: %s
 CHAN_INFO_SUCCESSOR
 	         Vertreter: %s (%s)
 CHAN_INFO_NO_SUCCESSOR
@@ -1699,7 +1697,7 @@ CHAN_GETPASS_PASSWORD_IS
 CHAN_GETKEY_SYNTAX
 	GETKEY Channel
 CHAN_GETKEY_NOKEY
-	Der Channel %s hat keinen Schlüßel.
+	Der Channel %s hat kein Passwort.
 CHAN_GETKEY_KEY
 	KEY %s %s

@@ -1825,6 +1823,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	Ein Massen-Memo wurde an alle regsitrierte User gesendet.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {Nickname | Channel}
@@ -1889,7 +1891,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s wird dich beim Einloggen über eingegangene Memos informieren. 
 MEMO_SET_NOTIFY_LOGON
@@ -2763,7 +2765,7 @@ OPER_SGLINE_VIEW_FORMAT
 OPER_SGLINE_CLEAR
 	Die SGLINE-Liste wurde geleert.

-# SZLINE responses
+# SQLINE responses
 OPER_SQLINE_SYNTAX
 	SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} [Grund]]
 OPER_SQLINE_CHANNELS_UNSUPPORTED
@@ -2914,7 +2916,9 @@ OPER_JUPE_SYNTAX

 # RAW responses
 OPER_JUPE_HOST_ERROR
-	Benutze bitte einen gültigen hostnamen, wenn du jupiterst
+	Benutze bitte einen gültigen Hostnamen, wenn du den JUPE Befehl benutzt.
+OPER_JUPE_INVALID_SERVER
+	Du kannst den JUPE Befehl nicht gegen Deinen Services Server oder Hub Server richten.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2934,7 +2938,7 @@ OPER_CANNOT_RESTART

 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [Zeit] [Nickname | Hostmaske]
+	IGNORE {ADD|DEL|LIST|CLEAR} [Zeit] [Nickname | Hostmaske]
 OPER_IGNORE_VALID_TIME
 	Du musst eine zulässige Zahl als Zeit eingeben.
 OPER_IGNORE_TIME_DONE
@@ -3012,7 +3016,7 @@ OPER_STAFF_FORMAT
 OPER_STAFF_AFORMAT
 	 %c %s  %s [%s]
 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Dieser Service ist derzeit deaktiviert, bitte versuche es später nochmal
 OPER_DEFCON_NO_CONF
@@ -3284,7 +3288,7 @@ NEWS_RANDOM_TEXT
 	[Random News - %s] %s

 NEWS_LOGON_SYNTAX
-	Syntax: LOGONNEWS {ADD|DEL|LIST} [Text|Nummer]
+	LOGONNEWS {ADD|DEL|LIST} [Text|Nummer]
 NEWS_LOGON_LIST_HEADER
 	Logon News Einträge:
 NEWS_LOGON_LIST_ENTRY
@@ -3293,13 +3297,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Es gibt keine Logon News.
 NEWS_LOGON_ADD_SYNTAX
-	Syntax: LOGONNEWS ADD Text
+	LOGONNEWS ADD Text
 NEWS_LOGON_ADD_FULL
 	Die News-Liste ist voll!
 NEWS_LOGON_ADDED
 	Neuer Logon News-Eintrag hinzugefügt (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Syntax: LOGONNEWS DEL {Nummer | ALL}
+	LOGONNEWS DEL {Nummer | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Logon News-Eintrag #%d konnte nicht gefunden werden!
 NEWS_LOGON_DELETED
@@ -3336,30 +3340,30 @@ NEWS_OPER_DELETED_ALL
 	Alle Oper-News-Einträge wurden entfernt.

 NEWS_RANDOM_SYNTAX
-	Syntax: RANDOMNEWS {ADD|DEL|LIST} [Text|Nummer]
+	RANDOMNEWS {ADD|DEL|LIST} [Text|Nummer]
 NEWS_RANDOM_LIST_HEADER
 	Random news Einträge:
 NEWS_RANDOM_LIST_ENTRY
 	%5d (%s von %s)
 	    %s
 NEWS_RANDOM_LIST_NONE
-	Keine randomnews vorhanden.
+	Keine Randomnews vorhanden.
 NEWS_RANDOM_ADD_SYNTAX
-	Syntax: RANDOMNEWS ADD Text
+	RANDOMNEWS ADD Text
 NEWS_RANDOM_ADD_FULL
 	Die News Liste ist voll!
 NEWS_RANDOM_ADDED
-	Neuer randomnews Eintrag hinzugefügt (#%d).
+	Neuer Randomnews Eintrag hinzugefügt (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Syntax: RANDOMNEWS DEL {Nummer | ALL}
+	RANDOMNEWS DEL {Nummer | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Randomnews Eintrag #%d nicht gefunden!
 NEWS_RANDOM_DELETED
 	Randomnews Eintrag #%d gelöscht.
 NEWS_RANDOM_DEL_NONE
-	Keine randomnews Einträge zu löschen!
+	Keine Randomnews Einträge zu löschen!
 NEWS_RANDOM_DELETED_ALL
-	Ale randomnews Einträge wurden gelöscht.
+	Ale Randomnews Einträge wurden gelöscht.

 NEWS_HELP_LOGON
 	Syntax: LOGONNEWS ADD Text
@@ -3371,7 +3375,7 @@ NEWS_HELP_LOGON
 	angezeigt. (Es werden jedoch nur max. %s angezeigt, um ein
 	Flooding des Users zu verhindern. Wenn mehr News
 	existieren, werden nur die neuesten angezeigt.)
-	NewsCount can be configured in services.conf.
+	Die Anzahl der News können in der services.conf festgelegt werden.
 	
 	LOGONNEWS LIST kann von jedem IRC Operator benutzt werden
 	um die aktuelle Liste der Logon News anzeigen zu lassen.
@@ -3389,7 +3393,7 @@ NEWS_HELP_OPER
 	(Es werden jedoch nur max. %s Nachrichten angezeigt, um ein
 	Flooding des Users zu verhindern. Wenn mehr News
 	existieren, werden nur die neüsten angezeigt.)
-	NewsCount can be configured in services.conf.
+	Die Anzahl der News können in der services.conf festgelegt werden.
 	
 	OPERNEWS LIST kann von jedem IRC Operator benutzt werden
 	um die aktuelle Liste der Oper-News anzeigen zu lassen.
@@ -3616,7 +3620,7 @@ NICK_HELP_UPDATE

 	Updatet deinen derzeiten Status, z.B. prüft es auf neue Nachrichten,
 	setzt benötigte Channel-Modes (ModeonID), aktualisiert deinen vHost und
-	deine userflags (lastseentime, etc).
+	deine Userflags (lastseentime, etc).
 	
 NICK_HELP_LOGOUT
 	Syntax: LOGOUT
@@ -4349,12 +4353,11 @@ CHAN_HELP_CMD_DEVOICE
 	    DEVOICE    Enfernt den Voice-Status des angegebenen Nicknamens
 	               in einen Channel
 CHAN_HELP_CMD_GETKEY
-	    GETKEY     Gibt den Channel-Schlüßel wieder
+	    GETKEY     Gibt das Channel-Passwort wieder
 CHAN_HELP_CMD_INFO
 	    INFO       Zeigt Informationen über den angegebenen Channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Veranlaßt den ChanServ den angegebenen Nickname in 
-	               einen Channel eizuladen
+	    INVITE     Befiehlt Chanserv Dich in einen Channel einzuladen
 CHAN_HELP_CMD_KICK
 	    KICK       Kickt den angegebenen Nicknamen aus einen Channel
 CHAN_HELP_CMD_LIST
@@ -4366,7 +4369,7 @@ CHAN_HELP_CMD_OP
 CHAN_HELP_CMD_TOPIC
 	    TOPIC      Ändert den Topic des angegebenen Channels
 CHAN_HELP_CMD_UNBAN
-	    UNBAN      Enfernt ein ban(s) die dich betreffen aus einen Channel
+	    UNBAN      Enfernt den oder die ban(s) die dich betreffen aus einen Channel
 CHAN_HELP_CMD_VOICE
 	    VOICE      Gibt den angegebenen User Voice-Status in einen Channel
 CHAN_HELP_CMD_VOP
@@ -4375,7 +4378,7 @@ CHAN_HELP_CMD_DEHALFOP
 	    DEHALFOP   Enfernt den HalfOP-Status des angegebenen Nicknamens
 	               in einen Channel
 CHAN_HELP_CMD_DEOWNER
-	    DEOWNER    Entfernt dein Gründer Status in einen Channel
+	    DEOWNER    Entfernt dein Founder (Gründer) Status in einen Channel
 CHAN_HELP_CMD_DEPROTECT
 	    DEPROTECT  Entfernt den schutz des angegebenen Nicknamens 
 	               in einen Channel
@@ -4384,7 +4387,7 @@ CHAN_HELP_CMD_HALFOP
 CHAN_HELP_CMD_HOP
 	    HOP        Verwaltet die HOP-Liste von einen Channel
 CHAN_HELP_CMD_OWNER
-	    OWNER      Gibt dir Gründer Staus in einen Channel
+	    OWNER      Gibt dir Founder (Gründer) Staus in einen Channel
 CHAN_HELP_CMD_PROTECT
 	    PROTECT    Schützt den angegebenen Nicknamen in einen Channel
 CHAN_HELP_CMD_ADMIN
@@ -4442,7 +4445,7 @@ CHAN_HELP_IDENTIFY
 	Syntax: IDENTIFY Channel Passwort
 	
 	Identifiziert ein Nickname gegenüber %S als 
-	Gründer (Founder) des angegebenen Channels. 
+	Founder (Gründer) des angegebenen Channels. 
 	Das Passwort muss dasselbe wie bei der 
 	registrierung des angegebenen Channels sein
 	und ist in der Regel von den Real-Founder des
@@ -4471,7 +4474,7 @@ CHAN_HELP_SET
 	
 	Verfügbare Optionen:
 	
-	    FOUNDER       Stellt den Gründer des Channels ein
+	    FOUNDER       Stellt den Founder (Gründer) des Channels ein
 	    SUCCESSOR     Stellt den Vertreter des Founders ein
 	    PASSWORD      Ändert das Passwort des Channel-Founders
 	    DESC          Ändert die Channel-Beschreibung
@@ -4510,10 +4513,10 @@ CHAN_HELP_SET_FOUNDER
 CHAN_HELP_SET_SUCCESSOR
 	Syntax: SET Channel SUCCESSOR Nickname
 	
-	Ändert den Vertreter des Gründers in dem Channel. Wenn
-	der Nickname des Gründers ausläuft oder gedropped wird,
+	Ändert den Vertreter des Founders (Gründer) in dem Channel.
+	Wenn der Nickname des Founders ausläuft oder gedropped wird,
 	wenn der Channel registriert ist, wird der Vertreter
-	der neue Gründer des Channels. Wenn jedoch der 
+	der neue Founder des Channels. Wenn jedoch der 
 	Vertreter bereits zu viele Channels registriert hat
 	(max %d), wird der Channel gedropped.
 	
@@ -4705,7 +4708,7 @@ CHAN_HELP_SET_XOP
 	wechselst, werden die Zugriffslevel geändert, folglich wirst du
 	nicht die selben Werte finden, wenn du zu Access zurückwechselst.
 	
-	Du solltest nach einem Wechsel zum xOP System darauf achten, 
+	Du solltest nach einem Wechsel zum XOP System darauf achten, 
 	dass die User das richtige Level besitzen, da das Umwechseln
 	auf Vermutung basiert und nicht immer perfekt funktioniert. 
 	Es ist nicht empfohlen nach einer Änderung der Levels das xOP
@@ -5061,9 +5064,9 @@ CHAN_HELP_OP
 	
 	Setzt den Operator-Status des angegebenen Nicknamen 
 	in dem Channel. Wird kein Nickname angegeben, wird
-	ChanServ dich oppen, vorausgesetzt, du hast die
-	entsprechenden Rechte in der Zugriffsliste um
-	diesen Befehl auszuführen.
+	ChanServ Dir Op Status geben, vorausgesetzt,
+	du hast dieentsprechenden Rechte in der Zugriffsliste
+	um diesen Befehl auszuführen.
 	
 	Standardmässig ist dafür ein Level von 5 oder
 	grösser erforderlich.
@@ -5072,10 +5075,11 @@ CHAN_HELP_DEOP
 	Syntax: DEOP [Channel [Nickname]]
 	
 	Entfernt den Operator-Status eines bestimmten Nickname
-	in dem Channel. Wird kein Nickname angegeben, wird ChanServ
-	dich deoppen. Wird weder Channel noch Nick als Parameter
-	übergeben, wird ChanServ dich in allen Channels deoppen
-	in denen du die entsprechenden Rechte hast.
+	in dem Channel. Wird kein Nickname angegeben, wird 
+	ChanServ Dir den Op Status nehmen. Wird weder Channel
+	noch Nick als Parameter übergeben, wird ChanServ Dir 
+	in allen Channels den Op Status nehmen, in denen Du die
+	entsprechenden Rechte hast.
 	
 	Standardmässig ist dafür ein Level von 5 oder
 	grösser erforderlich.
@@ -5084,53 +5088,53 @@ CHAN_HELP_VOICE
 	Syntax: VOICE [Channel [Nickname]]
 	
 	Erteilt dem angegebenen Nickname Voice-Status in dem
-	Channel. Wird kein Nick angegeben, wird ChanServ dich
-	voicen. Wird weder Channel noch Nickane angegeben, wird
-	ChanServ dich in allen Channels voicen, in denen du
-	die entsprechenden Rechte hast.
+	Channel. Wird kein Nick angegeben, wird ChanServ Dir
+	Voice geben. Wird weder Channel noch Nickane angegeben,
+	wird ChanServ Dir in allen Channels Voice geben,
+	in denen Du die entsprechenden Rechte hast.
 	
 	Standardmässig brauchst du dafür ein Level von 5
-	um anderen Voice zu erteilen, oder Level 3 um dich
-	selbst zu voicen.
+	um anderen Voice zu erteilen, oder Level 3 um Dir
+	selbst Voice zu geben.

 CHAN_HELP_DEVOICE
 	Syntax: DEVOICE [Channel [Nickname]]
 	
 	Entfernt den Voice-Status des Nicknamen in dem Channel.
-	Wird kein Nickname angegeben, wird ChanServ dich devoicen.
-	Wird weder Channel noch Nick angegeben, wird ChanServ
-	dich in allen Channels voicen, in denen du die
-	entsprechenden Rechte hast.
+	Wird kein Nickname angegeben, wird ChanServ Dir den
+	Voice Status nehmen.Wird weder Channel noch Nick angegeben,
+	wird ChanServ Dir in allen Channels den Voice Status nehmen,
+	in denen Du die entsprechenden Rechte hast.
 	
 	Standardmässig brauchst du dafür ein Level von 5
-	um andere zu devoicen, oder Level 3 um dich selbst
-	vom Voice-Flag zu befreien.
+	um anderen den Voice Status zu nehmen, oder Level 3 um
+	dich selbst vom Voice-Flag zu befreien.
 	
 CHAN_HELP_HALFOP
 	Syntax: HALFOP [Channel [Nickname]]
 	
 	Setzt den Half-Op-Status des angegebenen Nicknamen in dem
-	Channel. Wird kein Nickname angegeben, wird ChanServ dich
-	halfoppen. Wird weder Channel noch Nickname angegeben,
-	wird ChanServ dich in allen Channels halfoppen, in denen
-	du die entsprechenden Rechte hast.
+	Channel. Wird kein Nickname angegeben, wird ChanServ Dir
+	den Halfop geben. Wird weder Channel noch Nickname angegeben,
+	wird ChanServ Dir in allen Channels den Halfop geben,
+	in denen du die entsprechenden Rechte hast.
 	
 	Standardmässig brauchst du dafür ein Level von 5
-	um andere zu halfoppen, oder Level 4 um dich selbst zu
-	halfoppen.
+	um andere den Halfop Status zu geben, oder Level 4 
+	um Dir selbst den Halfop Status zu geben.

 CHAN_HELP_DEHALFOP
 	Syntax: DEHALFOP [Channel [Nickname]]
 	
 	Entfernt den Half-Op-Status des angegebenen Nicknamen in dem
-	Channel. Wird kein Nickname angegeben, wird ChanServ dich
-	dehalfoppen. Wird weder Channel noch Nickname angegeben,
-	wird ChanServ dich in allen Channels dehalfoppen, in denen
+	Channel. Wird kein Nickname angegeben, wird ChanServ Dir
+	den Halfop nehmen. Wird weder Channel noch Nickname angegeben,
+	wird ChanServ Dir in allen Channels den Halfop nehmen, in denen
 	du die entsprechenden Rechte hast.
 	
 	Standardmässig brauchst du dafür ein Level von 5
-	um andere zu dehalfoppen, oder Level 4 um dich selbst zu
-	dehalfoppen.
+	um andere den Halfop Status zu nehmen, oder Level 4 
+	um Dir selbst den Halfop Status zu nehmen.
 	
 CHAN_HELP_PROTECT
 	Syntax: PROTECT [Channel [Nickname]]
@@ -5240,6 +5244,7 @@ CHAN_HELP_CLEAR
 	              (z.B. Modi i,k,l,m,n,p,s und t)
 	     BANS     Entfernt alle Bans in dem Channel
 	     EXCEPTS  Entfernt alle Excepts in dem Channel
+	     INVITES  Clears all invites on the channel
 	     OPS      Entfernt jeden Operator-Status (mode +o)
 	              in dem Channel.
 	     HOPS     Entfernt jeden Halfoperator-Status (mode +h) 
@@ -5535,7 +5540,7 @@ MEMO_HELP_SET
 	über eine bestimmte Option.

 MEMO_HELP_SET_NOTIFY
-	Syntax: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Ändert den Zeitpunkt, wann MemoServ dich über neue
 	eingegangene Memos informiert:
@@ -5548,10 +5553,16 @@ MEMO_HELP_SET_NOTIFY
 	            machst.
 	    NEW     Du wirst nur informiert, wenn sie an dich
 	            gesendet werden.
+	    MAIL    Du wirst über neue memos per email informiert.
+	    NOMAIL  Du wirst nicht über neue memos informiert per email.
 	    OFF     Es wird keine Benachrichtigung über neue
 	            Memos stattfinden.
 	
 	ON ist eine Kombination aus LOGON und NEW.
+	MAIL und NOMAIL sind optionale Einstellungen und
+	beeinflussen ON | LOGON | NEW nicht. Nach der Einstellung
+	OFF muß die Option Mail erneut gesetzt werden, damit
+	memos per email zugestellt werden sollen.

 MEMO_HELP_SET_LIMIT
 	Syntax: SET LIMIT [Channel] Limit
@@ -6711,7 +6722,7 @@ HOST_SETALL
 HOST_DELALL
 	vHost für die Gruppe %s wurden gelöscht.
 HOST_DELALL_SYNTAX
-	Syntax: DELALL Nickname.
+	DELALL Nickname.
 HOST_IDENT_SETALL
 	vHost für die Gruppe %s wurde gesetzt: %s@%s.
 HOST_SET_ERROR
@@ -6745,7 +6756,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vHost für %s wurde gelöscht.
 HOST_DEL_SYNTAX
-	Syntax: %R%s DEL Nickname.
+	DEL Nickname.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -1786,6 +1786,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	A massmemo has been sent to all registered users.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | channel}
@@ -1850,7 +1854,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | MAIL | OFF }
+	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
@@ -2861,6 +2865,8 @@ 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.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2880,7 +2886,7 @@ OPER_CANNOT_RESTART

 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -2950,7 +2956,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Services are in Defcon mode, Please try again later.
 OPER_DEFCON_NO_CONF
@@ -3193,7 +3199,7 @@ NEWS_RANDOM_TEXT
 	[Random News - %s] %s

 NEWS_LOGON_SYNTAX
-	Syntax: LOGONNEWS {ADD|DEL|LIST} [text|num]
+	LOGONNEWS {ADD|DEL|LIST} [text|num]
 NEWS_LOGON_LIST_HEADER
 	Logon news items:
 NEWS_LOGON_LIST_ENTRY
@@ -3202,13 +3208,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	There is no logon news.
 NEWS_LOGON_ADD_SYNTAX
-	Syntax: LOGONNEWS ADD text
+	LOGONNEWS ADD text
 NEWS_LOGON_ADD_FULL
 	News list is full!
 NEWS_LOGON_ADDED
 	Added new logon news item (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Syntax: LOGONNEWS DEL {num | ALL}
+	LOGONNEWS DEL {num | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Logon news item #%d not found!
 NEWS_LOGON_DELETED
@@ -3219,7 +3225,7 @@ NEWS_LOGON_DELETED_ALL
 	All logon news items deleted.

 NEWS_OPER_SYNTAX
-	Syntax: OPERNEWS {ADD|DEL|LIST} [text|num]
+	OPERNEWS {ADD|DEL|LIST} [text|num]
 NEWS_OPER_LIST_HEADER
 	Oper news items:
 NEWS_OPER_LIST_ENTRY
@@ -3228,13 +3234,13 @@ NEWS_OPER_LIST_ENTRY
 NEWS_OPER_LIST_NONE
 	There is no oper news.
 NEWS_OPER_ADD_SYNTAX
-	Syntax: OPERNEWS ADD text
+	OPERNEWS ADD text
 NEWS_OPER_ADD_FULL
 	News list is full!
 NEWS_OPER_ADDED
 	Added new oper news item (#%d).
 NEWS_OPER_DEL_SYNTAX
-	Syntax: OPERNEWS DEL {num | ALL}
+	OPERNEWS DEL {num | ALL}
 NEWS_OPER_DEL_NOT_FOUND
 	Oper news item #%d not found!
 NEWS_OPER_DELETED
@@ -3245,7 +3251,7 @@ NEWS_OPER_DELETED_ALL
 	All oper news items deleted.

 NEWS_RANDOM_SYNTAX
-	Syntax: RANDOMNEWS {ADD|DEL|LIST} [text|num]
+	RANDOMNEWS {ADD|DEL|LIST} [text|num]
 NEWS_RANDOM_LIST_HEADER
 	Random news items:
 NEWS_RANDOM_LIST_ENTRY
@@ -3254,13 +3260,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	There is no random news.
 NEWS_RANDOM_ADD_SYNTAX
-	Syntax: RANDOMNEWS ADD text
+	RANDOMNEWS ADD text
 NEWS_RANDOM_ADD_FULL
 	News list is full!
 NEWS_RANDOM_ADDED
 	Added new random news item (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Syntax: RANDOMNEWS DEL {num | ALL}
+	RANDOMNEWS DEL {num | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Random news item #%d not found!
 NEWS_RANDOM_DELETED
@@ -4156,7 +4162,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4426,11 +4432,8 @@ CHAN_HELP_SET_RESTRICTED
 	Syntax: SET channel RESTRICTED {ON | OFF}
 	
 	Enables or disables the restricted access option for a
-	channel.  When restricted access is set, users who would
-	normally be disallowed from having channel operator
-	privileges (users with negative access levels and, if
-	secure ops is set, users not on the access list) will
-	instead be kicked and banned from the channel.
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Syntax: SET channel SECURE {ON | OFF}
@@ -4993,6 +4996,7 @@ CHAN_HELP_CLEAR
 	                  modes i,k,l,m,n,p,s,t).
 	     BANS     Clears all bans on the channel.
 	     EXCEPTS  Clears all excepts on the channel.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Removes channel-operator status (mode +o) from
 	                  all channel operators.
 	     HOPS     Removes channel-halfoperator status (mode +h) from
@@ -5248,7 +5252,7 @@ MEMO_HELP_SET
 	on a specific option.

 MEMO_HELP_SET_NOTIFY
-	Syntax: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}

 	Changes when you will be notified about new memos:
 	
@@ -5259,6 +5263,9 @@ MEMO_HELP_SET_NOTIFY
 	               on or when you unset /AWAY.
 	    NEW     You will only be notified of memos when they
 	               are sent to you.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     You will not receive any notification of memos.
 	
 	ON is essentially LOGON and NEW combined.
@@ -6345,7 +6352,7 @@ HOST_SETALL
 HOST_DELALL
 	vhosts for group %s have been removed.
 HOST_DELALL_SYNTAX
-	Syntax: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost for group %s set to %s@%s.
 HOST_SET_ERROR
@@ -6377,7 +6384,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost for %s removed.
 HOST_DEL_SYNTAX
-	Syntax: %R%s del <nick>.
+	DEL <nick>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored. 
 HOST_OFF_UNREAL
@@ -1821,6 +1821,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	Un massmemo ha sido enviado a todos los usuarios registrados.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | canal}
@@ -1887,7 +1891,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s ahora te notificara de tus memos cuando te conectes y cuando te sean enviados.
 MEMO_SET_NOTIFY_LOGON
@@ -2922,6 +2926,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Por favor usa un nombre de servidor valido cuando use JUPE
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2942,7 +2948,7 @@ OPER_CANNOT_RESTART

 # IGNORE responses
 OPER_IGNORE_SYNTAX
-	Sintaxis: IGNORE {ADD|DEL|LIST|CLEAR} [tiempo] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [tiempo] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Debes ingresar un numero valido como tiempo.
 OPER_IGNORE_TIME_DONE
@@ -3034,7 +3040,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Sintaxis: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Los servicios estan deshabilitados temporalmente, por favor intenta mas tarde 
 OPER_DEFCON_NO_CONF
@@ -3307,7 +3313,7 @@ NEWS_RANDOM_TEXT
 	[Noticias al Azar - %s] %s

 NEWS_LOGON_SYNTAX
-	Sintaxis: LOGONNEWS {ADD|DEL|LIST} [texto|numero]
+	LOGONNEWS {ADD|DEL|LIST} [texto|numero]
 NEWS_LOGON_LIST_HEADER
 	Noticias de entrada:
 NEWS_LOGON_LIST_ENTRY
@@ -3316,13 +3322,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	No hay Noticias de entrada.
 NEWS_LOGON_ADD_SYNTAX
-	Sintaxis: LOGONNEWS ADD texto
+	LOGONNEWS ADD texto
 NEWS_LOGON_ADD_FULL
 	La lista de noticias esta llena!
 NEWS_LOGON_ADDED
 	Nueva noticia de entrada anadida (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Sintaxis: LOGONNEWS DEL {numero | ALL}
+	LOGONNEWS DEL {numero | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Noticia de entrada #%d no encontrada!
 NEWS_LOGON_DELETED
@@ -3359,7 +3365,7 @@ NEWS_OPER_DELETED_ALL
 	Todas las noticias de oper borradas.

 NEWS_RANDOM_SYNTAX
-	Sintaxis: RANDOMNEWS {ADD|DEL|LIST} [texto|numero]
+	RANDOMNEWS {ADD|DEL|LIST} [texto|numero]
 NEWS_RANDOM_LIST_HEADER
 	Noticias al Azar:
 NEWS_RANDOM_LIST_ENTRY
@@ -3368,13 +3374,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	No hay Noticias al azar.
 NEWS_RANDOM_ADD_SYNTAX
-	Sintaxis: RANDOMNEWS ADD texto
+	RANDOMNEWS ADD texto
 NEWS_RANDOM_ADD_FULL
 	La lista de noticias esta llena!
 NEWS_RANDOM_ADDED
 	Nueva noticia al azar anadida (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Sintaxis: RANDOMNEWS DEL {numero | ALL}
+	RANDOMNEWS DEL {numero | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Noticia al azar #%d no encontrada!
 NEWS_RANDOM_DELETED
@@ -4318,7 +4324,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4604,13 +4610,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Sintaxis: SET canal RESTRICTED {ON | OFF}
 	
-	Habilita o deshabilita la opcion de acceso restringido
-	para un canal. Cuando el acceso restringido esta
-	seteado, Los usuarios seran inhabilitados de tener
-	privilegios de operador de canal. (usuarios con acceso
-	negativo y, si seguridad de ops esta seteada,
-	usuarios no en la lista de acceso) seran en vez
-	kickeados y baneados del canal.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Sintaxis: SET canal SECURE {ON | OFF}
@@ -5195,6 +5197,7 @@ CHAN_HELP_CLEAR
 	                  limpia los modos i,k,l,m,n,p,s,t).
 	     BANS     Limpia todos los bans en el canal.
 	     EXCEPTS  Limpia todos los excepts en el canal.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Remueve estatus de operador de canal(modo +o)
 	                  de todos los operadores de canal.
 	     HOPS     Removes channel-halfoperator status (mode +h) from
@@ -5469,7 +5472,7 @@ MEMO_HELP_SET
 	acerca de una opcion especifica.

 MEMO_HELP_SET_NOTIFY
-	Sintaxis: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintaxis: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Cambia cuando seras notificado acerca de nuevos memos:
 	
@@ -5480,6 +5483,9 @@ MEMO_HELP_SET_NOTIFY
 	               o cuando saques tu /AWAY.
 	    NEW     Solo seras notificado de memos cuando te sean
 	               enviados.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     No recibiras ninguna notificacion por memos.
 	
 	ON es escencialmente LOGON y NEW combinados.
@@ -6682,7 +6688,7 @@ HOST_SETALL
 HOST_DELALL
 	El vhost para el group %s ha sido removido.
 HOST_DELALL_SYNTAX
-	Sintaxis: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost para el grupo %s seteado a %s@%s.
 HOST_SET_ERROR
@@ -6714,7 +6720,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost para %s removido.
 HOST_DEL_SYNTAX
-	Sintaxis: %R%s del <nick>.
+	DEL <nick>.

 ###########################################################################
 #
@@ -1830,6 +1830,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	Un mass memo a été envoyé a tout les pseudos enregistrés.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {pseudo | canal}
@@ -1896,7 +1900,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s vous notifiera maintenant des memos quand vous vous connectez et quand ils vous sont envoyés.
 MEMO_SET_NOTIFY_LOGON
@@ -2972,6 +2976,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Veuillez indiquer un nom de serveur valide pour JUPE.
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2993,7 +2999,7 @@ OPER_CANNOT_RESTART

 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntaxe: IGNORE {ADD|DEL|LIST|CLEAR} [durée] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [durée] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Vous devez entrer une durée valide
 OPER_IGNORE_TIME_DONE
@@ -3085,7 +3091,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Syntaxe: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Ce service est temporairement désactivé, veuillez réessayer ultérieurement.
 OPER_DEFCON_NO_CONF
@@ -3361,7 +3367,7 @@ NEWS_RANDOM_TEXT
 	[News Aléatoire - %s] %s

 NEWS_LOGON_SYNTAX
-	Syntaxe: LOGONNEWS {ADD|DEL|LIST} [texte|nombre]
+	LOGONNEWS {ADD|DEL|LIST} [texte|nombre]
 NEWS_LOGON_LIST_HEADER
 	Articles des logon news:
 NEWS_LOGON_LIST_ENTRY
@@ -3370,13 +3376,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Il n'y a pas de logon news.
 NEWS_LOGON_ADD_SYNTAX
-	Syntaxe: LOGONNEWS ADD texte
+	LOGONNEWS ADD texte
 NEWS_LOGON_ADD_FULL
 	La liste des News est pleine!
 NEWS_LOGON_ADDED
 	Ajouté un nouvel article de logon news (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Syntaxe: LOGONNEWS DEL {num | ALL}
+	LOGONNEWS DEL {num | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Article de logon news #%d non trouvé!
 NEWS_LOGON_DELETED
@@ -3413,7 +3419,7 @@ NEWS_OPER_DELETED_ALL
 	Tous les articles oper news supprimés.

 NEWS_RANDOM_SYNTAX
-	Syntaxe: RANDOMNEWS {ADD|DEL|LIST} [texte|nombre]
+	RANDOMNEWS {ADD|DEL|LIST} [texte|nombre]
 NEWS_RANDOM_LIST_HEADER
 	Nouvelles aléatoires:
 NEWS_RANDOM_LIST_ENTRY
@@ -3422,13 +3428,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Il n'y a pas de nouvelles aléatoires.
 NEWS_RANDOM_ADD_SYNTAX
-	Syntaxe: RANDOMNEWS ADD texte
+	RANDOMNEWS ADD texte
 NEWS_RANDOM_ADD_FULL
 	La liste de nouvelles est pleine!
 NEWS_RANDOM_ADDED
 	Nouvelle aléatoire ajoutée (n°%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Syntaxe: RANDOMNEWS DEL {num | ALL}
+	RANDOMNEWS DEL {num | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Nouvelle aléatoire n°%d non trouvée!
 NEWS_RANDOM_DELETED
@@ -4389,8 +4395,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Liste les informations sur un canal enregistré
 CHAN_HELP_CMD_INVITE
-	    INVITE     Ordone à ChanServ de vous inviter ou d'inviter un pseudo
-	               sur un canal
+	    INVITE     Tells ChanServ to invite you into a channel
 CHAN_HELP_CMD_KICK
 	    KICK       Kick le pseudo spécifié d'un canal
 CHAN_HELP_CMD_LIST
@@ -4674,13 +4679,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Syntaxe: SET canal RESTRICTED {ON | OFF}
 	
-	Active ou désactive l'option d'accès restreint pour un
-	canal. Lorsque l'accès restreint est actif, les
-	utilisateurs qui n'auraient normalement pas la permission
-	d'être opérateur du canal (les utilisateurs avec un niveau
-	d'accès négatif et, si le contrôle des ops est actif, les utilisateurs
-	qui ne sont pas sur la liste d'accès) seront kickés et bannis
-	du canal.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Syntaxe: SET canal SECURE {ON | OFF}
@@ -5263,6 +5264,7 @@ CHAN_HELP_CLEAR
 	     MODES   Réinitialise tous les modes d'un canal
 	     BANS    Enlève tous les bans d'un canal.
 	     EXCEPTS Enlève tous les excepts d'un canal.
+	     INVITES Clears all invites on the channel.
 	     OPS     Enlève le status d'opérateur du canal à
 	             tous les opérateurs du canal.
 	     HOPS    Enlève le status d'halfop (mode +h) a tout les halfop
@@ -5547,7 +5549,7 @@ MEMO_HELP_SET
 	d'informations sur une option spécifique.

 MEMO_HELP_SET_NOTIFY
-	Syntaxe: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntaxe: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Change quand vous serez notifié de vos nouveaux
 	memos:
@@ -5560,6 +5562,9 @@ MEMO_HELP_SET_NOTIFY
 	           /AWAY.
 	    NEW    Vous serez uniquement notifiés des memos 
 	           lorsqu'ils vous sont envoyés.
+	    MAIL    You will be notified of memos by email aswell as
+	            any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF    Vous ne recevrez aucune notification.
 	
 	ON est la combination de LOGON et NEW.
@@ -6765,7 +6770,7 @@ HOST_SETALL
 HOST_DELALL
 	Le vhosts pour le groupe %s a été supprimé.
 HOST_DELALL_SYNTAX
-	Syntaxe: DELALL <pseudo>.
+	DELALL <pseudo>.
 HOST_IDENT_SETALL
 	Le vhost pour le groupe %s enregistrée en %s@%s.
 HOST_SET_ERROR
@@ -6797,7 +6802,7 @@ HOST_NOT_REGED
 HOST_DEL
 	Le vhost pour %s a été supprimé.
 HOST_DEL_SYNTAX
-	Syntaxe: %R%s del <pseudo>.
+	DEL <pseudo>.

 ###########################################################################
 #
@@ -1821,7 +1821,11 @@ MEMO_SENT
 	
 # CANCEL responses
 MEMO_MASS_SENT
-	A massmemo has been sent to all registered users.
+	A mass memo has been sent to all registered users.
+	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
 	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
@@ -1889,7 +1893,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s áðü ôþñá üôáí èá êÜíåéò åíôïëÞ logon èá âëÝðåéò ôá ìçíýìáôá ðïõ èá óïõ óôÝëíïõí êáèþò èáóáé óôï äßêôõï.
 MEMO_SET_NOTIFY_LOGON
@@ -2952,6 +2956,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 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.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2971,7 +2977,7 @@ OPER_CANNOT_RESTART

 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -3063,7 +3069,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	This service is temporarly disabled, please try again later
 OPER_DEFCON_NO_CONF
@@ -3325,7 +3331,7 @@ NEWS_RANDOM_TEXT
 	[ÍÝá ó÷åôéêÜ ìå ôï äßêôõï - %s] %s

 NEWS_LOGON_SYNTAX
-	Óýíôáîç: LOGONNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]
+	LOGONNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]
 NEWS_LOGON_LIST_HEADER
 	Êáíïíéóìïß:
 NEWS_LOGON_LIST_ENTRY
@@ -3334,13 +3340,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Äåí õðÜñ÷ïõí êáíïíéóìïß Þ ðëçñïöïñßåò.
 NEWS_LOGON_ADD_SYNTAX
-	Óýíôáîç: LOGONNEWS ADD ðåñéå÷üìåíï
+	LOGONNEWS ADD ðåñéå÷üìåíï
 NEWS_LOGON_ADD_FULL
 	Ç ëßóôá ôùí íÝùí åßíáé ãåìÜôç!
 NEWS_LOGON_ADDED
 	ÐñïóôÝèçêå Ýíáò êáíïíéóìüò Þ ðëçñïöïñßá óôç èÝóç (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Óýíôáîç: LOGONNEWS DEL {íïýìåñï | ALL}
+	LOGONNEWS DEL {íïýìåñï | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Êáíïíéóìüò óôç èÝóç #%d äåí âñÝèçêå!
 NEWS_LOGON_DELETED
@@ -3377,7 +3383,7 @@ NEWS_OPER_DELETED_ALL
 	¼ëá ôá íÝá ãéá ôïõò opers äéáãñÜöçêáí.

 NEWS_RANDOM_SYNTAX
-	Óýíôáîç: RANDOMNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]
+	RANDOMNEWS {ADD|DEL|LIST} [ðåñéå÷üìåíï|íïýìåñï]
 NEWS_RANDOM_LIST_HEADER
 	ÍÝá ãéá ôï äßêôõï:
 NEWS_RANDOM_LIST_ENTRY
@@ -3386,13 +3392,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Äåí õðÜñ÷ïõí íÝá.
 NEWS_RANDOM_ADD_SYNTAX
-	Óýíôáîç: RANDOMNEWS ADD ðåñéå÷üìåíï
+	RANDOMNEWS ADD ðåñéå÷üìåíï
 NEWS_RANDOM_ADD_FULL
 	Ç ëßóôá åßíáé ãåìÜôç!
 NEWS_RANDOM_ADDED
 	ÐñïóèÝèçêå Ýíá íÝï ìÞíõìá óôçí èÝóç (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Óýíôáîç: RANDOMNEWS DEL {íïýìåñï | ALL}
+	RANDOMNEWS DEL {íïýìåñï | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Ôï ìÞíõìá óôçí èÝóç #%d äåí âñÝèçêå!
 NEWS_RANDOM_DELETED
@@ -4337,7 +4343,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4608,10 +4614,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Óýíôáîç: SET êáíÜëé RESTRICTED {ON | OFF}
 	
-	Åíåñãïðïéåß Þ áðåñíåñãïðïéåß ôçí restricted access åðéëïãÞ ôïõ
-	êáíáëéïý.  ¼ôáí åíåñãïðéçèåß ç restricted access , ÷ñÞóôåò ïé
-	ïðïßïé äåí Ý÷ïõí access óôï êáíÜëé, ïé õðçñåóßåò èá ôïõò êÜíïõí
-	kick êáé ban áðü ôï êáíÜëé.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.
 	
 CHAN_HELP_SET_SECURE
 	Óýíôáîç: SET êáíÜëé SECURE {ON | OFF}
@@ -5167,6 +5172,7 @@ CHAN_HELP_CLEAR
 	                  modes i,k,l,m,n,p,s,t).
 	     BANS     Êáèáñßæåé üëá ôá bans áðü ôï êáíÜëé.
 	     EXCEPTS  Êáèáñßæåé üëá ôá excepts áðü ôï êáíÜëé.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Áöáéñåß ôï channel-operator status (mode +o) áðü
 	                  üëïõò ôïõò channel operators.
 	     HOPS     Removes channel-halfoperator status (mode +h) from
@@ -5441,7 +5447,7 @@ MEMO_HELP_SET
 	óå ìéá óõãêåêñéìÝíç åðéëïãÞ.

 MEMO_HELP_SET_NOTIFY
-	Óýíôáîç: SET NOTIFY {ON | LOGON | NEW | OFF}	
+	Óýíôáîç: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}	
 	
 	ÁëëáãÝò ãéá ôï ðùò èÝëåôå íá åíçìåñþíåóôå ãéá íÝá ìçíýìáôá:
 	
@@ -5452,6 +5458,9 @@ MEMO_HELP_SET_NOTIFY
 	               on Þ üôáí èá åðáíÝñ÷åóôå áðü /AWAY.
 	    NEW     Èá åíçìåñþíåóôå ãéá ôá ìçíýìáôá óáò ìüíï üôáí èá óáò
 	               ôá óôÝëíïõí.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Äåí èá åíçìåñþíåóôå ðïôÝ ãéá íÝá ìçíýìáôá Þ ðáëéÜ.
 	
 	Ç åðéëïãÞ ON ðéï ïõóéþäçò,ç LOGON êáé ç NEW óõíäéáóôéêÞ.
@@ -6596,7 +6605,7 @@ HOST_SETALL
 HOST_DELALL
 	vhosts for group %s have been removed.
 HOST_DELALL_SYNTAX
-	Syntax: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost for group %s set to %s@%s.
 HOST_SET_ERROR
@@ -6628,7 +6637,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost for %s removed.
 HOST_DEL_SYNTAX
-	Syntax: %R%s del <nick>.
+	DEL <nick>.

 ###########################################################################
 #
@@ -1826,6 +1826,10 @@ MEMO_CANCEL_NONE
 	Nincs visszavont memo üzenet.
 MEMO_CANCELLED
 	%s részére küldött utolsó memo üzenet visszavonva.
+	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text

 # LIST válaszok
 MEMO_LIST_SYNTAX
@@ -1881,7 +1885,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY válaszok
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s értesíteni fog az üzenetekrõl csatlakozáskor.
 MEMO_SET_NOTIFY_LOGON
@@ -2911,6 +2915,8 @@ OPER_JUPE_SYNTAX
 	JUPE szervernév [leírás]
 OPER_JUPE_HOST_ERROR
 	Kérlek használj érvényes szerver nevet amikor jupolsz!
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.

 # RAW válaszok
 OPER_RAW_SYNTAX
@@ -2932,7 +2938,7 @@ OPER_CANNOT_RESTART

 # IGNORE válaszok
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [idõ] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [idõ] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Használj érvényes számot idõnek. 
 	(Adj meg érvényes számot az idõhöz.)
@@ -3005,7 +3011,7 @@ OPER_STAFF_AFORMAT
 # DefCon Üzenet

 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Szervíz Defcon módban fut, próbáld késõbb.
 OPER_DEFCON_NO_CONF
@@ -3259,7 +3265,7 @@ NEWS_RANDOM_TEXT
 	[Véletlenszerû Hír] - %s %s

 NEWS_LOGON_SYNTAX
-	Syntax: LOGONNEWS { ADD | DEL | LIST } [szöveg|szám]
+	LOGONNEWS { ADD | DEL | LIST } [szöveg|szám]
 NEWS_LOGON_LIST_HEADER
 	Fellépési hírek:
 NEWS_LOGON_LIST_ENTRY
@@ -3268,13 +3274,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Nincs fellépõ üzenet.
 NEWS_LOGON_ADD_SYNTAX
-	Syntax: LOGONNEWS ADD szöveg
+	LOGONNEWS ADD szöveg
 NEWS_LOGON_ADD_FULL
 	A Hírlista tele!
 NEWS_LOGON_ADDED
 	Hozzáadva az új fellépési hír: (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Syntax: LOGONNEWS DEL {szám | ALL}
+	LOGONNEWS DEL {szám | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Logon news tétel #%d nem található!
 NEWS_LOGON_DELETED
@@ -3311,7 +3317,7 @@ NEWS_OPER_DELETED_ALL
 	Összes oper hír törölve.

 NEWS_RANDOM_SYNTAX
-	Syntax: RANDOMNEWS { ADD | DEL | LIST } [ szöveg | szám ]
+	RANDOMNEWS { ADD | DEL | LIST } [ szöveg | szám ]
 NEWS_RANDOM_LIST_HEADER
 	Véletlenszerû hírek listája:
 NEWS_RANDOM_LIST_ENTRY
@@ -3320,13 +3326,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Nincs véletlenszerû hír.
 NEWS_RANDOM_ADD_SYNTAX
-	Syntax: RANDOMNEWS ADD szöveg
+	RANDOMNEWS ADD szöveg
 NEWS_RANDOM_ADD_FULL
 	News lista tele!
 NEWS_RANDOM_ADDED
 	Hozzáadva az új random news tétel (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Syntax: RANDOMNEWS DEL {szám | ALL}
+	RANDOMNEWS DEL {szám | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Random news tétel #%d nem található!
 NEWS_RANDOM_DELETED
@@ -4256,7 +4262,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4526,13 +4532,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Syntax: SET #szoba RESTRICTED {ON | OFF}
 	
-	Engedélyezi vagy letiltja a korlátozott hozzáférés
-	opciót a csatornán. Amikor a korlátozott hozzáférés
-	be van kapcsolva, a userek nem kaphatnak szoba
-	operátori jogokat (userek negatív access szinttel,
-	ha a secure opsopció be van kapcsolva, akkor azok a
-	userek, akik nem szerepelnek az access listán) azonnal
-	ki lesznek rúgva és tiltva a szobából belépéskor.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.
 	
 CHAN_HELP_SET_SECURE
 	Syntax: SET #szoba SECURE {ON | OFF}
@@ -5112,6 +5114,7 @@ CHAN_HELP_CLEAR
 	             mode lockjában.
 	    BANS     Törli az összes tiltást a csatornán.
 	    EXCEPTS  Törli az összes kivételt a csatornán.
+	    INVITES  Clears all invites on the channel.
 	    OPS      Elvesz minden opot a csatornán
 	    HOPS     Eltávolít minden félop csatorna státuszt (+h mód)
 	             az összes csatornán lévõ féloperátortól, ha támogatott.
@@ -5377,7 +5380,7 @@ MEMO_HELP_SET
 	További információért írd be: %R%S HELP SET opció
 	
 MEMO_HELP_SET_NOTIFY
-	Syntax: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Itt tudod beállítani, ha értesítést szeretnél kapni
 	az új üzenetekrõl:
@@ -5387,6 +5390,9 @@ MEMO_HELP_SET_NOTIFY
 	    LOGON   Értesítést kapsz az új üzenetekrõl csatlakozáskor
 	            vagy ha visszajössz /AWAY-ból.
 	    NEW     Csak akkor kapsz értesítést, ha új üzenet érkezett.
+	    MAIL    You will be notified of memos by email aswell as
+	            any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Nem kapsz értesítést az üzeneteidrõl.
 	
 	Az ON ekvivalens a LOGON és a NEW kombinálásával.
@@ -6505,7 +6511,7 @@ HOST_SETALL
 HOST_DELALL
 	A %s csoport vhostja törölve.
 HOST_DELALL_SYNTAX
-	Syntax: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	A %s csoport vhostja erre változott: %s@%s.
 HOST_SET_ERROR
@@ -6537,7 +6543,7 @@ HOST_NOT_REGED
 HOST_DEL
 	%s vhosztja törölve lett.
 HOST_DEL_SYNTAX
-	Szintaktika: %R%s del <nick>.
+	DEL <nick>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -1798,6 +1798,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	Un memo di massa è stato inviato a tutti gli utenti registrati.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | canale}
@@ -1862,7 +1866,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s ti informerà dei nuovi memo quando ti connetti e quando li ricevi.
 MEMO_SET_NOTIFY_LOGON
@@ -2875,6 +2879,8 @@ OPER_JUPE_SYNTAX
 	JUPE nomeserver [motivo]
 OPER_JUPE_HOST_ERROR
 	Prego utilizzare un nome server valido per jupe
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2894,7 +2900,7 @@ OPER_CANNOT_RESTART

 # IGNORE responses
 OPER_IGNORE_SYNTAX
-	Sintassi: IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Devi inserire un numero valido per indicare il tempo.
 OPER_IGNORE_TIME_DONE
@@ -2965,7 +2971,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Sintassi: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	I servizi sono in modalità Defcon, prego riprovare più tardi.
 OPER_DEFCON_NO_CONF
@@ -3218,7 +3224,7 @@ NEWS_RANDOM_TEXT
 	[Messaggio del giorno - %s] %s

 NEWS_LOGON_SYNTAX
-	Sintassi: LOGONNEWS {ADD|DEL|LIST} [testo|numero]
+	LOGONNEWS {ADD|DEL|LIST} [testo|numero]
 NEWS_LOGON_LIST_HEADER
 	Lista delle Logon News:
 NEWS_LOGON_LIST_ENTRY
@@ -3227,13 +3233,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Non c'è nessuna Logon News.
 NEWS_LOGON_ADD_SYNTAX
-	Sintassi: LOGONNEWS ADD testo
+	LOGONNEWS ADD testo
 NEWS_LOGON_ADD_FULL
 	La lista delle news è piena!
 NEWS_LOGON_ADDED
 	Aggiunta una nuova Logon News (numero %d).
 NEWS_LOGON_DEL_SYNTAX
-	Sintassi: LOGONNEWS DEL {numero | ALL}
+	LOGONNEWS DEL {numero | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Impossibile trovare la Logon News numero %d!
 NEWS_LOGON_DELETED
@@ -3270,7 +3276,7 @@ NEWS_OPER_DELETED_ALL
 	Tutte le Oper News sono state eliminate.

 NEWS_RANDOM_SYNTAX
-	Sintassi: RANDOMNEWS {ADD|DEL|LIST} [testo|numero]
+	RANDOMNEWS {ADD|DEL|LIST} [testo|numero]
 NEWS_RANDOM_LIST_HEADER
 	Lista delle Random News:
 NEWS_RANDOM_LIST_ENTRY
@@ -3279,13 +3285,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Non c'è nessuna Random News.
 NEWS_RANDOM_ADD_SYNTAX
-	Sintassi: RANDOMNEWS ADD testo
+	RANDOMNEWS ADD testo
 NEWS_RANDOM_ADD_FULL
 	La lista delle news è piena!
 NEWS_RANDOM_ADDED
 	Aggiunta una nuova Random News (numero %d).
 NEWS_RANDOM_DEL_SYNTAX
-	Sintassi: RANDOMNEWS DEL {numero | ALL}
+	RANDOMNEWS DEL {numero | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Impossibile trovare la Random News numero %d!
 NEWS_RANDOM_DELETED
@@ -4513,13 +4519,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Sintassi: SET canale RESTRICTED {ON | OFF}
 	
-	Attiva o disattiva l'accesso limitato (restricted)
-	per il canale. Quando questa opzione è attiva, gli
-	utenti che non potrebbero avere i privilegi di operatore
-	di canale (gli utenti con livelli di accesso negativi e,
-	se l'opzione secure ops è attiva, tutti gli utenti che
-	non si trovano in alcuna lista di accesso) verrano invece
-	kickati e bannati dal canale.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Sintassi: SET canale SECURE {ON | OFF}
@@ -5126,6 +5128,8 @@ CHAN_HELP_CLEAR
 	     MODES    Annulla tutti i modi di canale (cioè elimina
 	                  i modi i,k,l,m,n,p,s,t).
 	     BANS     Annulla tutti i ban del canale.
+	     EXCEPTS  Clears all excepts on the channel.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Rimuove lo stato di operatore (modo +o) da
 	                  tutti gli operatori del canale.
 	     HOPS     Rimuove lo stato di halfoperator (modo +h) da
@@ -5408,7 +5412,7 @@ MEMO_HELP_SET
 	maggiori informazioni su un'opzione specifica.

 MEMO_HELP_SET_NOTIFY
-	Sintassi: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintassi: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Cambia il modo in cui si verrà informati della ricezione
 	di nuovi memo:
@@ -5420,6 +5424,9 @@ MEMO_HELP_SET_NOTIFY
 	            connette o quando si torna dall'/AWAY.
 	    NEW     Si verrà informati dei nuovi memo solo quando
 	            vengono inviati (se si è online).
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Non si verrà informati in nessun caso della
 	            ricezione dei nuovi memo.
 	
@@ -6569,7 +6576,7 @@ HOST_SETALL
 HOST_DELALL
 	i vhost per il gruppo %s sono stati rimossi.
 HOST_DELALL_SYNTAX
-	Sintassi: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	Il vhost per il gruppo di %s è stato impostato a %s@%s.
 HOST_SET_ERROR
@@ -6601,7 +6608,7 @@ HOST_NOT_REGED
 HOST_DEL
 	Il vhost di %s è stato rimosso.
 HOST_DEL_SYNTAX
-	Sintassi: %R%s del <nick>.
+	DEL <nick>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -1810,11 +1810,13 @@ MEMO_X_HAS_TOO_MANY_MEMOS
 	%s heeft momenteel te veel memo's en kan er geen meer ontvangen.
 MEMO_SENT
 	Memo verstuurd naar %s.
-	
-# CANCEL responses
 MEMO_MASS_SENT
 	Een memo werd gestuurd naar alle geregistreerde gebruikers.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | kanaal}
@@ -1879,7 +1881,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s zal je nu informeren over memo's zodra je inlogt en wanneer deze naar je toe gezonden worden.
 MEMO_SET_NOTIFY_LOGON
@@ -2923,6 +2925,8 @@ OPER_JUPE_SYNTAX
 	JUPE servername [reden]
 OPER_JUPE_HOST_ERROR
 	Gebruik een geldige servernaam bij het jupen
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.

 # RAW responses
 OPER_RAW_SYNTAX
@@ -2942,7 +2946,7 @@ OPER_CANNOT_RESTART

 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Gebruik: IGNORE {ADD|DEL|LIST|CLEAR} [tijd] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [tijd] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Je moet een geldig nummer als tijd invoeren.
 OPER_IGNORE_TIME_DONE
@@ -3024,7 +3028,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Services zijn in Defcon modus. Probeer later opnieuw.
 OPER_DEFCON_NO_CONF
@@ -3287,7 +3291,7 @@ NEWS_RANDOM_TEXT
 	[Willekeurig Nieuws - %s] %s

 NEWS_LOGON_SYNTAX
-	Genbruik: LOGONNEWS {ADD|DEL|LIST} [text|nr]
+	LOGONNEWS {ADD|DEL|LIST} [text|nr]
 NEWS_LOGON_LIST_HEADER
 	Login nieuwsberichten:
 NEWS_LOGON_LIST_ENTRY
@@ -3296,13 +3300,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Er is geen login nieuws.
 NEWS_LOGON_ADD_SYNTAX
-	Gebruik: LOGONNEWS ADD text
+	LOGONNEWS ADD text
 NEWS_LOGON_ADD_FULL
 	Nieuws lijst is vol!
 NEWS_LOGON_ADDED
 	Nieuw login nieuws toegevoegd (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Gebruik: LOGONNEWS DEL {nr | ALL}
+	LOGONNEWS DEL {nr | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Login nieuwsbericht #%d niet gevonden!
 NEWS_LOGON_DELETED
@@ -3339,7 +3343,7 @@ NEWS_OPER_DELETED_ALL
 	Alle oper nieuwsberichten zijn verwijderd.

 NEWS_RANDOM_SYNTAX
-	Gebruik: RANDOMNEWS {ADD|DEL|LIST} [text|nr]
+	RANDOMNEWS {ADD|DEL|LIST} [text|nr]
 NEWS_RANDOM_LIST_HEADER
 	Willekeurige nieuwsberichten:
 NEWS_RANDOM_LIST_ENTRY
@@ -3348,13 +3352,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Er is geen willekeurig nieuws.
 NEWS_RANDOM_ADD_SYNTAX
-	Gebruik: RANDOMNEWS ADD text
+	RANDOMNEWS ADD text
 NEWS_RANDOM_ADD_FULL
 	Nieuwslijst is vol!
 NEWS_RANDOM_ADDED
 	Nieuw willekeurig nieuwsbericht toegevoegd (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Gebruik: RANDOMNEWS DEL {nr | ALL}
+	RANDOMNEWS DEL {nr | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Willekeurig nieuwsbericht #%d niet gevonden!
 NEWS_RANDOM_DELETED
@@ -4267,7 +4271,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4546,12 +4550,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Gebruik: SET kanaal RESTRICTED {ON | OFF}
 	
-	Zet de beperkte toegang optie aan of uit voor een kanaal.
-	Wanneer beperkte toegang aan staat zullen gebruikers die
-	normaliter geen kanaaloperator status mogen hebben (dwz
-	gebruikers met negatieve toegangsniveaus en, als de veilige
-	ops optie aan staat, ook gebruikers die niet op de toegangs-
-	lijst staan) worden gekicked en gebanned van het kanaal.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Gebruik: SET kanaal SECURE {ON | OFF}
@@ -5131,6 +5132,8 @@ CHAN_HELP_CLEAR
 	     MODES    Verwijder alle modes op het kanaal (verwijdert
 	                  modes i,k,l,m,n,p,s,t).
 	     BANS     Verwijder alle bans op het kanaal.
+	     EXCEPTS  Clears all excepts on the channel.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Verwijder kanaal-operator status (mode +o) van
 	                  alle kanaal-operators.
 	     HOPS     Verwijder kanaal-halfoperator status (mode +h)
@@ -5396,7 +5399,7 @@ MEMO_HELP_SET
 	een specifieke optie.

 MEMO_HELP_SET_NOTIFY
-	Gebruik: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Gebruik: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Verandert wanneer je geinformeerd zal worden over nieuwe memo's:
 	
@@ -5407,6 +5410,9 @@ MEMO_HELP_SET_NOTIFY
 	               of wanneer je terugkomt van /AWAY.
 	    NEW     Je wordt alleen geinformeerd over memo's wanner ze
 	               naar je worden verstuurd.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Je zal geen informaties over memo's ontvangen.
 	
 	ON is wezenlijk LOGON en NEW gecombineerd.
@@ -6530,7 +6536,7 @@ HOST_SETALL
 HOST_DELALL
 	vhosts voor group %s zijn verwijderd.
 HOST_DELALL_SYNTAX
-	Gebruik: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost voor groep %s gezet op %s@%s.
 HOST_SET_ERROR
@@ -6562,7 +6568,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost voor %s verwijderd.
 HOST_DEL_SYNTAX
-	Gebruik: %R%s del <nick>.
+	DEL <nick>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -2376,6 +2376,9 @@ MEMO_SENT
 MEMO_MASS_SENT
 	Wiadomo¶æ zosta³a wys³ana do wszystkich zarejestrowanych u¿ytkowników.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text

 # CANCEL responses
 MEMO_CANCEL_SYNTAX
@@ -2464,7 +2467,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | MAIL | OFF }
+	SET NOTIFY {ON | LOGON | NEW | MAIL | MAIL | NOMAIL | OFF }

 MEMO_SET_NOTIFY_ON
 	%s powiadomi Ciê o wiadomo¶ciach podczas logowania i w momencie ich nadej¶cia.
@@ -3865,6 +3868,8 @@ OPER_JUPE_SYNTAX

 OPER_JUPE_HOST_ERROR
 	Proszê u¿yæ prawid³owej nazwy serwera.
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.

 # RAW responses
 OPER_RAW_SYNTAX
@@ -3885,7 +3890,7 @@ OPER_CANNOT_RESTART

 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Sk³adnia: IGNORE {ADD|DEL|LIST|CLEAR} [czas] [nick | maska]
+	IGNORE {ADD|DEL|LIST|CLEAR} [czas] [nick | maska]

 OPER_IGNORE_VALID_TIME
 	Musisz podaæ prawid³ow± liczbê dla czasu.
@@ -3977,7 +3982,7 @@ OPER_STAFF_AFORMAT

 # DefCon Messages
 OPER_DEFCON_SYNTAX
-	Sk³adnia: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]

 OPER_DEFCON_DENIED
 	Serwisy s± w trybie defcon, spróbuj ponownie pó¼niej.
@@ -4269,7 +4274,7 @@ NEWS_RANDOM_TEXT
 	[Losowa wiadomo¶æ - %s] %s

 NEWS_LOGON_SYNTAX
-	Sk³adnia: LOGONNEWS {ADD|DEL|LIST} [tekst|numer]
+	LOGONNEWS {ADD|DEL|LIST} [tekst|numer]

 NEWS_LOGON_LIST_HEADER
 	Wiadomo¶ci powitalne:
@@ -4291,7 +4296,7 @@ NEWS_LOGON_ADDED
 	Dodano now± wiadomo¶æ powitaln± (#%d).

 NEWS_LOGON_DEL_SYNTAX
-	Sk³adnia: LOGONNEWS DEL {numer | ALL}
+	LOGONNEWS DEL {numer | ALL}

 NEWS_LOGON_DEL_NOT_FOUND
 	Wiadomo¶æ powitalna #%d nie zosta³a znaleziona!
@@ -4343,7 +4348,7 @@ NEWS_OPER_DELETED_ALL
 	Wszystkie wiadomo¶ci dla operatorów zosta³y skasowane.

 NEWS_RANDOM_SYNTAX
-	Sk³adnia: RANDOMNEWS {ADD|DEL|LIST} [tekst|numer]
+	RANDOMNEWS {ADD|DEL|LIST} [tekst|numer]

 NEWS_RANDOM_LIST_HEADER
 	Losowe wiadomo¶ci:
@@ -4356,7 +4361,7 @@ NEWS_RANDOM_LIST_NONE
 	Nie ma losowych wiadomo¶ci.

 NEWS_RANDOM_ADD_SYNTAX
-	Sk³adnia: RANDOMNEWS ADD tekst
+	RANDOMNEWS ADD tekst

 NEWS_RANDOM_ADD_FULL
 	Lista wiadomo¶ci jest pe³na!
@@ -4365,7 +4370,7 @@ NEWS_RANDOM_ADDED
 	Dodano now± losow± wiadomo¶æ (#%d).

 NEWS_RANDOM_DEL_SYNTAX
-	Sk³adnia: RANDOMNEWS DEL {numer | ALL}
+	RANDOMNEWS DEL {numer | ALL}

 NEWS_RANDOM_DEL_NOT_FOUND
 	Losowa wiadomo¶æ #%d nie zosta³a znaleziona!
@@ -5307,7 +5312,7 @@ CHAN_HELP_CMD_INFO
 	    INFO        Pokazuje informacje o zarejestrowanym kanale

 CHAN_HELP_CMD_INVITE
-	    INVITE      Zaprasza Ciebie lub wskazany nick na kana³
+	    INVITE     Tells ChanServ to invite you into a channel

 CHAN_HELP_CMD_KICK
 	    KICK        Wyrzuca wskazany nick z kana³u
@@ -5593,12 +5598,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Sk³adnia: SET kana³ RESTRICTED {ON | OFF}
 	
-	W³±cza lub wy³±cza ograniczenie dostêpu do kana³u.
-	W³±czenie tej opcji powoduje usuwanie z kana³u
-	u¿ytkowników, którzy nie maj± uprawnieñ operatora.
-	Przy w³±czonej opcji secure ops u¿ytkownicy bez
-	zdefiniowanego poziomu dostêpu oraz z ujemnym poziomem
-	tak¿e bêd± usuwani.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Sk³adnia: SET kana³ SECURE {ON | OFF}
@@ -6225,6 +6227,7 @@ CHAN_HELP_CLEAR
 	   MODES     Zdejmuje wszystkie tryby z kana³u
 	   BANS      Zdejmuje wszystkie bany na kanale
 	   EXCEPTS   Zdejmuje wyj±tki od banów na kanale
+	   INVITES   Clears all invites on the channel.
 	   OPS       Odbiera wszystkim status operatora
 	   HOPS      Odbiera wszystkim status pó³-operatora
 	   VOICES    Odbiera wszystkim prawo g³osu
@@ -6495,7 +6498,7 @@ MEMO_HELP_SET
 	%R%S HELP SET opcja

 MEMO_HELP_SET_NOTIFY
-	Sk³adnia: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sk³adnia: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Ustala sposób wys³ania powiadomieñ o nowych wiadomo¶ciach:
 	
@@ -6508,6 +6511,9 @@ MEMO_HELP_SET_NOTIFY
 	           trybu /AWAY.
 	   NEW     Powiadomienie bêdzie wysy³ane jedynie w 
 	           momencie otrzymania wiadomo¶ci.
+	   MAIL    You will be notified of memos by email aswell as
+	           any other settings you have.
+	   NOMAIL  You will not be notified of memos by email.
 	   OFF     Powiadomienia nie bêd± wysy³ane.
 	
 	Opcja ON jest kombinacj± opcji LOGON oraz NEW.
@@ -7575,7 +7581,7 @@ HOST_DELALL
 	Vhosty dla grupy %s zosta³y usuniête.

 HOST_DELALL_SYNTAX
-	Sk³adnia: DELALL <nick>.
+	DELALL <nick>.

 HOST_IDENT_SETALL
 	Vhosty dla grupy %s zosta³y zmienione na %s@%s.
@@ -7623,7 +7629,7 @@ HOST_DEL
 	Vhost dla %s zosta³ usuniêty.

 HOST_DEL_SYNTAX
-	Sk³adnia: %R%s DEL <nick>.
+	DEL <nick>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -1808,6 +1808,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	Uma mensagem global foi enviada a todos os usuários registrados.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | canal}
@@ -1872,7 +1876,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s irá agora notificá-lo de novos memos quando você conectar, quando eles lhe forem enviados ou quando desativar o /AWAY.
 MEMO_SET_NOTIFY_LOGON
@@ -2887,6 +2891,8 @@ OPER_JUPE_SYNTAX
 	JUPE servidor [motivo]
 OPER_JUPE_HOST_ERROR
 	Por favor, use um nome de servidor válido quando estiver "jupando".
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2906,7 +2912,7 @@ OPER_CANNOT_RESTART

 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Sintaxe: IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Você precisa digitar um número válido como tempo.
 OPER_IGNORE_TIME_DONE
@@ -2978,7 +2984,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Sintaxe: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Este serviço está temporariamente desabilitado, por favor tente novamente mais tarde
 OPER_DEFCON_NO_CONF
@@ -4219,7 +4225,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Mostra informações sobre algum canal registrado
 CHAN_HELP_CMD_INVITE
-	    INVITE     Pede ao ChanServ para convidar você ou um nick fornecido para um canal
+	    INVITE     Tells ChanServ to invite you into a channel
 CHAN_HELP_CMD_KICK
 	    KICK       Kicka (expulsa) um nick de um canal
 CHAN_HELP_CMD_LIST
@@ -4495,12 +4501,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Sintaxe: SET canal RESTRICTED {ON|OFF}
 	
-	Ativa ou desativa a opção de acesso restrito para um canal.
-	Quando o acesso restrito estiver ativado, usuários que
-	normalmente não possuem privilegios de OP no canal
-	(usuários com nível negativo de acesso e, se secure ops
-	estiver ativado, usuários que não pertencem à lista de
-	acesso) serão imediatamente kickados e banidos do canal.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Sintaxe: SET canal SECURE {ON|OFF}
@@ -5075,6 +5078,7 @@ CHAN_HELP_CLEAR
 	                travados com MLOCK.
 	     BANS     Remove todos os bans do canal.
 	     EXCEPTS  Remove todos os excepts do canal.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Remove o status de Operador de canal (modo +o)
 	                de todos os Operadores do canal.
 	     HOPS     Remove o status de Half-Operador de canal (modo +h)
@@ -5348,7 +5352,7 @@ MEMO_HELP_SET
 	uma opção específica.

 MEMO_HELP_SET_NOTIFY
-	Sintaxe: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintaxe: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Altera quando você será notificado sobre novas mensagens:
 	
@@ -5359,6 +5363,9 @@ MEMO_HELP_SET_NOTIFY
 	                conectar ou quando voltar de um /AWAY.
 	    NEW     Você só será notificado sobre mensagens quando elas
 	                forem enviadas a você.
+	    MAIL    You will be notified of memos by email aswell as
+	                any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Você não receberá nenhuma notificação sobre mensagens.
 	
 	ON é essencialmente a combinação de LOGON e NEW.
@@ -6494,7 +6501,7 @@ HOST_SETALL
 HOST_DELALL
 	vhosts do grupo %s foi removido.
 HOST_DELALL_SYNTAX
-	Sintaxe: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost do grupo %s ajustado para %s@%s.
 HOST_SET_ERROR
@@ -6526,7 +6533,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost para %s removido.
 HOST_DEL_SYNTAX
-	Sintaxe: %R%s del <nick>.
+	DEL <nick>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -1785,6 +1785,10 @@ MEMO_SENT
 	Ìåìî-ñîîáùåíèå äëÿ %s óñïåøíî îòïðàâëåíî.
 MEMO_MASS_SENT
 	Ìàññîâîå ñîîáùåíèå óñïåøíî îòïðàâëåíî âñåì çàðåãèñòðèðîâàííûì ïîëüçîâàòåëÿì.
+	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text

 # CANCEL responses
 MEMO_CANCEL_SYNTAX
@@ -1850,7 +1854,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	Ñ ýòîãî ìîìåíòà, %s áóäåò óâåäîìëÿòü âàñ î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå èäåíòèôèêàöèè ê íèêó èëè ïðè ïîñòóïëåíèè íîâûõ ñîîáùåíèé.
 MEMO_SET_NOTIFY_LOGON
@@ -2858,6 +2862,8 @@ OPER_JUPE_SYNTAX
 	JUPE èìÿ_ñåðâåðà [ïðè÷èíà]
 OPER_JUPE_HOST_ERROR
 	Â êà÷åñòâå îñíîâíîãî ïàðàìåòðà âû äîëæíû óêàçàòü ðåàëüíîå èìÿ ñåðåâåðà 
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.

 # RAW responses
 OPER_RAW_SYNTAX
@@ -2877,7 +2883,7 @@ OPER_CANNOT_RESTART

 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Ñèíòàêñòñ: IGNORE {ADD|DEL|LIST|CLEAR} [âðåìÿ] [íèê]
+	IGNORE {ADD|DEL|LIST|CLEAR} [âðåìÿ] [íèê]
 OPER_IGNORE_VALID_TIME
 	Çíà÷åíèå ïàðàìåòðà "âðåìÿ" óêàçàíî íå âåðíî.
 OPER_IGNORE_TIME_DONE
@@ -2947,7 +2953,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Ñèíòàêñèñ: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	Íà äàííûé ìîìåíò ñåðâèñû ðàáîòàþò â DEFCON-ðåæèìå. Ïîâòîðèòå ñâîé çàïðîñ ïîçæå.
 OPER_DEFCON_NO_CONF
@@ -3206,7 +3212,7 @@ NEWS_RANDOM_TEXT
 	[Ñëó÷àéíàÿ íîâîñòü - %s] %s

 NEWS_LOGON_SYNTAX
-	Ñèíòàêñèñ: LOGONNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]
+	LOGONNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]
 NEWS_LOGON_LIST_HEADER
 	Òåêóùèå ñïèñîê íîâîñòåé:
 NEWS_LOGON_LIST_ENTRY
@@ -3215,13 +3221,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Ñïèñîê íîâîñòåé ïóñò.
 NEWS_LOGON_ADD_SYNTAX
-	Ñèíòàêñèñ: LOGONNEWS ADD òåêñò
+	LOGONNEWS ADD òåêñò
 NEWS_LOGON_ADD_FULL
 	Ñïèñîê íîâîñòåé ïåðåïîëíåí.
 NEWS_LOGON_ADDED
 	Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåð: #%d
 NEWS_LOGON_DEL_SYNTAX
-	Ñèíòàêñèñ: LOGONNEWS DEL {íîìåð | ALL}
+	LOGONNEWS DEL {íîìåð | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Íîâîñòü ïîä íîìåðîì #%d íå îáíàðóæåíà.
 NEWS_LOGON_DELETED
@@ -3258,7 +3264,7 @@ NEWS_OPER_DELETED_ALL
 	Ñïèñîê íîâîñòåé äëÿ îïåðàòîðîâ ïîëíîñòüþ î÷èùåí.

 NEWS_RANDOM_SYNTAX
-	Ñèíòàêñèñ: RANDOMNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]
+	RANDOMNEWS {ADD|DEL|LIST} [òåêñò|íîìåð]
 NEWS_RANDOM_LIST_HEADER
 	Ñïèñîê ñëó÷àéíûõ íîâîñòåé:
 NEWS_RANDOM_LIST_ENTRY
@@ -3267,13 +3273,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïóñò.
 NEWS_RANDOM_ADD_SYNTAX
-	Ñèíòàêñèñ: RANDOMNEWS ADD òåêñò
+	RANDOMNEWS ADD òåêñò
 NEWS_RANDOM_ADD_FULL
 	Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïåðåïîëíåí.
 NEWS_RANDOM_ADDED
 	Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåð: #%d
 NEWS_RANDOM_DEL_SYNTAX
-	Ñèíòàêñèñ: RANDOMNEWS DEL {íîìåð | ALL}
+	RANDOMNEWS DEL {íîìåð | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	Íîâîñòü ïîä íîìåðîì #%d íå îáíàðóæåíà.
 NEWS_RANDOM_DELETED
@@ -4245,7 +4251,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Çàïðîñ èíôîðìàöèè îá óêàçàííîì êàíàëå
 CHAN_HELP_CMD_INVITE
-	    INVITE     Çàñòàâëÿåò ñåðâèñû ïðèãëàñèòü âàñ íà óêàçàííûé êàíàë.
+	    INVITE     Tells ChanServ to invite you into a channel
 CHAN_HELP_CMD_KICK
 	    KICK       Âûêèäûâàåò óêàçàííîãî ïîëüçîâàòåëÿ ñ êàíàëà
 CHAN_HELP_CMD_LIST
@@ -4525,9 +4531,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Ñèíòàêñèñ: SET #êàíàë RESTRICTED {ON | OFF}
 	
-	Àêòèâèðóåò/äåàêòèâèðóåò îãðàíè÷åííûé äîñòóï íà êàíàë. Äàííûé ðåæèì
-	ïîçâîëÿåò  çàïðåòèòü äîñòóï íà êàíàë âñåì òåì ïîëüçîâàòåëÿì, êîòîðûå
-	íå ÷èñëÿòñÿ â ñïèñêå äîñòóïà êàíàëà.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Ñèíòàêñèñ: SET #êàíàë SECURE {ON | OFF}
@@ -5409,7 +5415,7 @@ MEMO_HELP_SET
 	êîìàíäîé %R%S HELP SET îïöèÿ.

 MEMO_HELP_SET_NOTIFY
-	Ñèíòàêñèñ: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Ñèíòàêñèñ: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Äàííàÿ îïöèÿ ïîçâîëÿåò íàñòðîèòü âàø ëè÷íûé ìåòîä óâåäîìëåíèÿ î
 	íîâûõ ñîîáùåíèÿõ, ïîñëàííûõ âàì êåì-ëèáî.
@@ -5423,6 +5429,9 @@ MEMO_HELP_SET_NOTIFY
 	            /AWAY (îòîøåë).
 	    NEW     óâåäîìëåíèå áóäåò ïîñòóïàòü ñðàçó, êàê òîëüêî êòî-òî
 	            îòïðàâèò âàì íîâîå ñîîáùåíèå.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     óâåäîìëåíèé î ïîëó÷åíèè íîâûõ ñîîáùåíèé ïîñòóïàòü
 	            íå áóäåò
 	
@@ -6632,7 +6641,7 @@ HOST_SETALL
 HOST_DELALL
 	Âñå âèðòóàëüíûå õîñòû äëÿ ãðóïïû %s áûëè óäàëåíû.
 HOST_DELALL_SYNTAX
-	Ñèíòàêñèñ: DELALL <íèê>.
+	DELALL <íèê>.
 HOST_IDENT_SETALL
 	Âèðòóàëüíûé õîñò äëÿ ãðóïïû %s óñòàíîâëåí â %s@%s.
 HOST_SET_ERROR
@@ -6664,7 +6673,7 @@ HOST_NOT_REGED
 HOST_DEL
 	Âèðòóàëüíûé õîñò äëÿ %s óäàëåí.
 HOST_DEL_SYNTAX
-	Ñèíòàêñèñ: %R%s del <íèê>.
+	DEL <íèê>.
 HOST_OFF
 	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
@@ -1818,6 +1818,10 @@ MEMO_SENT
 MEMO_MASS_SENT
 	A massmemo has been sent to all registered users.
 	
+# STAFF responses
+MEMO_STAFF_SYNTAX
+	STAFF memo-text
+	
 # CANCEL responses
 MEMO_CANCEL_SYNTAX
 	CANCEL {nick | kanaladý}
@@ -1884,7 +1888,7 @@ MEMO_SET_UNKNOWN_OPTION

 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s sizi yeni mesajlar için baðlandýðýnýzda veya mesajlar size gönderildiði anda uyaracak.
 MEMO_SET_NOTIFY_LOGON
@@ -2946,6 +2950,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 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.
 	
 # RAW responses
 OPER_RAW_SYNTAX
@@ -2965,7 +2971,7 @@ OPER_CANNOT_RESTART

 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
+	IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -3057,7 +3063,7 @@ OPER_STAFF_AFORMAT
 # DefCon Messages

 OPER_DEFCON_SYNTAX
-	Syntax: DEFCON [1|2|3|4|5]
+	DEFCON [1|2|3|4|5]
 OPER_DEFCON_DENIED
 	This service is temporarly disabled, please try again later
 OPER_DEFCON_NO_CONF
@@ -3328,7 +3334,7 @@ NEWS_RANDOM_TEXT
 	[Karisik Haberler - %s] %s

 NEWS_LOGON_SYNTAX
-	Kullanýmý: LOGONNEWS {ADD|DEL|LIST} [yazý|num]
+	LOGONNEWS {ADD|DEL|LIST} [yazý|num]
 NEWS_LOGON_LIST_HEADER
 	Baðlantý haberleri:
 NEWS_LOGON_LIST_ENTRY
@@ -3337,13 +3343,13 @@ NEWS_LOGON_LIST_ENTRY
 NEWS_LOGON_LIST_NONE
 	Hiç baðlantý haberi yok.
 NEWS_LOGON_ADD_SYNTAX
-	Kullanýmý: LOGONNEWS ADD yazý
+	LOGONNEWS ADD yazý
 NEWS_LOGON_ADD_FULL
 	Haber listesi dolu!
 NEWS_LOGON_ADDED
 	Yeni baðlantý haberleri maddesi eklendi (#%d).
 NEWS_LOGON_DEL_SYNTAX
-	Kullanýmý: LOGONNEWS DEL {num | ALL}
+	LOGONNEWS DEL {num | ALL}
 NEWS_LOGON_DEL_NOT_FOUND
 	Baðlantý haberleri maddesi #%d bulunamadý!
 NEWS_LOGON_DELETED
@@ -3380,7 +3386,7 @@ NEWS_OPER_DELETED_ALL
 	Tüm operatör haberleri maddeleri silindi.

 NEWS_RANDOM_SYNTAX
-	Kullanýmý: RANDOMNEWS {ADD|DEL|LIST} [yazi|no]
+	RANDOMNEWS {ADD|DEL|LIST} [yazi|no]
 NEWS_RANDOM_LIST_HEADER
 	Karisik haberler:
 NEWS_RANDOM_LIST_ENTRY
@@ -3389,13 +3395,13 @@ NEWS_RANDOM_LIST_ENTRY
 NEWS_RANDOM_LIST_NONE
 	Hiç karisik haber yok.
 NEWS_RANDOM_ADD_SYNTAX
-	Kullanýmý: RANDOMNEWS ADD yazi
+	RANDOMNEWS ADD yazi
 NEWS_RANDOM_ADD_FULL
 	Haber listesi dolu!
 NEWS_RANDOM_ADDED
 	Yeni karisik haber eklendi (#%d).
 NEWS_RANDOM_DEL_SYNTAX
-	Kullanýmý: RANDOMNEWS DEL {no | ALL}
+	RANDOMNEWS DEL {no | ALL}
 NEWS_RANDOM_DEL_NOT_FOUND
 	#%d numarali karisik haber bulunamadi!
 NEWS_RANDOM_DELETED
@@ -4330,7 +4336,7 @@ CHAN_HELP_CMD_GETKEY
 CHAN_HELP_CMD_INFO
 	    INFO       Lists information about the named registered channel
 CHAN_HELP_CMD_INVITE
-	    INVITE     Tells ChanServ to invite you or a given nick into a channel
+	    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
@@ -4591,11 +4597,9 @@ CHAN_HELP_SET_PRIVATE
 CHAN_HELP_SET_RESTRICTED
 	Kullanýmý: SET kanaladý RESTRICTED {ON | OFF}
 	
-	Bir kanal için izinli giriþ özelliðini açar yada kapatýr.
-	izinli giriþ özelliði aktifse, kanal opu özelliði olmayan
-	kullanýcýlar(negatif access seviyesi olanlar, secure ops
-	özelliði aktif olanlar, ve access listesinde olmayan 
-	kullanýcýlar) kanaldan atýlýp banlanýrlar.
+	Enables or disables the restricted access option for a
+	channel.  When restricted access is set, users not on
+	the access list will instead be kicked and banned from the channel.

 CHAN_HELP_SET_SECURE
 	Kullanýmý: SET kanaladý SECURE {ON | OFF}
@@ -5132,6 +5136,7 @@ CHAN_HELP_CLEAR
 	                   modlarýný temizler).
 	     BANS     Kanaldaki tüm banlarý kaldýrýr.
 	     EXCEPTS  Clears all excepts on the channel.
+	     INVITES  Clears all invites on the channel.
 	     OPS      Kanal opu statüsünde olanlarýn (mode +o)
 	                  oplarýný alýr.
 	     HOPS     Removes channel-halfoperator status (mode +h) from
@@ -5397,7 +5402,7 @@ MEMO_HELP_SET
 	%R%S HELP SET özellik yazýn.

 MEMO_HELP_SET_NOTIFY
-	Kullanýmý: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Kullanýmý: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Yeni mesajlarda ne zaman uyarýlacaðýnýzý belirler:
 	
@@ -5408,6 +5413,9 @@ MEMO_HELP_SET_NOTIFY
 	               dönüþte uyarýlýrsýnýz.
 	    NEW     Yeni mesajlar için sadece size gönderildikleri 
 	               anda uyarýlýrsýnýz.
+	    MAIL    You will be notified of memos by email aswell as
+	                any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Yeni mesajlar için herhangi bir uyarý almazsýnýz.
 	
 	ON parametresi LOGON ve NEW 'in kombinasyonudur
@@ -6523,7 +6531,7 @@ HOST_SETALL
 HOST_DELALL
 	vhosts for group %s have been removed.
 HOST_DELALL_SYNTAX
-	Syntax: DELALL <nick>.
+	DELALL <nick>.
 HOST_IDENT_SETALL
 	vhost for group %s set to %s@%s.
 HOST_SET_ERROR
@@ -6555,7 +6563,7 @@ HOST_NOT_REGED
 HOST_DEL
 	vhost for %s removed.
 HOST_DEL_SYNTAX
-	Syntax: %R%s del <nick>.
+	DEL <nick>.

 ###########################################################################
 #
@@ -134,6 +134,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
    int16 cstatus = 0;
    char *cmd;
    UserData *ud;
+    int was_action = 0;

    if (!u || !buf || !ci) {
        return;
@@ -148,8 +149,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
     * at the end, because one character just doesn't matter,
     * but the ACTION may create strange behaviours with the
     * caps or badwords kickers */
-    if (!strnicmp(buf, "\1ACTION ", 8))
+    if (!strnicmp(buf, "\1ACTION ", 8)) {
        buf += 8;
+        was_action = 1;
+    }

    /* Now we can make kicker stuff. We try to order the checks
     * from the fastest one to the slowest one, since there's
@@ -410,7 +413,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)

    /* Fantaisist commands */

-    if (buf && (ci->botflags & BS_FANTASY) && *buf == *BSFantasyCharacter) {
+    if (buf && (ci->botflags & BS_FANTASY) && *buf == *BSFantasyCharacter && !was_action) {
        cmd = strtok(buf, " ");

        if (cmd && (cmd[0] == *BSFantasyCharacter)) {
@@ -302,6 +302,11 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
        }
    }

+    /* Don't bounce modes from u:lined clients or servers, bug #1004. */
+    user = finduser(source);
+    if ((user && is_ulined(user->server->name)) || is_ulined((char *)source))
+        return;
+
    if (check > 0) {
        check_modes(chan);

@@ -312,12 +317,12 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
            real_ac--;
            real_av++;
            for (i = 0; i < real_ac; i++) {
-				if ((user = finduser(*real_av)) && is_on_chan(chan, user)) {
-					if (check < 2)
-						chan_set_correct_modes(user, chan, 0);
-					else if ((chan->ci->flags) && (chan->ci->flags & CI_SECUREOPS))
-						chan_set_correct_modes(user, chan, 0);
-				}
+                if ((user = finduser(*real_av)) && is_on_chan(chan, user)) {
+                    if (check < 2)
+                        chan_set_correct_modes(user, chan, 0);
+                    else if ((chan->ci->flags) && (chan->ci->flags & CI_SECUREOPS))
+                        chan_set_correct_modes(user, chan, 0);
+                }
                real_av++;
            }
        }
@@ -1823,7 +1828,7 @@ Channel *join_user_update(User * user, Channel * chan, char *name,
 		chan = chan_create(name, chants);
 	else
 	{
-		// Check chants against 0, as not every ircd sends JOIN with a TS.
+		/* Check chants against 0, as not every ircd sends JOIN with a TS. */
 		if (chan->creation_time > chants && chants != 0)
 		{
 			struct c_userlist *cu;
@@ -1499,6 +1499,12 @@ int check_kick(User * user, char *chan, time_t chants)
    if (user->isSuperAdmin == 1)
        return 0;

+    /* We don't enforce services restrictions on clients on ulined services 
+     * as this will likely lead to kick/rejoin floods. ~ Viper */
+    if (is_ulined(user->server->name)) {
+        return 0;
+    }
+
    if (ci->flags & CI_VERBOTEN) {
        get_idealban(ci, user, mask, sizeof(mask));
        reason =
@@ -1552,10 +1558,6 @@ int check_kick(User * user, char *chan, time_t chants)
        }
    }

-    if (is_ulined(user->server->name)) {
-        return 0;
-    }
-
    if (check_access(user, ci, CA_NOJOIN)) {
        get_idealban(ci, user, mask, sizeof(mask));
        reason = getstring(user->na, CHAN_NOT_ALLOWED_TO_JOIN);
@@ -74,12 +74,12 @@ int do_act(User * u)
        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
    else if (ci->flags & CI_VERBOTEN)
        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+    else if (!check_access(u, ci, CA_SAY))
+        notice_lang(s_BotServ, u, ACCESS_DENIED);
    else if (!ci->bi)
        notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
    else if (!ci->c || ci->c->usercount < BSMinUsers)
        notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
-    else if (!check_access(u, ci, CA_SAY))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
    else {
        strnrepl(text, BUFSIZE, "\001", "");
        anope_cmd_action(ci->bi->nick, ci->name, "%s", text);
@@ -80,13 +80,13 @@ int do_assign(User * u)
        notice_lang(s_BotServ, u, PERMISSION_DENIED);
    else if (!(ci = cs_findchan(chan)))
        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+    else if ((ci->botflags & BS_NOBOT)
+             || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
+        notice_lang(s_BotServ, u, PERMISSION_DENIED);
    else if (ci->flags & CI_VERBOTEN)
        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
    else if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
        notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
-    else if ((ci->botflags & BS_NOBOT)
-             || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
-        notice_lang(s_BotServ, u, PERMISSION_DENIED);
    else {
        if (ci->bi)
            unassign(u, ci);
@@ -76,12 +76,12 @@ int do_say(User * u)
        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
    else if (ci->flags & CI_VERBOTEN)
        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if (!check_access(u, ci, CA_SAY))
+        notice_lang(s_BotServ, u, ACCESS_DENIED);
    else if (!ci->bi)
        notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
    else if (!ci->c || ci->c->usercount < BSMinUsers)
        notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
-    else if (!check_access(u, ci, CA_SAY))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
    else {
        if (text[0] != '\001') {
            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", text);
@@ -185,7 +185,8 @@ int do_set(User * u)
    if (!param && (!cmd || (stricmp(cmd, "SUCCESSOR") != 0 &&
                            stricmp(cmd, "URL") != 0 &&
                            stricmp(cmd, "EMAIL") != 0 &&
-                            stricmp(cmd, "ENTRYMSG") != 0))) {
+                            stricmp(cmd, "ENTRYMSG") != 0 &&
+                            stricmp(cmd, "MLOCK") != 0))) {
        syntax_error(s_ChanServ, u, "SET", CHAN_SET_SYNTAX);
    } else if (!(ci = cs_findchan(chan))) {
        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
@@ -492,7 +493,7 @@ int do_set_mlock(User * u, ChannelInfo * ci, char *param)
        ci->mlock_redirect = NULL;
    }

-    while ((mode = *param++)) {
+    while (param && (mode = *param++)) {
        switch (mode) {
        case '+':
            add = 1;
@@ -85,7 +85,7 @@ int do_del(User * u)
            notice_lang(s_HostServ, u, HOST_NOREG, nick);
        }
    } else {
-        notice_lang(s_HostServ, u, HOST_DEL_SYNTAX, s_HostServ);
+    	syntax_error(s_HostServ, u, "DEL", HOST_DEL_SYNTAX);
    }
    return MOD_CONT;
 }
@@ -74,7 +74,7 @@ int do_delall(User * u)
    NickAlias *na;
    NickCore *nc;
    if (!nick) {
-        notice_lang(s_HostServ, u, HOST_DELALL_SYNTAX, s_HostServ);
+    	syntax_error(s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX);
        return MOD_CONT;
    }
    if ((na = findnick(nick))) {
@@ -132,7 +132,7 @@ int do_set_notify(User * u, MemoInfo * mi, char *param)
        u->na->nc->flags &= ~NI_MEMO_MAIL;
        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL);
    } else if (stricmp(param, "OFF") == 0) {
-        u->na->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE);
+        u->na->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE | NI_MEMO_MAIL);
        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_OFF, s_MemoServ);
    } else {
        syntax_error(s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX);
@@ -79,7 +79,7 @@ int do_staff(User * u)
        notice_lang(s_MemoServ, u, OPER_DEFCON_DENIED);
        return MOD_CONT;
    } else if (text == NULL) {
-        syntax_error(s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX);
+        syntax_error(s_MemoServ, u, "STAFF", MEMO_STAFF_SYNTAX);
        return MOD_CONT;
    }

@@ -73,6 +73,7 @@ int do_logout(User * u)
 {
    char *nick = strtok(NULL, " ");
    char *param = strtok(NULL, " ");
+    struct u_chaninfolist *ci, *ci2;
    User *u2;

    if (!is_services_admin(u) && nick) {
@@ -111,14 +112,23 @@ int do_logout(User * u)
        else
            notice_lang(s_NickServ, u, NICK_LOGOUT_SUCCEEDED);

+        /* remove founderstatus from this user in all channels */
+        ci = u2->founder_chans;
+        while (ci) {
+           ci2 = ci->next;
+           free(ci);
+           ci = ci2;
+       }
+       u2->founder_chans = NULL;
+
+
        /* Stop nick tracking if enabled */
        if (NSNickTracking)
-			/* Shouldn't this be u2? -GD */
-            nsStopNickTracking(u);
+            nsStopNickTracking(u2);

        /* Clear any timers again */
-        if (u->na->nc->flags & NI_KILLPROTECT) {
-            del_ns_timeout(u->na, TO_COLLIDE);
+        if (u2->na->nc->flags & NI_KILLPROTECT) {
+            del_ns_timeout(u2->na, TO_COLLIDE);
        }
 		
 		/* Send out an event */
@@ -124,9 +124,15 @@ int do_recover(User * u)
    } else {
        if (group_identified(u, na->nc)
            || (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
+            char relstr[192];
+
            notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW);
            collide(na, 0);
-            notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick);
+
+            /* Convert NSReleaseTimeout second to string format */
+            duration(u2->na, relstr, sizeof(relstr), NSReleaseTimeout);
+
+            notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr);
        } else {
            notice_lang(s_NickServ, u, ACCESS_DENIED);
        }
@@ -75,6 +75,7 @@ void myNickServHelp(User * u)
 int do_suspend(User * u)
 {
    NickAlias *na, *na2;
+    User *u2;
    char *nick = strtok(NULL, " ");
    char *reason = strtok(NULL, "");
    int i;
@@ -114,7 +115,18 @@ int do_suspend(User * u)
            na2 = na->nc->aliases.list[i];
            if (na2->nc == na->nc) {
                na2->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED);
+		if (na2->last_quit)
+			free(na2->last_quit);
                na2->last_quit = sstrdup(reason);
+                /* remove nicktracking */
+                if ((u2 = finduser(na2->nick))) {
+                    if (u2->nickTrack) {
+                        free(u2->nickTrack);
+                        u2->nickTrack = NULL;
+                    }
+                }
+                /* force guestnick */
+                collide(na2, 0);
            }
        }

@@ -73,8 +73,7 @@ int do_nickupdate(User * u)
        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
    } else {
        na = u->na;
-        if (NSModeOnID)
-            do_setmodes(u);
+        do_setmodes(u);
        check_memos(u);
        if (na->last_realname)
            free(na->last_realname);
@@ -96,7 +96,7 @@ int do_defcon(User * u)
    }
    newLevel = atoi(lvl);
    if (newLevel < 1 || newLevel > 5) {
-        notice_lang(s_OperServ, u, OPER_DEFCON_SYNTAX);
+	syntax_error(s_OperServ, u, "DEFCON", OPER_DEFCON_SYNTAX);
        return MOD_CONT;
    }
    DefConLevel = newLevel;
@@ -72,7 +72,7 @@ int do_ignoreuser(User * u)
    int t;

    if (!cmd) {
-        notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+    	syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
        return MOD_CONT;
    }

@@ -82,10 +82,10 @@ int do_ignoreuser(User * u)
        char *rest = strtok(NULL, "");

        if (!nick) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+	    syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
            return MOD_CONT;
        } else if (!time) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+	    syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
            return MOD_CONT;
        } else {
            t = dotime(time);
@@ -108,7 +108,7 @@ int do_ignoreuser(User * u)
    } else if (!stricmp(cmd, "DEL")) {
        char *nick = strtok(NULL, " ");
        if (!nick) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+	    syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
        } else {
            if (delete_ignore(nick)) {
                notice_lang(s_OperServ, u, OPER_IGNORE_DEL_DONE, nick);
@@ -121,7 +121,7 @@ int do_ignoreuser(User * u)
        notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED);
        return MOD_CONT;
    } else
-        notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+    	syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);

    return MOD_CONT;
 }
@@ -74,8 +74,11 @@ int do_jupe(User * u)
    if (!jserver) {
        syntax_error(s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX);
    } else {
+		Server *server = findserver(servlist, jserver);
        if (!isValidHost(jserver, 3)) {
            notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR);
+		} else if (server && ((server->flags & SERVER_ISME) || (server->flags & SERVER_ISUPLINK))) {
+			notice_lang(s_OperServ, u, OPER_JUPE_INVALID_SERVER);
        } else {
            anope_cmd_jupe(jserver, u->nick, reason);

@@ -560,6 +560,9 @@ int main(int ac, char **av, char **envp)
    }
 #endif

+    /* Clean out the module runtime directory prior to running, just in case files were left behind on a previous run */
+    ModuleRunTimeDirCleanUp();
+
    /* General initialization first */
    if ((i = init_primary(ac, av)) != 0)
        return i;
@@ -33,7 +33,14 @@ int m_away(char *source, char *msg)
 {
    User *u;

-    u = finduser(source);
+    /* When using TS6, we get a UID. ~ Viper */
+    if (UseTS6 && ircd->ts6) {
+        u = find_byuid(source);
+        if (!u)
+            u = finduser(source);
+    } else {
+        u = finduser(source);
+    }

    if (u && msg == 0)          /* un-away */
        check_memos(u);
@@ -66,18 +73,25 @@ int m_kill(char *nick, char *msg)

 int m_time(char *source, int ac, char **av)
 {
+    User *u;
    time_t t;
    struct tm *tm;
    char buf[64];

-    if (!source) {
-        return MOD_CONT;
+    /* When using TS6, we get a UID. ~ Viper */
+    if (UseTS6 && ircd->ts6) {
+        u = find_byuid(source);
+        if (!u)
+            u = finduser(source);
+    } else {
+        u = finduser(source);
    }
+    if (!u) return MOD_CONT;

    time(&t);
    tm = localtime(&t);
    strftime(buf, sizeof(buf), "%a %b %d %H:%M:%S %Y %Z", tm);
-    anope_cmd_391(source, buf);
+    anope_cmd_391(u->nick, buf);
    return MOD_CONT;
 }

@@ -85,24 +99,31 @@ int m_time(char *source, int ac, char **av)

 int m_motd(char *source)
 {
+    User *u;
    FILE *f;
    char buf[BUFSIZE];

-    if (!source) {
-        return MOD_CONT;
+    /* When using TS6, we get a UID. ~ Viper */
+    if (UseTS6 && ircd->ts6) {
+        u = find_byuid(source);
+        if (!u)
+            u = finduser(source);
+    } else {
+        u = finduser(source);
    }
+    if (!u) return MOD_CONT;

    f = fopen(MOTDFilename, "r");
    if (f) {
-        anope_cmd_375(source);
+        anope_cmd_375(u->nick);
        while (fgets(buf, sizeof(buf), f)) {
            buf[strlen(buf) - 1] = 0;
-            anope_cmd_372(source, buf);
+            anope_cmd_372(u->nick, buf);
        }
        fclose(f);
-        anope_cmd_376(source);
+        anope_cmd_376(u->nick);
    } else {
-        anope_cmd_372_error(source);
+        anope_cmd_372_error(u->nick);
    }
    return MOD_CONT;
 }
@@ -122,6 +143,7 @@ int m_privmsg(char *source, char *receiver, char *msg)
        return MOD_CONT;
    }

+    /* We always get the nick.. the protocol module translates for us.. ~ Viper */
    u = finduser(source);

    if (!u) {
@@ -143,8 +165,8 @@ int m_privmsg(char *source, char *receiver, char *msg)
        if (allow_ignore && !is_oper(u)) {
            IgnoreData *ign = get_ignore(source);
            if (ign) {
-				target = myStrGetToken(msg, ' ', 0);
-				alog("Ignored message from %s to %s using command %s", source, receiver, target);
+                target = myStrGetToken(msg, ' ', 0);
+                alog("Ignored message from %s to %s using command %s", source, receiver, target);
                free(target);
                return MOD_CONT;
            }
@@ -238,78 +260,82 @@ int m_stats(char *source, int ac, char **av)
    if (ac < 1)
        return MOD_CONT;

+    /* When using TS6, we get a UID. ~ Viper */
+    if (UseTS6 && ircd->ts6) {
+        u = find_byuid(source);
+        if (!u)
+            u = finduser(source);
+    } else {
+        u = finduser(source);
+    }
+    if (!u) return MOD_CONT;
+
    switch (*av[0]) {
    case 'l':
-        u = finduser(source);
-
-        if (u && is_oper(u)) {
-
+        if (is_oper(u)) {
            if (servernum == 1) {
                anope_cmd_211
                    ("%s Server SendBuf SentBytes SentMsgs RecvBuf "
-                     "RecvBytes RecvMsgs ConnTime", source);
-                anope_cmd_211("%s %s %d %d %d %d %d %d %ld", source,
+                     "RecvBytes RecvMsgs ConnTime", u->nick);
+                anope_cmd_211("%s %s %d %d %d %d %d %d %ld", u->nick,
                              RemoteServer, write_buffer_len(),
                              total_written, -1, read_buffer_len(),
                              total_read, -1, time(NULL) - start_time);
            } else if (servernum == 2) {
                anope_cmd_211
                    ("%s Server SendBuf SentBytes SentMsgs RecvBuf "
-                     "RecvBytes RecvMsgs ConnTime", source);
-                anope_cmd_211("%s %s %d %d %d %d %d %d %ld", source,
+                     "RecvBytes RecvMsgs ConnTime", u->nick);
+                anope_cmd_211("%s %s %d %d %d %d %d %d %ld", u->nick,
                              RemoteServer2, write_buffer_len(),
                              total_written, -1, read_buffer_len(),
                              total_read, -1, time(NULL) - start_time);
            } else if (servernum == 3) {
                anope_cmd_211
                    ("%s Server SendBuf SentBytes SentMsgs RecvBuf "
-                     "RecvBytes RecvMsgs ConnTime", source);
-                anope_cmd_211("%s %s %d %d %d %d %d %d %ld", source,
+                     "RecvBytes RecvMsgs ConnTime", u->nick);
+                anope_cmd_211("%s %s %d %d %d %d %d %d %ld", u->nick,
                              RemoteServer3, write_buffer_len(),
                              total_written, -1, read_buffer_len(),
                              total_read, -1, time(NULL) - start_time);
            }
        }

-        anope_cmd_219(source, av[0]);
+        anope_cmd_219(u->nick, av[0]);
        break;
    case 'o':
    case 'O':
-/* Check whether the user is an operator */
-        u = finduser(source);
-        if (u && !is_oper(u) && HideStatsO) {
-            anope_cmd_219(source, av[0]);
+        /* Check whether the user is an operator */
+        if (!is_oper(u) && HideStatsO) {
+            anope_cmd_219(u->nick, av[0]);
        } else {
            for (i = 0; i < RootNumber; i++)
-                anope_cmd_243("%s O * * %s Root 0", source,
-                              ServicesRoots[i]);
+                anope_cmd_243("%s O * * %s Root 0", u->nick, ServicesRoots[i]);
            for (i = 0; i < servadmins.count && (nc = servadmins.list[i]);
                 i++)
-                anope_cmd_243("%s O * * %s Admin 0", source, nc->display);
+                anope_cmd_243("%s O * * %s Admin 0", u->nick, nc->display);
            for (i = 0; i < servopers.count && (nc = servopers.list[i]);
                 i++)
-                anope_cmd_243("%s O * * %s Oper 0", source, nc->display);
+                anope_cmd_243("%s O * * %s Oper 0", u->nick, nc->display);

-            anope_cmd_219(source, av[0]);
+            anope_cmd_219(u->nick, av[0]);
        }
-
        break;

    case 'u':{
            int uptime = time(NULL) - start_time;
            anope_cmd_242("%s :Services up %d day%s, %02d:%02d:%02d",
-                          source, uptime / 86400,
+                          u->nick, uptime / 86400,
                          (uptime / 86400 == 1) ? "" : "s",
                          (uptime / 3600) % 24, (uptime / 60) % 60,
                          uptime % 60);
            anope_cmd_250("%s :Current users: %d (%d ops); maximum %d",
-                          source, usercnt, opcnt, maxusercnt);
-            anope_cmd_219(source, av[0]);
+                          u->nick, usercnt, opcnt, maxusercnt);
+            anope_cmd_219(u->nick, av[0]);
            break;
        }                       /* case 'u' */

    default:
-        anope_cmd_219(source, av[0]);
+        anope_cmd_219(u->nick, av[0]);
        break;
    }
    return MOD_CONT;
@@ -319,9 +345,19 @@ int m_stats(char *source, int ac, char **av)

 int m_version(char *source, int ac, char **av)
 {
-    if (source) {
-        anope_cmd_351(source);
+    User *u; 
+
+    /* When using TS6, we get a UID. ~ Viper */
+    if (UseTS6 && ircd->ts6) {
+        u = find_byuid(source);
+        if (!u)
+            u = finduser(source);
+    } else {
+        u = finduser(source);
    }
+    if (!u) return MOD_CONT;
+
+    anope_cmd_351(u->nick);
    return MOD_CONT;
 }

@@ -330,11 +366,22 @@ int m_version(char *source, int ac, char **av)

 int m_whois(char *source, char *who)
 {
+    User *u; 
    BotInfo *bi;
    NickAlias *na;
    const char *clientdesc;

-    if (source && who) {
+    /* When using TS6, we get a UID. ~ Viper */
+    if (UseTS6 && ircd->ts6) {
+        u = find_byuid(source);
+        if (!u)
+            u = finduser(source);
+    } else {
+        u = finduser(source);
+    }
+    if (!u) return MOD_CONT;
+
+    if (who) {
        if (stricmp(who, s_NickServ) == 0)
            clientdesc = desc_NickServ;
        else if (stricmp(who, s_ChanServ) == 0)
@@ -355,15 +402,15 @@ int m_whois(char *source, char *who)
            clientdesc = desc_DevNull;
        else if (s_BotServ && (bi = findbot(who))) {
            /* Bots are handled separately */
-            anope_cmd_311("%s %s %s %s * :%s", source, bi->nick,
+            anope_cmd_311("%s %s %s %s * :%s", u->nick, bi->nick,
                          bi->user, bi->host, bi->real);
-            anope_cmd_307("%s %s :is a registered nick", source, bi->nick);
-            anope_cmd_312("%s %s %s :%s", source, bi->nick, ServerName,
+            anope_cmd_307("%s %s :is a registered nick", u->nick, bi->nick);
+            anope_cmd_312("%s %s %s :%s", u->nick, bi->nick, ServerName,
                          ServerDesc);
            anope_cmd_317("%s %s %ld %ld :seconds idle, signon time",
-                          source, bi->nick, time(NULL) - bi->lastmsg,
+                          u->nick, bi->nick, time(NULL) - bi->lastmsg,
                          start_time);
-            anope_cmd_318(source, bi->nick);
+            anope_cmd_318(u->nick, bi->nick);
            return MOD_CONT;
        } else if (!(ircd->svshold && UseSVSHOLD) && (na = findnick(who))
                   && (na->status & NS_KILL_HELD)) {
@@ -371,22 +418,22 @@ int m_whois(char *source, char *who)
             * We can't just say it doesn't exist here, even tho it does for
             * other servers :) -GD
             */
-            anope_cmd_311("%s %s %s %s * :Services Enforcer", source,
+            anope_cmd_311("%s %s %s %s * :Services Enforcer", u->nick,
                          na->nick, NSEnforcerUser, NSEnforcerHost);
-            anope_cmd_312("%s %s %s :%s", source, na->nick, ServerName,
+            anope_cmd_312("%s %s %s :%s", u->nick, na->nick, ServerName,
                          ServerDesc);
-            anope_cmd_318(source, na->nick);
+            anope_cmd_318(u->nick, na->nick);
            return MOD_CONT;
        } else {
-            anope_cmd_401(source, who);
+            anope_cmd_401(u->nick, who);
            return MOD_CONT;
        }
-        anope_cmd_311("%s %s %s %s * :%s", source, who,
+        anope_cmd_311("%s %s %s %s * :%s", u->nick, who,
                      ServiceUser, ServiceHost, clientdesc);
-        anope_cmd_312("%s %s %s :%s", source, who, ServerName, ServerDesc);
-        anope_cmd_317("%s %s %ld %ld :seconds idle, signon time", source,
+        anope_cmd_312("%s %s %s :%s", u->nick, who, ServerName, ServerDesc);
+        anope_cmd_317("%s %s %ld %ld :seconds idle, signon time", u->nick,
                      who, time(NULL) - start_time, start_time);
-        anope_cmd_318(source, who);
+        anope_cmd_318(u->nick, who);
    }
    return MOD_CONT;
 }
@@ -250,6 +250,10 @@ char *db_mysql_secure(char *pass, int size)
 {
    char tmp_pass[PASSMAX];
    char *str, *tmp;
+    unsigned bufsize = (2 * PASSMAX + 15);
+
+    if (MysqlSecure)
+    	bufsize += strlen(MysqlSecure);

    /* Initialize the buffer. Bug #86 */
    memset(tmp_pass, 0, PASSMAX);
@@ -258,26 +262,26 @@ char *db_mysql_secure(char *pass, int size)
    if (!pass)
        return NULL;

-    str = scalloc(2 * PASSMAX + 15, sizeof(char));
+    str = scalloc(bufsize, sizeof(char));
    if (enc_decrypt(pass, tmp_pass, PASSMAX - 1) != 1) {
        /* We couldnt decrypt the pass... */
        /* Make sure the hash is MySQL safe.. */
        tmp = db_mysql_quote_buffer(pass, size);
-        snprintf(str, 2 * PASSMAX + 15, "'%s'", tmp);
+        snprintf(str, bufsize, "'%s'", tmp);
        free(tmp);
    } else {                    /* if we could decrypt the pass */
        /* Make sure the pass itself pass is MySQL safe.. */
        tmp = db_mysql_quote_buffer(tmp_pass, strlen(tmp_pass));
        if ((!MysqlSecure) || (strcmp(MysqlSecure, "") == 0)) {
-            snprintf(str, 2 * PASSMAX + 15, "'%s'", tmp);
+            snprintf(str, bufsize, "'%s'", tmp);
        } else if (strcmp(MysqlSecure, "des") == 0) {
-            snprintf(str, 2 * PASSMAX + 15, "ENCRYPT('%s')", tmp);
+            snprintf(str, bufsize, "ENCRYPT('%s')", tmp);
        } else if (strcmp(MysqlSecure, "md5") == 0) {
-            snprintf(str, 2 * PASSMAX + 15, "MD5('%s')", tmp);
+            snprintf(str, bufsize, "MD5('%s')", tmp);
        } else if (strcmp(MysqlSecure, "sha") == 0) {
-            snprintf(str, 2 * PASSMAX + 15, "SHA('%s')", tmp);
+            snprintf(str, bufsize, "SHA('%s')", tmp);
        } else {
-            snprintf(str, 2 * PASSMAX + 15, "ENCODE('%s','%s')", tmp, MysqlSecure);
+            snprintf(str, bufsize, "ENCODE('%s','%s')", tmp, MysqlSecure);
        }
        free(tmp);
    }
@@ -1,6 +1,6 @@
 include ../../Makefile.inc.win32

-SRCS=bahamut.c charybdis.c dreamforge.c hybrid.c inspircd10.c inspircd11.c plexus2.c plexus3.c ptlink.c rageircd.c \
+SRCS=bahamut.c charybdis.c dreamforge.c hybrid.c inspircd11.c plexus2.c plexus3.c ptlink.c rageircd.c \
     ratbox.c shadowircd.c solidircd.c ultimate2.c ultimate3.c unreal31.c unreal32.c viagra.c

 OBJECTS= $(SRCS:.c=.dll)
@@ -1398,7 +1398,7 @@ void charybdis_cmd_mode(char *source, char *dest, char *buf)
        send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "MODE %s %s",
                 dest, buf);
    } else {
-        send_cmd(source, "MODE %s %s", dest, buf);
+        send_cmd(NULL, "MODE %s %s", dest, buf);
    }
 }

@@ -1,133 +0,0 @@
-/* inspircd beta 6 functions
- *
- * (C) 2003-2009 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for furhter details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
- *
- */
-
-/*************************************************************************/
-
-#define UMODE_a 0x00000001
-#define UMODE_h 0x00000002
-#define UMODE_i 0x00000004
-#define UMODE_o 0x00000008
-#define UMODE_r 0x00000010
-#define UMODE_w 0x00000020
-#define UMODE_A 0x00000040
-#define UMODE_g 0x80000000
-#define UMODE_x 0x40000000
-
-#define CMODE_i 0x00000001
-#define CMODE_m 0x00000002
-#define CMODE_n 0x00000004
-#define CMODE_p 0x00000008
-#define CMODE_s 0x00000010
-#define CMODE_t 0x00000020
-#define CMODE_k 0x00000040		/* These two used only by ChanServ */
-#define CMODE_l 0x00000080
-#define CMODE_c 0x00000400
-#define CMODE_A 0x00000800
-#define CMODE_H 0x00001000
-#define CMODE_K 0x00002000
-#define CMODE_L 0x00004000
-#define CMODE_O 0x00008000
-#define CMODE_Q 0x00010000
-#define CMODE_S 0x00020000
-#define CMODE_V 0x00040000
-#define CMODE_f 0x00080000
-#define CMODE_G 0x00100000
-#define CMODE_C 0x00200000
-#define CMODE_u 0x00400000
-#define CMODE_z 0x00800000
-#define CMODE_N 0x01000000
-#define CMODE_R 0x00000100		/* Only identified users can join */
-#define CMODE_r 0x00000200		/* Set for all registered channels */
-
-#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
-
-void inspircd_set_umode(User * user, int ac, char **av);
-void inspircd_cmd_svsnoop(char *server, int set);
-void inspircd_cmd_remove_akill(char *user, char *host);
-void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when);
-void inspircd_cmd_vhost_off(User * u);
-void inspircd_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason);
-void inspircd_cmd_svskill(char *source, char *user, char *buf);
-void inspircd_cmd_svsmode(User * u, int ac, char **av);
-void inspircd_cmd_372(char *source, char *msg);
-void inspircd_cmd_372_error(char *source);
-void inspircd_cmd_375(char *source);
-void inspircd_cmd_376(char *source);
-void inspircd_cmd_nick(char *nick, char *name, char *modes);
-void inspircd_cmd_guest_nick(char *nick, char *user, char *host, char *real, char *modes);
-void inspircd_cmd_mode(char *source, char *dest, char *buf);
-void inspircd_cmd_bot_nick(char *nick, char *user, char *host, char *real, char *modes);
-void inspircd_cmd_kick(char *source, char *chan, char *user, char *buf);
-void inspircd_cmd_notice_ops(char *source, char *dest, char *buf);
-void inspircd_cmd_notice(char *source, char *dest, char *buf);
-void inspircd_cmd_notice2(char *source, char *dest, char *msg);
-void inspircd_cmd_privmsg(char *source, char *dest, char *buf);
-void inspircd_cmd_privmsg2(char *source, char *dest, char *msg);
-void inspircd_cmd_serv_notice(char *source, char *dest, char *msg);
-void inspircd_cmd_serv_privmsg(char *source, char *dest, char *msg);
-void inspircd_cmd_bot_chan_mode(char *nick, char *chan);
-void inspircd_cmd_351(char *source);
-void inspircd_cmd_quit(char *source, char *buf);
-void inspircd_cmd_pong(char *servname, char *who);
-void inspircd_cmd_join(char *user, char *channel, time_t chantime);
-void inspircd_cmd_unsqline(char *user);
-void inspircd_cmd_invite(char *source, char *chan, char *nick);
-void inspircd_cmd_part(char *nick, char *chan, char *buf);
-void inspircd_cmd_391(char *source, char *timestr);
-void inspircd_cmd_250(char *buf);
-void inspircd_cmd_307(char *buf);
-void inspircd_cmd_311(char *buf);
-void inspircd_cmd_312(char *buf);
-void inspircd_cmd_317(char *buf);
-void inspircd_cmd_219(char *source, char *letter);
-void inspircd_cmd_401(char *source, char *who);
-void inspircd_cmd_318(char *source, char *who);
-void inspircd_cmd_242(char *buf);
-void inspircd_cmd_243(char *buf);
-void inspircd_cmd_211(char *buf);
-void inspircd_cmd_global(char *source, char *buf);
-void inspircd_cmd_global_legacy(char *source, char *fmt);
-void inspircd_cmd_sqline(char *mask, char *reason);
-void inspircd_cmd_squit(char *servname, char *message);
-void inspircd_cmd_svso(char *source, char *nick, char *flag);
-void inspircd_cmd_chg_nick(char *oldnick, char *newnick);
-void inspircd_cmd_svsnick(char *source, char *guest, time_t when);
-void inspircd_cmd_vhost_on(char *nick, char *vIdent, char *vhost);
-void inspircd_cmd_connect(int servernum);
-void inspircd_cmd_svshold(char *nick);
-void inspircd_cmd_release_svshold(char *nick);
-void inspircd_cmd_unsgline(char *mask);
-void inspircd_cmd_unszline(char *mask);
-void inspircd_cmd_szline(char *mask, char *reason, char *whom);
-void inspircd_cmd_sgline(char *mask, char *reason);
-void inspircd_cmd_unban(char *name, char *nick);
-void inspircd_cmd_svsmode_chan(char *name, char *mode, char *nick);
-void inspircd_cmd_svid_umode(char *nick, time_t ts);
-void inspircd_cmd_nc_change(User * u);
-void inspircd_cmd_svid_umode2(User * u, char *ts);
-void inspircd_cmd_svid_umode3(User * u, char *ts);
-void inspircd_cmd_eob();
-int inspircd_flood_mode_check(char *value);
-void inspircd_cmd_jupe(char *jserver, char *who, char *reason);
-int inspircd_valid_nick(char *nick);
-void inspircd_cmd_ctcp(char *source, char *dest, char *buf);
-int anope_event_fjoin(char *source, int ac, char **av);
-int anope_event_fmode(char *source, int ac, char **av);
-int anope_event_ftopic(char *source, int ac, char **av);
-int anope_event_sanick(char *source, int ac, char **av);
-int anope_event_samode(char *source, int ac, char **av);
-int anope_event_sajoin(char *source, int ac, char **av);
-int anope_event_sapart(char *source, int ac, char **av);
-int anope_event_version(char *source, int ac, char **av);
-int anope_event_opertype(char *source, int ac, char **av);
-int anope_event_idle(char* source, int ac, char **av);
@@ -551,7 +551,13 @@ inspircd_cmd_topic(char *whosets, char *chan, char *whosetit,

 void inspircd_cmd_vhost_off(User * u)
 {
-    send_cmd(s_HostServ, "MODE %s -x", u->nick);
+	 send_cmd(s_OperServ,  "MODE %s -%s",  u->nick,  myIrcd->vhostchar);
+	 inspircd_cmd_chghost(u->nick, u->host);
+
+	 if (has_chgidentmod && u->username && u->vident && strcmp(u->username, u->vident) > 0)
+	 {
+		 inspircd_cmd_chgident(u->nick, u->username);
+	 }
 }

 void
@@ -1812,7 +1818,8 @@ void inspircd_cmd_ctcp(char *source, char *dest, char *buf)
 int inspircd_jointhrottle_mode_check(char *value)
 {
    char *tempValue, *one, *two;
-    int param1, param2;
+    int param1 = 0;
+    int param2 = 0;

    if (!value)
        return 0;
@@ -118,6 +118,8 @@ void inspircd_cmd_nc_change(User * u);
 void inspircd_cmd_svid_umode2(User * u, char *ts);
 void inspircd_cmd_svid_umode3(User * u, char *ts);
 void inspircd_cmd_eob();
+void inspircd_cmd_chghost(char *nick, char *vhost);
+void inspircd_cmd_chgident(char *nick, char *vIdent);
 int inspircd_flood_mode_check(char *value);
 void inspircd_cmd_jupe(char *jserver, char *who, char *reason);
 int inspircd_valid_nick(char *nick);
@@ -155,8 +155,10 @@ Server *new_server(Server * uplink, const char *name, const char *desc,
        uplink->links = serv;
    }
    /* Check if this is our uplink server */
-    if ((uplink == me_server) && !(flags & SERVER_JUPED))
+	if ((uplink == me_server) && !(flags & SERVER_JUPED)) {
        serv_uplink = serv;
+		serv->flags |= SERVER_ISUPLINK;
+	}

    /* Write the StartGlobal (to non-juped servers) */
    if (GlobalOnCycle && GlobalOnCycleUP && !(flags & SERVER_JUPED))
@@ -7,12 +7,50 @@

 VERSION_MAJOR="1"
 VERSION_MINOR="8"
-VERSION_PATCH="0"
+VERSION_PATCH="2"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2182"
+VERSION_BUILD="2370"

-# $Log$ # Changes since 1.8.0 Release
+# $Log$ # Changes since 1.8.2 Release

+# Leading up to 1.8.2 Release
+#Revision 2364 - Fix a crash when mysql is used without MysqlSecure defined. Thanks to jerrcs for finding and testing.
+#Revision 2362 - Fix unsetting founder_chans when logging out other users
+
+# Leading up to 1.8.1 Release
+#Revision 2337 - Fixed several bugs in messages.c regarding parsing TS6 encoded commands. This is a prerequisite for an InspIRCd 1.2 protocol module.
+#Revision 2329 - Update to allow windows build to function with the removal of inspircd10.c
+#Revision 2327 - Fix memory leak in NS SUSPEND, patch by Adam.
+#Revision 2325 - Added a few missing entries to Changes.
+#Revision 2322 - Bugfix for bug #1082, remove check for NSModeOnID from NS UPDATE, it's not logical to check for NSModeOnID since you must be identified to use NS UPDATE anyways.
+#Revision 2321 - Fix potential crash in Charybdis protocol module, patch by Adam.
+#Revision 2316 - Change default of UnRestrictSAdmin to enabled, so hopefully we get less users complaining about their +a being removed and being unable to use /sa* commands.
+#Revision 2307 - [#1081] - Fixing CS HELP output to not imply you can invite anyone bar yourself into a channel.
+#Revision 2301 - Change sizeof() to strlen() in db_mysql_secure(), patch by DukePyrolator.
+#Revision 2299 - Fix bug #1078, MySQL query should no longer fail when password and salt are too long, patch from Adam.
+#Revision 2297 - Patch to allow jupe on all bar uplink and self. Thanks Adam. (Bug #1076)
+#Revision 2294 - Fix link to Link Block Generator on our site. Good find whoever it was :)
+#Revision 2293 - Patch from DukeP - founderstatus (gained by /cs identify) is not removed on logout, and on remote logout the nicktracking and the timers are removed from the wrong user (u instead of u2). Cheers! :)
+#Revision 2289 - Backport from 1.9 to document the use of /ms set notify mail and nomail (Adam)
+#Revision 2287 - Patch to rectify Syntax output from langfiles and update certain modules to use syntax_error rather than notice_lang. (Adam)
+#Revision 2284 - Don't enfoce akick/forbidden/etc.. settings on clients on ulined servers.
+#Revision 2272 - Backport of r2271, remove files from the modules runtime directory on startup, just in case files were left behind during a previous run.
+#Revision 2262 - Patch to update documentation on CS RESTRICTED to reflect historical behaviour.
+#Revision 2253 - Backport of bugfix for bug #1004 from SVN r2003, Modechanges from ulined server are no longer being blocked by SECUREOPS.
+#Revision 2251 - Fixed non-standard C-style comment.
+#Revision 2250 - Updated example.conf regarding removal of the inspirc10 protocol module and SRA requirement for SuperAdmin.
+#Revision 2249 - Someone seems to have forgotten about Changes.. added most significant commits to Changes.
+#Revision 2245 - Backport of bugfix for bug #1050 from SVN r2163, patch from Adam, MS STAFF's syntax shows correctly, required adding a language string as well, currently they are all English until they can be properly translated.
+#Revision 2240 - Fix compile error with inspircd11 module.
+#Revision 2221 - Modified patch to change vhost removal to work correctly in all cases, originally by Szymek.
+#Revision 2220 - Correctly initialise variables in jointhrottle check, noted by Szymek.
+#Revision 2219 - Remove insp1.0 protocol modules. 1.0 has been unsupported by upstream for a very long time, and they contain a number of bugs since fixed in the 1.1 module.
+#Revision 2218 - Backport of bugfix for bug #1073 from SVN r2217, fantasy commands in CTCP ACTIONS will now be ignored instead of processed.
+#Revision 2199 - Correct backport of bug #1064, patch from DukePyrolator, there is no nc on the User struct in 1.8.x, use nickTrack instead, oops.
+#Revision 2196 - Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be.
+#Revision 2193 - Backport of bugfix for bug #1065 from SVN r2192, original patch from DukePyrolator, force a user off a nick when it is suspended.
+#Revision 2189 - Backport of bugfix for bug #1064 from SVN r2188, original patch from DukePyrolator, fixes NS RECOVER so it doesn't display "(null)" in some places.
+#Revision 2187 - Backport of bugfix for bug #1062 from SVN r2185 and 2186, patch from Adam, BS ASSIGN, BS ACT, and BS SAY should no longer send revealing error messages to users without access.
 #Revision 2182 - Fix memleak in channels.c from DukePyrolator. (Same fix applied to 1.9 earlier). Thanks DP!
 #Revision 2181 - Backport of bugfix for bug #1043 from SVN r2178, patch from Adam, CS LIST will no longer show suspended channels to normal users.
 #Revision 2180 - Backport of bugfix for bug #1030 from SVN r2179, patch from Adam, deleting from the channel access list now logs a message about the deleted items.
Author	SHA1	Message	Date
sjaz	f2598bdb6e	Initialise 1.8.2-SVN and update README. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2371 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-11 12:52:18 +00:00
adam-	101fe6882d	Added ChanServ HELP CLEAR INVITES to documentation git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2365 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-10 05:32:13 +00:00
adam-	a30afed7b2	Fix a crash when mysql is used without MysqlSecure defined. Thanks to jerrcs for finding and testing git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2364 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-07 21:02:38 +00:00
adam-	feedbd6b0d	Fix unsetting founder_chans when logging out other users git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2362 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-06 16:03:48 +00:00
DukePyrolator	05bc74d9cb	updated german language file. thanks to Han` git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2360 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-05 15:13:55 +00:00
sjaz	e0cc7a6c0b	Initialise 1.8.1 SVN git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2359 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-04 13:41:09 +00:00
sjaz	2fdcb30beb	Anope 1.8.1 Release git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2357 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-04 12:28:19 +00:00
sjaz	feff8c1fb1	Small amendment to version.log to complete a few missing entries. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2356 5417fbe8-f217-4b02-8779-1006273d7864	2009-07-04 12:26:52 +00:00
jantje_85	ea05ff108a	Fixed several bugs in messages.c regarding parsing TS6 encoded commands. This is a prerequisite for an InspIRCd 1.2 protocol module. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2337 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-26 19:18:30 +00:00
sjaz	bcae4f00e1	Update to allow windows build to function with the removal of inspircd10.c git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2329 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-20 19:54:44 +00:00
cyberbotx	01f65c7e64	Fix memory leak in NS SUSPEND, patch by Adam. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2327 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-15 20:28:57 +00:00
jantje_85	958521b8c6	Added a few missing entries to Changes. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2325 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-15 10:55:05 +00:00
cyberbotx	06d5233502	Bugfix for bug #1082 , remove check for NSModeOnID from NS UPDATE, it's not logical to check for NSModeOnID since you must be identified to use NS UPDATE anyways. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2322 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-12 03:11:18 +00:00
cyberbotx	a4b40f6f67	Fix potential crash in Charybdis protocol module, patch by Adam. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2321 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-11 21:41:08 +00:00
cyberbotx	1d4f61e089	Change default of UnRestrictSAdmin to be enabled, so hopefully we get less users complaining about their +a being removed and being unable to use /sa* commands. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2316 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-10 05:38:11 +00:00
sjaz	8ff16f17cc	Fix to fix the broken langfiles in my last commit. Langfiles 1 - Me 0 (Spaces != Tab) git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2308 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-02 21:29:46 +00:00
sjaz	2bb115f6e4	[#1081 ] - Fixing CS HELP output to not imply you can invite anyone bar yourself into a channel. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2307 5417fbe8-f217-4b02-8779-1006273d7864	2009-06-02 21:20:26 +00:00
cyberbotx	e46b0f0ccd	Change sizeof() to strlen() in db_mysql_secure(), patch by DukePyrolator. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2301 5417fbe8-f217-4b02-8779-1006273d7864	2009-05-17 05:57:08 +00:00
cyberbotx	572d1a94bd	Fix bug #1078 , MySQL query should no longer fail when password and salt are too long, patch from Adam. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2299 5417fbe8-f217-4b02-8779-1006273d7864	2009-05-10 23:01:07 +00:00
sjaz	9210aae6f9	Patch to allow jupe on all bar uplink and self. Thanks Adam. (Bug #1076 ) git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2297 5417fbe8-f217-4b02-8779-1006273d7864	2009-05-08 15:10:05 +00:00
sjaz	d4b6968108	Fix link to Link Block Generator on our site. Good find whoever it was :) git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2294 5417fbe8-f217-4b02-8779-1006273d7864	2009-05-07 17:33:53 +00:00
sjaz	672acf306f	Patch from DukeP - founderstatus (gained by /cs identify) is not removed on logout, and on remote logout the nicktracking and the timers are removed from the wrong user (u instead of u2). Cheers! :) git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2293 5417fbe8-f217-4b02-8779-1006273d7864	2009-05-06 07:52:57 +00:00
sjaz	a408ceee74	Backport from 1.9 to document the use of /ms set notify mail and nomail (Adam) git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2289 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-26 16:37:38 +00:00
sjaz	55a564a0b4	Patch to rectify Syntax output from langfiles and update certain modules to use syntax_error rather than notice_lang. (Adam) git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2287 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-22 18:10:38 +00:00
jantje_85	027567b4b0	Don't enfoce akick/forbidden/etc.. settings on clients on ulined servers. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2284 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-17 22:39:18 +00:00
cyberbotx	25e81f6ea9	Backport of r2271, remove files from the modules runtime directory on startup, just in case files were left behind during a previous run. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2272 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-11 06:57:52 +00:00
sjaz	ea090fae8d	[#1039 ] Patch to update documentation on CS RESTRICTED to reflect historical behaviour. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2262 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-06 16:30:34 +00:00
jantje_85	74c5d989bc	Backport of bugfix for bug #1004 from SVN r2003, Modechanges from ulined server are no longer being blocked by SECUREOPS. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2253 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-03 19:45:24 +00:00
jantje_85	1dec3ee8fb	Fixed non-standard C-style comment. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2251 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-03 18:25:20 +00:00
jantje_85	446a6f6ea5	Updated example.conf regarding removal of the inspirc10 protocol module and SRA requirement for SuperAdmin. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2250 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-03 18:13:37 +00:00
jantje_85	9d89891a90	Someone seems to have forgotten about Changes.. added most significant commits to Changes. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2249 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-03 18:07:13 +00:00
cyberbotx	1cbfdac929	Backport of bugfix for bug #1050 from SVN r2163, patch from Adam, MS STAFF's syntax shows correctly, required adding a language string as well, currently they are all English until they can be properly translated. Also update version.log with previous 4 revisions as well. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2245 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-03 02:57:40 +00:00
cyberbotx	49d1d9e79b	Fix compile error with inspircd11 module. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2240 5417fbe8-f217-4b02-8779-1006273d7864	2009-04-02 22:51:21 +00:00
rburchell	eb4510946f	Modified patch to change vhost removal to work correctly in all cases, originally by Szymek. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2221 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-30 09:47:20 +00:00
rburchell	104b52b06e	Correctly initialise variables in jointhrottle check, noted by Szymek. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2220 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-30 09:46:36 +00:00
rburchell	697f535f8b	Remove insp1.0 protocol modules. 1.0 has been unsupported by upstream for a very long time, and they contain a number of bugs since fixed in the 1.1 module. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2219 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-30 09:46:08 +00:00
cyberbotx	35ca9adc25	Backport of bugfix for bug #1073 from SVN r2217, fantasy commands in CTCP ACTIONs will now be ignored instead of processed. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2218 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-30 06:17:26 +00:00
cyberbotx	8f3958d0f4	Correct backport of bug #1065 , patch from DukePyrolator, there is no nc on the User struct in 1.8.x, use nickTrack instead, oops. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2199 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-23 17:05:52 +00:00
cyberbotx	57fb28e70a	Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2196 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-23 04:57:15 +00:00
cyberbotx	1ba8e796c7	Backport of bugfix for buf #1065 from SVN r2192, original patch from DukePyrolator, force a user off a nick when it is suspended. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2193 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-23 02:54:46 +00:00
cyberbotx	645c224ff7	Backport of bugfix for bug #1064 from SVN r2188, original patch from DukePyrolator, fixes NS RECOVER so it doesn't display "(null)" in some places. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2189 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-23 00:46:53 +00:00
cyberbotx	66a9b8605f	Backport of bugfix for bug #1062 from SVN r2185 and 2186, patch from Adam, BS ASSIGN, BS ACT, and BS SAY should no longer send error messags to users without access. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2187 5417fbe8-f217-4b02-8779-1006273d7864	2009-03-23 00:35:45 +00:00