Removed channel passwords and added /chanserv QOP command to add additional channel founders, aswell as access level 10000

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2599 5417fbe8-f217-4b02-8779-1006273d7864

36 files changed, 1279 insertions, 2267 deletions

diff --git a/Changes.lang b/Changes.lang
index c5f1a5f69..2d7840c00 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -2,10 +2,65 @@ Anope Version 1.9.2
 --------------------
 *** New Strings:
     NICK_HELP_CONFIRM_OPER
+    CHAN_QOP_DISABLED
+    CHAN_QOP_NICKS_ONLY
+    CHAN_QOP_ADDED
+    CHAN_QOP_MOVED
+    CHAN_QOP_NO_SUCH_ENTRY
+    CHAN_QOP_NOT_FOUND
+    CHAN_QOP_DELETED
+    CHAN_QOP_DELETED_ONE
+    CHAN_QOP_DELETED_SEVERAL
+    CHAN_QOP_LIST_EMPTY
+    CHAN_QOP_LIST_HEADER
+    CHAN_QOP_CLEAR
+    CHAN_HELP_QOP
+    CHAN_QOP_SYNTAX
+    CHAN_HELP_CMD_QOP
+    CHAN_HELP_SET_PASSWORD
+    CHAN_LEVEL_AUTOOWNER
+    CHAN_LEVEL_OWNER
+    CHAN_LEVEL_OWNERME
 
 *** Mod Strings:
+    CHAN_HELP_SET
+    CHAN_REGISTER_SYNTAX
 
 *** Del Strings:
+    CHAN_PASSWORD_IS
+    CHAN_SET_PASSWORD_FAILED
+    CHAN_PASSWORD_CHANGED
+    CHAN_IDENTIFY_SUCCEEDED
+    CHAN_IDENTIFY_FAILED
+    CHAN_HELP_IDENTIFY
+    CHAN_IDENTIFY_SYNTAX
+    CHAN_HELP_CMD_IDENTIFY
+    CHAN_LOGOUT_FOUNDER_FAILED
+    CHAN_LOGOUT_SUCCEDED
+    CHAN_LOGOUT_NOT_LOGGEDIN
+    CHAN_LOGOUT_ALL_SUCCEEDED
+    CHAN_SERVADMIN_HELP_LOGOUT
+    CHAN_HELP_LOGOUT
+    CHAN_LOGOUT_SERVADMIN_SYNTAX
+    CHAN_LOGOUT_SYNTAX
+    CHAN_HELP_CMD_LOGOUT
+    CHAN_GETPASS_UNAVAILABLE
+    CHAN_GETPASSWORD_IS
+    CHAN_SERVADMIN_HELP_GETPASS
+    CHAN_GETPASS_SYNTAX
+    CHAN_HELP_CMD_GETPASS
+    CHAN_SENDPASS_SUBJECT
+    CHAN_SENDPASS_HEAD
+    CHAN_SENDPASS_LINE_1
+    CHAN_SENDPASS_LINE_2
+    CHAN_SENDPASS_LINE_3
+    CHAN_SENDPASS_LINE_4
+    CHAN_SENDPASS_LINE_5
+    CHAN_SENDPASS_OK
+    CHAN_SENDPASS_UNAVAILABLE
+    CHAN_HELP_SENDPASS
+    CHAN_SENDPASS_SYNTAX
+    CHAN_HELP_CMD_SENDPASS
 
 Anope Version 1.9.1
 --------------------
diff --git a/TODO b/TODO
index e10ded8cf..2423c8c7c 100644
--- a/TODO
+++ b/TODO
@@ -23,7 +23,7 @@ Legend:
 [?] way for one module to depend on another... not like 2 MOD_HEADs and it being unpredictable which is loaded first..
     the MOD_HEAD MOD_TAIL allows for too few combinations (interface code of insp, hooks code of insp?)
 [ ] Last used time on AKICK/access entries
-[ ] Channel passwords seem to be of limited use, think of a more appropriate way to handle this
+[x] Channel passwords seem to be of limited use, think of a more appropriate way to handle this
 [+] General options block, ability to turn LOGCHAN on from the config file..
 [ ] Docs directory cleanup
 
diff --git a/data/example.conf b/data/example.conf
index 1efd1a1cf..980740932 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -526,9 +526,8 @@ options
  *   botserv/botlist       botserv/set/private   botserv/set/nobot
  *
  *   chanserv/access/list  chanserv/drop         chanserv/forbid     chanserv/getkey
- *   chanserv/getpass      chanserv/list         chanserv/logout     chanserv/sendpass
- *   chanserv/status       chanserv/topic        chanserv/suspend    chanserv/set/noexpire
- *   chanserv/aop/list
+ *   chanserv/list         chanserv/aop/list     chanserv/suspend    chanserv/set/noexpire
+ *   chanserv/status       chanserv/topic
  *
  *   memoserv/sendall      memoserv/staff
  *
@@ -888,7 +887,7 @@ chanserv
 	 * The core modules to load for ChanServ. This is a space separated list that corresponds
 	 * to the base names of the modules for ChanServ. This directive is optional, but highly recommended.
 	 */
-	modules = "cs_help cs_register cs_identify cs_set cs_xop cs_access cs_akick cs_drop cs_sendpass cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_logout cs_topic cs_info cs_getpass cs_forbid cs_suspend cs_status"
+	modules = "cs_help cs_register cs_set cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info forbid cs_suspend cs_status"
 
 	/*
 	 * The default options for newly registered channels. Note that changing these options
diff --git a/include/extern.h b/include/extern.h
index 09055b491..eda18ebc0 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -141,8 +141,6 @@ E void save_cs_dbase();
 E void expire_chans();
 E void cs_remove_nick(const NickCore * nc);
 
-E int is_real_founder(User * user, ChannelInfo * ci);
-
 E void check_modes(Channel * c);
 E int check_valid_admin(User * user, Channel * chan, int servermode);
 E int check_valid_op(User * user, Channel * chan, int servermode);
@@ -158,8 +156,9 @@ E int check_topiclock(Channel * c, time_t topic_time);
 
 E ChannelInfo *cs_findchan(const char *chan);
 E int check_access(User * user, ChannelInfo * ci, int what);
-E int is_founder(User * user, ChannelInfo * ci);
-E int get_access(User * user, ChannelInfo * ci);
+E bool IsFounder(User *user, ChannelInfo *ci);
+E bool IsRealFounder(User *user, ChannelInfo *ci);
+E int get_access(User *user, ChannelInfo *ci);
 E void update_cs_lastseen(User * user, ChannelInfo * ci);
 E int get_idealban(ChannelInfo * ci, User * u, char *ret, int retlen);
 E AutoKick *is_stuck(ChannelInfo * ci, const char *mask);
@@ -168,7 +167,6 @@ E void stick_all(ChannelInfo * ci);
 
 E int levelinfo_maxwidth;
 E ChannelInfo *makechan(const char *chan);
-E int is_identified(User * user, ChannelInfo * ci);
 E char *get_mlock_modes(ChannelInfo * ci, int complete);
 
 /**** compat.c ****/
diff --git a/include/regchannel.h b/include/regchannel.h
index 5bb8599e4..708045733 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -18,7 +18,7 @@ class CoreExport ChannelInfo : public Extensible
 	ChannelInfo()
 	{
 		next = prev = NULL;
-		founderpass[0] = name[0] = last_topic_setter[0] = '\0';
+		name[0] = last_topic_setter[0] = '\0';
 		founder = successor = NULL;
 		desc = url = email = last_topic = forbidby = forbidreason = NULL;
 		time_registered = last_used = last_topic_time = 0;
@@ -43,7 +43,6 @@ class CoreExport ChannelInfo : public Extensible
 	NickCore *founder;
 	NickCore *successor;		/* Who gets the channel if the founder
 					 			 * nick is dropped or expires */
-	char founderpass[PASSMAX];
 	char *desc;
 	char *url;
 	char *email;
diff --git a/include/services.h b/include/services.h
index d733aff55..874c53675 100644
--- a/include/services.h
+++ b/include/services.h
@@ -615,18 +615,19 @@ enum AccessLevel
 	 * than any valid access level, and ACCESS_INVALID may be assumed to be
 	 * strictly less than any valid access level. Also read below.
 	 */
-	ACCESS_FOUNDER = 10000, /* Numeric level indicating founder access */
+	ACCESS_FOUNDER = 10001, /* Numeric level indicating founder access */
 	ACCESS_INVALID = -10000, /* Used in levels[] for disabled settings */
 	/* There is one exception to the above access levels: SuperAdmins will have
 	 * access level 10001. This level is never stored, however; it is only used
 	 * in comparison and to let SuperAdmins win from founders where needed
 	 */
-	ACCESS_SUPERADMIN = 10001,
+	ACCESS_SUPERADMIN = 10002,
 	/* Levels for xOP */
 	ACCESS_VOP = 3,
 	ACCESS_HOP = 4,
 	ACCESS_AOP = 5,
-	ACCESS_SOP = 10
+	ACCESS_SOP = 10,
+	ACCESS_QOP = 10000
 };
 
 /* Channel info structures.  Stored similarly to the nicks, except that
@@ -747,16 +748,15 @@ struct badword_ {
 #define CA_KICKME		   		29
 #define CA_KICK			 		30
 #define CA_SIGNKICK			31
-/* #define CA_AUTOADMIN				32
-#define CA_ADMINME		  		33
-#define CA_ADMIN					34 */
-	/* Why are these commented out and not removed? -GD */
 #define CA_BANME					32
 #define CA_BAN			  		33
 #define CA_TOPIC					34
 #define CA_INFO			 		35
+#define CA_AUTOOWNER			36
+#define CA_OWNER			37
+#define CA_OWNERME			38
 
-#define CA_SIZE		36
+#define CA_SIZE		39
 
 /* BotServ SET flags */
 #define BS_DONTKICKOPS	  	0x00000001
diff --git a/include/users.h b/include/users.h
index f54be8982..aced32c20 100644
--- a/include/users.h
+++ b/include/users.h
@@ -15,11 +15,6 @@ struct u_chanlist {
 	int16 status;		/* Associated flags; see CSTATUS_* below. */
 };
 
-struct u_chaninfolist {
-	struct u_chaninfolist *next, *prev;
-	ChannelInfo *chan;
-};
-
 /* Online user and channel data. */
 class CoreExport User : public Extensible
 {
@@ -49,7 +44,6 @@ class CoreExport User : public Extensible
 	int isSuperAdmin;	/* is SuperAdmin on or off? */
 
 	struct u_chanlist *chans;	/* Channels user has joined */
-	struct u_chaninfolist *founder_chans;	/* Channels user has identified for */
 
 	unsigned short invalid_pw_count;	/* # of invalid password attempts */
 	time_t invalid_pw_time;	/* Time of last invalid password */
diff --git a/lang/cat.l b/lang/cat.l
index 8bb012aae..c10223730 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1019,6 +1019,12 @@ CHAN_LEVEL_TOPIC
 CHAN_LEVEL_INFO
 	Autoritzar a utilitzar La comanda INFO amb
 	l'opció ALL
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1036,7 +1042,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER canal clau descripció
+	REGISTER canal descripció
 CHAN_REGISTER_DISABLED
 	Ho sento, el registre de canals esta temporalment inhabilitat.
 CHAN_REGISTER_NOT_LOCAL
@@ -1055,36 +1061,11 @@ CHAN_REGISTRATION_FAILED
 	Ho sento, la registració ha fallat.
 CHAN_REGISTERED
 	El canal %s esta registrat sota el teu nickname: %s
-CHAN_PASSWORD_IS
-	La teva clau pel canal es %s - Recorda-la per un us futur.
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
 	Please use the symbol of # when attempting to register
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY canal clau
-CHAN_IDENTIFY_FAILED
-	Ho sento, la identificació ha fallat.
-CHAN_IDENTIFY_SUCCEEDED
-	Clau aceptada - ara tens nivell de fundador a %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT canal nickname
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT canal [nickname]
-CHAN_LOGOUT_SUCCEEDED
-	L'usuari %s ha estat desconnectat del canal %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Tots els usuaris identificats han estat desconnectats del canal %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP canal
@@ -1115,14 +1096,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s no pot ser el sucessor en el canal %s ja que n'es el fundador.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Ho sento, l'establiment de la clau no ha estat possible.
-CHAN_PASSWORD_CHANGED
-	Clau per a %s canviada.
-CHAN_PASSWORD_CHANGED_TO
-	La clau per a %s canviada a %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	La descripció de %s canviada a%s.
@@ -1276,6 +1249,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]
@@ -1651,16 +1655,8 @@ CHAN_CLEARED_USERS
 	Tots els usuaris han estat kickegats del canal %s.
 CHAN_CLEARED_INVITES
 	All invites on channel %s have been removed.
-
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS canal
-CHAN_GETPASS_UNAVAILABLE
-	Comanda GETPASS no permessa per que encriptació esta en ús.
-CHAN_GETPASS_PASSWORD_IS
-	La clau pel canal %s es %s.
 	
-# SENDPASS responses
+# GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY channel
 CHAN_GETKEY_NOKEY
@@ -1668,28 +1664,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS canal
-CHAN_SENDPASS_UNAVAILABLE
-	Comanda SENDPASS no permessa per que encriptació esta en ús.
-CHAN_SENDPASS_SUBJECT
-	Clau del canal (%s)
-CHAN_SENDPASS_HEAD
-	Hola,
-CHAN_SENDPASS_LINE_1
-	Has sol.licitat rebre la clau del canal %s per e-mail.
-CHAN_SENDPASS_LINE_2
-	La clau es %s. Per raons de seguretat hauries de cambiar-la quant rebis aquest mail.
-CHAN_SENDPASS_LINE_3
-	Si no saps per que has rebut aquest mail, per favor ignora'l.
-CHAN_SENDPASS_LINE_4
-	Per favor NO RESPONGUIS a aquest email!
-CHAN_SENDPASS_LINE_5
-	Administradors de %s.
-CHAN_SENDPASS_OK
-	La clau de %s ha estat enviada.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID canal [raó]
@@ -4176,10 +4150,10 @@ CHAN_HELP_CMD_STATUS
 	               on a channel
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registra un canal
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   T'identifica amb la teva clau
 CHAN_HELP_CMD_SET
 	    SET        Establir opcions i informació d'un canal
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Modifica la llista d'usuaris AOP
 CHAN_HELP_CMD_SOP
@@ -4192,8 +4166,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Manté la llista d'AutoKick
 CHAN_HELP_CMD_DROP
 	    DROP       Cancel.la l'enregistrament d'un canal
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Ajuda a recuperar claus perdudes
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4210,8 +4182,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4281,24 +4251,6 @@ CHAN_HELP_REGISTER
 	el teu nickname primer. Si encara no ho has fet, escriu
 	%R%s HELP per més informació de com fer-ho.
 
-CHAN_HELP_IDENTIFY
-	Sintaxis: IDENTIFY canal clau
-	
-	T'identifica amb %S com el fundador del canal especificat.
-	Moltes comandes requereixen que utilitzis aquesta comanda abans
-	d'utilitzar-los. La clau hauria de ser la mateixa que
-	vas enviar amb la comanda REGISTER.
-	
-CHAN_HELP_LOGOUT
-	Sintaxis: LOGOUT canal nickname
-	
-	Aquest comanda fa que el nickname donat ja no siguis identificat
-	en el canal especificat.
-	
-	Si ets el fundador del canal, pots desconectar a
-	qui sigui, d'altra banda tan sols et pots desconnectar
-	a tu mateix.
-
 CHAN_HELP_DROP
 	Sintaxis: DROP canal
 	
@@ -4316,7 +4268,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Estableix el fundador d'un canal
 	    SUCCESSOR     Estableix el successor d'un canal
-	    PASSWORD      Estableix el password del fundador
 	    DESC          Estableix la descripció del canal
 	    URL           Associa una URL amb el canal
 	    EMAIL         Associa un E-mail amb el canal
@@ -4361,12 +4312,6 @@ CHAN_HELP_SET_SUCCESSOR
 	si no hi haguès un successor. El nou nickname ha de ser un
 	d'enregistrat.
 
-CHAN_HELP_SET_PASSWORD
-	Sintaxis: SET canal PASSWORD clau
-	
-	Estableix la clau utilitzada per identificar-se com el
-	fundador del canal.
-
 CHAN_HELP_SET_DESC
 	Sintaxis: SET canal DESC descripció
 	
@@ -4559,6 +4504,45 @@ CHAN_HELP_SET_OPNOTICE
 	a l'usuari del canal quan les comandes OP o DEOP siguin
 	utilitzades per a un usuari en el canal.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Sintàxi: AOP canal ADD nick
 	          AOP canal DEL {nick | instancia | llista}
@@ -5062,15 +5046,6 @@ CHAN_HELP_GETKEY
 	Sintàxi: GETKEY canal
 	
 	Retorna la clau del canal donat.
-	
-CHAN_HELP_SENDPASS
-	Sintàxi: SENDPASS canal
-	
-	Envia la clau del canal donat a l'adresa email establerta
-	en l'arxiu del nickname del fundador. Aquesta comanda
-	és sumament útil per a recuperar claus perdudes.
-	
-	pot ser limitat a  Operadors de IRC en certas xarxes.
 
 CHAN_SERVADMIN_HELP
 	
@@ -5087,22 +5062,6 @@ CHAN_SERVADMIN_HELP
 	Veure l'accés, AKICK, i paràmetres de les llistes de nivells per a
 	qualsevol canal.
 
-CHAN_SERVADMIN_HELP_LOGOUT
-	Sintàxi: LOGOUT canal [nickname]
-	
-	Aquesta comanda ha fa que el nick seleccionat no sigui identificat
-	pel canal donat.
-	
-	Si tu ets el fundador del canal, pots desconectar a
-	qui sigui, sinó només et pots desconectar a
-	tu mateix.
-	
-	Si ets un administrador de serveis, pots
-	desconectar a qui sigui d'un canal sense ser el fundador
-	del canal. A més, pots omitir el paràmetro nickname;
-	això desconectara a tots els usuaris identificados
-	del canal.
-
 CHAN_SERVADMIN_HELP_DROP
 	Sintàxi: DROP canal
 	
diff --git a/lang/de.l b/lang/de.l
index c3cd7b074..14fe45420 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1023,6 +1023,12 @@ CHAN_LEVEL_KICK
 	KICK-Befehl erlaubt
 CHAN_LEVEL_SIGNKICK
 	Kein signierter Kick wenn SIGNKICK LEVEL genutzt wird
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_LEVEL_BANME
@@ -1050,7 +1056,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER Channel Passwort Beschreibung
+	REGISTER Channel Beschreibung
 CHAN_REGISTER_DISABLED
 	Die Registrierung von Channels ist derzeit deaktiviert.
 CHAN_REGISTER_NOT_LOCAL
@@ -1069,34 +1075,12 @@ CHAN_REGISTRATION_FAILED
 	Registrierung fehlgeschlagen.
 CHAN_REGISTERED
 	Der Channel %s ist registriert unter deinem Nicknamen: %s
-CHAN_PASSWORD_IS
-	Dein Channel-Passwort ist %s - behalte es für spätere Benutzung.
 CHAN_REGISTER_NONE_CHANNEL
 	Du hast versucht ein nicht existierender Channel %s zu registrieren.
 CHAN_SYMBOL_REQUIRED
 	Verwende bitte nur das Symbol # wenn du versuchst ein
 	Channel zu registrieren.
 
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY Channel Passwort
-CHAN_IDENTIFY_FAILED
-	Identifizierung ist fehlgeschlagen.
-CHAN_IDENTIFY_SUCCEEDED
-	Passwort akzeptiert - du hast jetzt Founderlevel-Zugriff auf %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT Channel Nickname
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT Channel [Nickname]
-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).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP Channel
@@ -1127,14 +1111,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s kann nicht gleichzeitig Gründer und Vertreter im Channel %s sein.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Konnte das Passwort nicht ändern.
-CHAN_PASSWORD_CHANGED
-	%s Passwort wurde geändert.
-CHAN_PASSWORD_CHANGED_TO
-	%s Passwort wurde geändert zu %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	Beschreibung von %s wurde geändert zu %s.
@@ -1285,6 +1261,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	XOP System ist nicht verfügbar.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]
@@ -1655,16 +1662,8 @@ CHAN_CLEARED_USERS
 	Alle User wurden aus Channel %s gekicked.
 CHAN_CLEARED_INVITES
 	Alle Invites wurden im Channel %s entfernt.
-
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS Channel
-CHAN_GETPASS_UNAVAILABLE
-	GETPASS Befehl nicht verfügbar, da die Datenbank verschlüsselt ist.
-CHAN_GETPASS_PASSWORD_IS
-	Passwort für Channel %s ist %s.
 	
-# SENDPASS responses
+# GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY Channel
 CHAN_GETKEY_NOKEY
@@ -1672,28 +1671,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS Channel
-CHAN_SENDPASS_UNAVAILABLE
-	SENDPASS Befehl nicht verfügbar, da die Datenbank verschlüsselt ist.
-CHAN_SENDPASS_SUBJECT
-	Channel-Passwort (%s)
-CHAN_SENDPASS_HEAD
-	Hi,
-CHAN_SENDPASS_LINE_1
-	Du hast das Passwortes für deinen Channel %s angefordert.
-CHAN_SENDPASS_LINE_2
-	Das Passwort ist %s. Aus Sicherheitsgründen solltest du das Passwort bei Erhalt dieser Nachricht ändern.
-CHAN_SENDPASS_LINE_3
-	Wenn du nicht weisst, warum du diese Mail empfangen hast, ignoriere Sie bitte.
-CHAN_SENDPASS_LINE_4
-	AUF DIESE MAIL BITTE NICHT ANTWORTEN!
-CHAN_SENDPASS_LINE_5
-	%s, die Administration.
-CHAN_SENDPASS_OK
-	Passwort von %s wurde per eMail versandt.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID Channel [Grund]
@@ -4204,12 +4181,11 @@ CHAN_HELP_CMD_STATUS
 	               in dem Channel
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Einen Channel registrieren
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Sich mit Passwort als Founder (z.B.)
-	               des Channels identifizieren
 CHAN_HELP_CMD_SET
 	    SET        Bestimmte Channel-Optionen und
 	               Informationen einstellen
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Verwaltet die AOP-Liste von einen Channel
 CHAN_HELP_CMD_SOP
@@ -4224,8 +4200,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Die Autokick-Liste bearbeiten
 CHAN_HELP_CMD_DROP
 	    DROP       Registrierung eines Channels aufheben
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Hilft bei vergessenen Passwörtern
 CHAN_HELP_CMD_BAN
 	    BAN        Bant den angegebenen Nicknamen aus einen Channel
 CHAN_HELP_CMD_CLEAR
@@ -4243,8 +4217,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kickt den angegebenen Nicknamen aus einen Channel
 CHAN_HELP_CMD_LIST
 	    LIST       Listet alle registrieten Channels des angegebene Muster
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Das Befehl wir den angegegenen Nickname abmelden
 CHAN_HELP_CMD_OP
 	    OP         Gibt den angegebenen Nicknamen Op-Status in einen Channel
 CHAN_HELP_CMD_TOPIC
@@ -4317,25 +4289,6 @@ CHAN_HELP_REGISTER
 	Hast du dies noch nicht getan, tippe %R%s HELP REGISTER 
 	um weitere Informationen darüber zu erhalten.
 
-CHAN_HELP_IDENTIFY
-	Syntax: IDENTIFY Channel Passwort
-	
-	Identifiziert ein Nickname gegenüber %S als 
-	Gründer (Founder) 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
-	Channels zu erhalten.
-	
-CHAN_HELP_LOGOUT
-	Syntax: LOGOUT Channel Nickname
-	
-	Hebt die Identifizierung als Channel-Founder für
-	den angegebenen Channel wieder auf.
-	
-	Wenn du der Channel-Founder bist, kannst du jeden
-	ausloggen, jeder andere nur sich selbst.
-
 CHAN_HELP_DROP
 	Syntax: DROP Channel
 	
@@ -4352,7 +4305,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Stellt den Gründer des Channels ein
 	    SUCCESSOR     Stellt den Vertreter des Founders ein
-	    PASSWORD      Ändert das Passwort des Channel-Founders
 	    DESC          Ändert die Channel-Beschreibung
 	    URL           Verbindet eine URL mit dem Channel
 	    EMAIL         Verbindet eine eMail-Adresse mit dem
@@ -4398,12 +4350,6 @@ CHAN_HELP_SET_SUCCESSOR
 	
 	Der Nickname des Vertreters muss registriert sein.
 
-CHAN_HELP_SET_PASSWORD
-	Syntax: SET Channel PASSWORD Passwort
-	
-	Ändert das Passwort, dass dich als Founder (Gründer)
-	des Channels identifiziert.
-
 CHAN_HELP_SET_DESC
 	Syntax: SET Channel DESC Beschreibung
 	
@@ -4598,6 +4544,45 @@ CHAN_HELP_SET_OPNOTICE
 	Notice an den Channel wenn OP oder DEOP Befehle
 	benutzt werden.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Syntax: AOP Channel ADD Nickname
 	        AOP Channel DEL {Nickname | entry-num | Liste}
@@ -5101,39 +5086,12 @@ CHAN_HELP_GETKEY
 	Syntax: GETKEY Channel
 	
 	Liefert den Key des angegebenen Channels zurück.
-	
-CHAN_HELP_SENDPASS
-	Syntax: SENDPASS Channel
-	
-	Sendet das Passwort des angegebenen Channels an die
-	eMail-Adresse, die dem Founder in der Datenbank
-	assoziiert ist. Dieser Befehl ist sehr nützlich,
-	wenn man mit dem Problem des vergessenen Passwortes
-	konfrontiert wird.
-	
-	Kann in einigen Netzen auf IRC Operatoren beschränkt
-	sein.
 
 CHAN_SERVADMIN_HELP
 	
 	Services Administratoren können weiterhin beliebige Channels
 	DROPEN (löschen), Zugriffslisten oder Channel-Einstellungen
 	ansehen ohne sich vorher für den Channel identifizieren zu müssen.
-	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Syntax: LOGOUT Channel [Nickname]
-	
-	Durch dieser Befehl wird dich ChanServ nicht mehr als
-	identifiziert für den angegebenen Channel betrachten.
-	
-	Wenn du der Founder (Gründer) dieses Channels bist, kannst
-	du jeden ausloggen, ansonsten nur dich selbst.
-	
-	Bist du ein Services Administrator, kannst du jeden des
-	angegebenen Channels ausloggen, ohne Founder-Rechte
-	des Channels zu besitzen. Weiterhin musst du den
-	Parameter Nickname nicht unbedingt angeben, dies hat zur
-	Folge, dass jeder Nickname aus dem Channel ausgeloggt wird.
 
 CHAN_SERVADMIN_HELP_DROP
 	Syntax: DROP Channel
diff --git a/lang/en_us.l b/lang/en_us.l
index 6e7802612..67c8e7f74 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -998,6 +998,12 @@ CHAN_LEVEL_TOPIC
 	Allowed to use TOPIC command
 CHAN_LEVEL_INFO
 	Allowed to use INFO command with ALL option
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1013,7 +1019,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER channel password description
+	REGISTER channel description
 CHAN_REGISTER_DISABLED
 	Sorry, channel registration is temporarily disabled.
 CHAN_REGISTER_NOT_LOCAL
@@ -1032,37 +1038,11 @@ CHAN_REGISTRATION_FAILED
 	Sorry, registration failed.
 CHAN_REGISTERED
 	Channel %s registered under your nickname: %s
-CHAN_PASSWORD_IS
-	Your channel password is %s - remember it for later use.
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
 	Please use the symbol of # when attempting to register
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY channel password
-CHAN_IDENTIFY_FAILED
-	Sorry, identification failed.
-CHAN_IDENTIFY_SUCCEEDED
-	Password accepted - you now have founder-level access to %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT channel nickname
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT channel [nickname]
-CHAN_LOGOUT_SUCCEEDED
-	User %s has been logged out of channel %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	All users identified have been logged out of channel %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP channel
@@ -1093,14 +1073,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s cannot be the successor on channel %s because he is its founder.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Sorry, couldn't set password.
-CHAN_PASSWORD_CHANGED
-	%s password changed.
-CHAN_PASSWORD_CHANGED_TO
-	%s password changed to %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	Description of %s changed to %s.
@@ -1251,6 +1223,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
@@ -1623,14 +1626,6 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	All invites on channel %s have been removed.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS channel
-CHAN_GETPASS_UNAVAILABLE
-	GETPASS command unavailable because encryption is in use.
-CHAN_GETPASS_PASSWORD_IS
-	Password for channel %s is %s.
-
 # GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY channel
@@ -1639,28 +1634,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS channel
-CHAN_SENDPASS_UNAVAILABLE
-	SENDPASS command unavailable because encryption is in use.
-CHAN_SENDPASS_SUBJECT
-	Channel password (%s)
-CHAN_SENDPASS_HEAD
-	Hi,
-CHAN_SENDPASS_LINE_1
-	You have requested to receive the password of channel %s by e-mail.
-CHAN_SENDPASS_LINE_2
-	The password is %s. For security reasons, you should change it as soon as you receive this mail.
-CHAN_SENDPASS_LINE_3
-	If you don't know why this mail is sent to you, please ignore it silently.
-CHAN_SENDPASS_LINE_4
-	PLEASE DON'T ANSWER TO THIS MAIL!
-CHAN_SENDPASS_LINE_5
-	%s administrators.
-CHAN_SENDPASS_OK
-	Password of %s has been sent.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID channel [reason]
@@ -4024,10 +3997,10 @@ CHAN_HELP_CMD_STATUS
 	               on a channel
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Register a channel
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Identify yourself with your password
 CHAN_HELP_CMD_SET
 	    SET        Set channel options and information
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Modify the list of AOP users
 CHAN_HELP_CMD_SOP
@@ -4040,8 +4013,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Maintain the AutoKick list
 CHAN_HELP_CMD_DROP
 	    DROP       Cancel the registration of a channel
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Help retrieve lost passwords
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4058,8 +4029,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4127,23 +4096,6 @@ CHAN_HELP_REGISTER
 	first registered your nickname.  If you haven't,
 	%R%s HELP for information on how to do so.
 
-CHAN_HELP_IDENTIFY
-	Syntax: IDENTIFY channel password
-	
-	Authenticates you to %S as the founder of the given
-	channel.  Many commands require you to use this command
-	before using them.  The password should be the same one
-	you sent with the REGISTER command.
-	
-CHAN_HELP_LOGOUT
-	Syntax: LOGOUT channel nickname
-	
-	This command will log the selected nickname out meaning they 
-	would have to reidentify themselves to regain their access.
-	
-	If you are the founder of the channel, you can log out anybody,
-	else you can only log out yourself.
-
 CHAN_HELP_DROP
 	Syntax: DROP channel
 	
@@ -4160,7 +4112,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Set the founder of a channel
 	    SUCCESSOR     Set the successor for a channel
-	    PASSWORD      Set the founder password
 	    DESC          Set the channel description
 	    URL           Associate a URL with the channel
 	    EMAIL         Associate an E-mail address with the channel
@@ -4200,12 +4151,6 @@ CHAN_HELP_SET_SUCCESSOR
 	instead, just as if no successor had been set.  The new
 	nickname must be a registered one.
 
-CHAN_HELP_SET_PASSWORD
-	Syntax: SET channel PASSWORD password
-	
-	Sets the password used to identify as the founder of the
-	channel.
-
 CHAN_HELP_SET_DESC
 	Syntax: SET channel DESC description
 	
@@ -4388,6 +4333,45 @@ CHAN_HELP_SET_OPNOTICE
 	channel whenever the OP or DEOP commands are used for a user
 	in the channel.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Syntax: AOP channel ADD nick
 	        AOP channel DEL {nick | entry-num | list}
@@ -4875,35 +4859,12 @@ CHAN_HELP_GETKEY
 	Syntax: GETKEY channel
 	
 	Returns the key of the given channel.
-	
-CHAN_HELP_SENDPASS
-	Syntax: SENDPASS channel
-	
-	Send the password of the given channel to the e-mail address
-	set in the founder's nickname record. This command is really 
-	useful to deal with lost passwords.
-	
-	May be limited to IRC operators on certain networks.
 
 CHAN_SERVADMIN_HELP
 	 
 	Services Operators can also drop any channel without needing
 	to identify via password, and may view the access, AKICK,
 	and level setting lists for any channel.
-	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Syntax: LOGOUT channel [nickname]
-	
-	This command will log the selected nickname out meaning they 
-	would have to reidentify themselves to regain their access.
-	
-	If you are the founder of the channel, you can log out anybody,
-	else you can only log out yourself.
-	
-	If you are a Services Operators, you can log out 
-	anybody of any channel without having to be the founder
-	of the channel. Also, you can omit the nickname parameter;
-	this will log out all identified users from the channel.
 
 CHAN_SERVADMIN_HELP_DROP
 	Syntax: DROP channel
diff --git a/lang/es.l b/lang/es.l
index 87e0c2dbb..9a2abffe2 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1017,6 +1017,12 @@ CHAN_LEVEL_TOPIC
 CHAN_LEVEL_INFO
 	Permitido usar el comando INFO con
 	la opcion ALL
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1034,7 +1040,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER canal clave descripcion
+	REGISTER canal descripcion
 CHAN_REGISTER_DISABLED
 	Lo siento, el registro de canales esta temporalmente deshabilitado.
 CHAN_REGISTER_NOT_LOCAL
@@ -1053,36 +1059,11 @@ CHAN_REGISTRATION_FAILED
 	Lo siento, el registro ha fallado.
 CHAN_REGISTERED
 	El canal %s esta registrado bajo tu nickname: %s
-CHAN_PASSWORD_IS
-	Tu clave para el canal es %s - Recuerdala para uso futuro.
 CHAN_REGISTER_NONE_CHANNEL
 	Has intentado registrar el canal %s, el cual no existe.
 CHAN_SYMBOL_REQUIRED
 	Por favor usar el simbolo # cuando intentes registrar un canal.
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY canal clave
-CHAN_IDENTIFY_FAILED
-	Lo siento, la identificacion ha fallado.
-CHAN_IDENTIFY_SUCCEEDED
-	Clave aceptada - ahora tienes nivel de fundador en %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT canal nickname
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT canal [nickname]
-CHAN_LOGOUT_SUCCEEDED
-	El usuario %s ha sido desconectado del canal %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Todos los usuarios identificados han sido desconectados del canal %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP canal
@@ -1113,14 +1094,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s no puede ser el sucesor en el canal %s ya que el es el fundador.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Lo siento, el seteo de la clave no fue posible.
-CHAN_PASSWORD_CHANGED
-	Clave para %s cambiada.
-CHAN_PASSWORD_CHANGED_TO
-	La clave para %s cambiado a %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	La descripcion de %s cambiada a%s.
@@ -1274,6 +1247,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	El sistema xOP no esta disponible.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP canal {ADD|DEL|LIST|CLEAR} [nick | instancia]
@@ -1650,14 +1654,6 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	Todos los invites en el canal %s han sido removidos.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS canal
-CHAN_GETPASS_UNAVAILABLE
-	Comando GETPASS no permitido porque encriptacion esta en uso.
-CHAN_GETPASS_PASSWORD_IS
-	La clave para el canal %s es %s.
-	
 # GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY canal
@@ -1666,28 +1662,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS canal
-CHAN_SENDPASS_UNAVAILABLE
-	Comando SENDPASS no permitido porque encriptacion esta en uso.
-CHAN_SENDPASS_SUBJECT
-	Clave del canal (%s)
-CHAN_SENDPASS_HEAD
-	Hola,
-CHAN_SENDPASS_LINE_1
-	Has solicitado recibir la clave del canal %s por e-mail.
-CHAN_SENDPASS_LINE_2
-	La clave es %s. Por razones de seguridad deberas cambiarla en cuanto recibas este mail.
-CHAN_SENDPASS_LINE_3
-	Si no sabes porque recibiste este mail, por favor ignoralo.
-CHAN_SENDPASS_LINE_4
-	POR FAVOR NO RESPONDER A ESTE EMAIL!
-CHAN_SENDPASS_LINE_5
-	Administradores de %s.
-CHAN_SENDPASS_OK
-	La clave de %s ha sido enviada.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID canal [razon]
@@ -4147,10 +4121,10 @@ CHAN_HELP_CMD_STATUS
 	               usuario en un canal
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registra un canal
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Te identifica con tu clave
 CHAN_HELP_CMD_SET
 	    SET        Setea opciones e informacion de un canal
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Modifica la lista de usuarios AOP
 CHAN_HELP_CMD_SOP
@@ -4163,8 +4137,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Mantiene la lista de AutoKick
 CHAN_HELP_CMD_DROP
 	    DROP       Cancela la registracion de un canal
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Ayuda a recuperar claves perdidas
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4181,8 +4153,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4252,24 +4222,6 @@ CHAN_HELP_REGISTER
 	tu nickname primero. Si aun no lo haz hecho, tipea
 	%R%s HELP para mayor informacion en como hacerlo.
 
-CHAN_HELP_IDENTIFY
-	Sintaxis: IDENTIFY canal clave
-	
-	Te identifica con %S como el fundador del canal dado.
-	Muchos comandos requieren que uses este comando antes
-	de usarlos. La clave deberia ser la misma que
-	enviaste con el comando REGISTER.
-	
-CHAN_HELP_LOGOUT
-	Sintaxis: LOGOUT canal nickname
-	
-	Este comando hace al nickname dado ya no identificado
-	en el canal dado.
-	
-	Si eres el fundador del canal, puedes desconectar a
-	quien sea, de otra forma solo te puedes desconectar
-	a ti mismo.
-
 CHAN_HELP_DROP
 	Sintaxis: DROP canal
 	
@@ -4287,7 +4239,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Setea el fundador de un canal
 	    SUCCESSOR     Setea el sucesor de un canal
-	    PASSWORD      Setea el pasword del fundador
 	    DESC          Setea la descripcion del canal
 	    URL           Asocia una URL con el canal
 	    EMAIL         Asocia un E-mail con el canal
@@ -4333,12 +4284,6 @@ CHAN_HELP_SET_SUCCESSOR
 	si no hubiese un sucesor. El nuevo nickname debe ser uno
 	registrado.
 
-CHAN_HELP_SET_PASSWORD
-	Sintaxis: SET canal PASSWORD clave
-	
-	Setea la clave usado para identificarse como el
-	fundador del canal.
-
 CHAN_HELP_SET_DESC
 	Sintaxis: SET canal DESC descripcion
 	
@@ -4531,6 +4476,45 @@ CHAN_HELP_SET_OPNOTICE
 	al usuario del canal cuando los comandos OP o DEOP sean
 	usados para un usuario en el canal.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Sintaxis: AOP canal ADD nick
 	          AOP canal DEL {nick | instancia | lista}
@@ -5035,15 +5019,6 @@ CHAN_HELP_GETKEY
 	Sintaxis: GETKEY canal
 	
 	Retorna la key del canal dado.
-	
-CHAN_HELP_SENDPASS
-	Sintaxis: SENDPASS canal
-	
-	Envia la clave del canal dado a la direccion email seteada
-	en el archivo del nickname del fundador. Este comando
-	es sumamente util para lidiar con claves perdidas.
-	
-	Puede ser limitado a  Operadores de IRC en ciertas redes.
 
 CHAN_SERVADMIN_HELP
 	
@@ -5052,22 +5027,6 @@ CHAN_SERVADMIN_HELP
 	ver el acceso, AKICK, y seteos de las listas de niveles para
 	cualquier canal.
 
-CHAN_SERVADMIN_HELP_LOGOUT
-	Sintaxis: LOGOUT canal [nickname]
-	
-	Este comando hace al nick seleccionado ya no identificado
-	para el canal dado.
-	
-	Si tu eres el fundador del canal, puedes desconectar a
-	quien sea, de otra manera solo te puedes desconectar a
-	ti mismo.
-	
-	Si eres un administrador de Servicios, puedes
-	desconectar a quien sea de un canal sin ser el fundador
-	del canal. Ademas, puedes omitir el parametro nickname;
-	esto desconectara a todos los usuarios identificados
-	del canal.
-
 CHAN_SERVADMIN_HELP_DROP
 	Sintaxis: DROP canal
 	
diff --git a/lang/fr.l b/lang/fr.l
index 1b3c88676..6a7ac929a 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1030,6 +1030,12 @@ CHAN_LEVEL_TOPIC
 	Autorisé à utiliser la commande TOPIC
 CHAN_LEVEL_INFO
 	Autorisé à utiliser la commande INFO avec l'option ALL
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1047,7 +1053,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER canal motdepasse description
+	REGISTER canal description
 CHAN_REGISTER_DISABLED
 	Désolés, l'enregistrement des cannaux est temporairement désactivé.
 CHAN_REGISTER_NOT_LOCAL
@@ -1066,36 +1072,11 @@ CHAN_REGISTRATION_FAILED
 	Désolés, l'enregistrement a échoué.
 CHAN_REGISTERED
 	Le canal %s a été enregistré sous votre pseudo: %s
-CHAN_PASSWORD_IS
-	Le mot de passe du canal est %s - notez le pour une utilisation ultérieure.
 CHAN_REGISTER_NONE_CHANNEL
 	Vous avez essayé d'enregistrer le canal %s qui n'éxiste pas.
 CHAN_SYMBOL_REQUIRED
 	Veuillez utiliser les symbole # quand vous voulez enregistrer
 	un canal.
-	
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY canal motdepasse
-CHAN_IDENTIFY_FAILED
-	Désolés, l'identification a échoué.
-CHAN_IDENTIFY_SUCCEEDED
-	Password accepté - vous avez maintenant un level d'accès sur %s équivalent 
-	à celui de son propriétaire.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT canal pseudo
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT canal [pseudo]
-CHAN_LOGOUT_SUCCEEDED
-	L'utilisateur %s n'est plus identifié pour le canal %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Tous les utilisateurs identifiés au canal %s ne le sont plus (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
 
 # DROP responses
 CHAN_DROP_SYNTAX
@@ -1127,14 +1108,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s ne peut être successeur et propriétaire du canal %s.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Impossible de changer le mot de passe.
-CHAN_PASSWORD_CHANGED
-	Le mot de passe de %s a été changé.
-CHAN_PASSWORD_CHANGED_TO
-	Le mot de passe de %s est maintenant %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	La description de %s est maintenant %s.
@@ -1287,6 +1260,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]
@@ -1661,16 +1665,8 @@ CHAN_CLEARED_USERS
 	Tous les utilisateurs du canal %s ont été kickés.
 CHAN_CLEARED_INVITES
 	Toutes les invites du canal %s ont été enlevés.
-
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS canal
-CHAN_GETPASS_UNAVAILABLE
-	La commande GETPASS est indisponible car l'encryption est utilisée.
-CHAN_GETPASS_PASSWORD_IS
-	Le mot de passe du canal %s est %s.
 	
-# SENDPASS responses
+# GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY canal
 CHAN_GETKEY_NOKEY
@@ -1678,28 +1674,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS canal
-CHAN_SENDPASS_UNAVAILABLE
-	La commande SENDPASS est indisponible car l'encryption est utilisée.
-CHAN_SENDPASS_SUBJECT
-	Mot de passe du canal %s
-CHAN_SENDPASS_HEAD
-	Bonjour,
-CHAN_SENDPASS_LINE_1
-	Vous avez demandé à recevoir le mot de passe du canal %s par e-mail.
-CHAN_SENDPASS_LINE_2
-	Le mot de passe est %s. Pour des raisons de sécurité, vous devriez le changer dès que vous lisez ce mail.
-CHAN_SENDPASS_LINE_3
-	Si vous ne savez pas de quoi il retourne dans cet e-mail, il s'agit probablement d'une erreur; nous vous prions de nous excuser et vous demandons d'ignorer cet e-mail.
-CHAN_SENDPASS_LINE_4
-	NE REPONDEZ PAS A CE MAIL!
-CHAN_SENDPASS_LINE_5
-	Les administrateurs de %s.
-CHAN_SENDPASS_OK
-	Le mot de passe de %s a été envoyé.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID canal [raison]
@@ -4206,11 +4180,11 @@ CHAN_HELP_CMD_STATUS
 	               utilisateur sur un channel
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Enregistre un channel
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Vous identifie avec votre mot de passe
 CHAN_HELP_CMD_SET
 	    SET        Configure les options et informations du 
 	               channel
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Modifie la liste des utilisateurs AOPs
 CHAN_HELP_CMD_SOP
@@ -4223,8 +4197,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Gère la liste des kicks automatiques
 CHAN_HELP_CMD_DROP
 	    DROP       Annule l'enregistrement d'un channel
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Aide à retrouver les mots de passe égarés
 CHAN_HELP_CMD_BAN
 	    BAN        Ban un pseudo spécifié dans un canal
 CHAN_HELP_CMD_CLEAR
@@ -4242,8 +4214,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kick le pseudo spécifié d'un canal
 CHAN_HELP_CMD_LIST
 	    LIST       Liste tout les canaux enregistré en rapport avec la recherche
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Cette commande inverse la commande IDENTIFY
 CHAN_HELP_CMD_OP
 	    OP         Donne l'Op au pseudo spécifié sur un canal
 CHAN_HELP_CMD_TOPIC
@@ -4314,25 +4284,6 @@ CHAN_HELP_REGISTER
 	d'abord enregistrer votre pseudo. Si ce n'est pas déjà fait,
 	tapez %R%s HELP pour savoir comment faire.
 
-CHAN_HELP_IDENTIFY
-	Syntaxe: IDENTIFY canal motdepasse
-	
-	Certifie à %S que vous êtes autorisé à modifier le canal donné.
-	Beaucoup de commandes demandent que vous utilisiez cette
-	commande avant de les utiliser si vous n'êtes pas le propriétaire. 
-	Le mot de passe est le même que celui que vous avez envoyé avec la
-	commande REGISTER.
-	
-CHAN_HELP_LOGOUT
-	Syntaxe: LOGOUT canal pseudo
-	
-	Cette commande supprime l'identification du pseudo sélectionné
-	pour le canal donné.
-	
-	Si vous êtes le propriétaire du canal, vous pouvez utiliser
-	la commande sur n'importe qui, sinon vous ne pouvez que
-	l'utiliser sur vous même.
-
 CHAN_HELP_DROP
 	Syntaxe: DROP canal
 	
@@ -4350,7 +4301,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Définit le propriétaire d'un canal
 	    SUCCESSOR     Définit le successeur d'un canal
-	    PASSWORD      Définit le mot de passe du canal
 	    DESC          Définit la description du canal
 	    URL           Associe un site avec un canal
 	    EMAIL         Associe un E-mail avec le canal
@@ -4395,12 +4345,6 @@ CHAN_HELP_SET_SUCCESSOR
 	si aucun successeur n'avait été nommé. Le nouveau pseudo
 	doit être enregistré.
 
-CHAN_HELP_SET_PASSWORD
-	Syntaxe: SET canal PASSWORD motdepasse
-	
-	Définit le mot de passe utilisé pour s'identifier en tant
-	que propriétaire du canal.
-
 CHAN_HELP_SET_DESC
 	Syntaxe: SET canal DESC description
 	
@@ -4592,6 +4536,45 @@ CHAN_HELP_SET_OPNOTICE
 	canal à chaque fois que les commandes OP ou DEOP sont
 	utilisées par un utilisateur sur le canal.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Syntaxe: AOP canal ADD pseudo
 	         AOP canal DEL {pseudo | liste d'entrées | liste}
@@ -5094,17 +5077,6 @@ CHAN_HELP_GETKEY
 	Syntaxe: GETKEY canal
 	
 	Retourne la clef du canal donné.
-	
-CHAN_HELP_SENDPASS
-	Syntaxe: SENDPASS canal
-	
-	Envoie le mot de passe du canal donné à l'adresse e-mail 
-	qui a été définie pour le propriétaire de ce canal. Cette 
-	commande est très utile pour régler les problèmes de mots 
-	de passe perdus.
-	
-	Peut être limitée aux IRC operators sur certains
-	réseaux.
 
 CHAN_SERVADMIN_HELP
 	
@@ -5112,23 +5084,6 @@ CHAN_SERVADMIN_HELP
 	avoir besoin de s'identifier avec un mot de pass, et peuvent
 	voir l'access, AKICK, et level lists de tout canaux.
 
-CHAN_SERVADMIN_HELP_LOGOUT
-	Syntaxe: LOGOUT canal [pseudo]
-	
-	Cette commande supprime l'identification du pseudo sélectionné
-	pour le canal donné.
-	
-	Si vous êtes le propriétaire du canal, vous pouvez utiliser
-	la commande sur n'importe qui, sinon vous ne pouvez que
-	l'utiliser sur vous même.
-	
-	Si vous êtes un Services operaror, vous pouvez utiliser
-	cette commande sur n'importe qui pour n'importe quel 
-	canal sans avoir besoin d'être le propriétaire du canal.
-	Vous pouvez également omettre le paramètre pseudo, cela aura
-	pour effet de supprimer l'identification pour tous les 
-	utilisateurs identifiés au canal.
-
 CHAN_SERVADMIN_HELP_DROP
 	Syntaxe: DROP canal
 	
diff --git a/lang/gr.l b/lang/gr.l
index b33d4f610..e0f61c521 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -1017,6 +1017,12 @@ CHAN_LEVEL_TOPIC
 	ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí TOPIC åíôïëÞ
 CHAN_LEVEL_INFO
 	ÅðéôñÝðåôáé íá ÷ñçóéìïðïéÞóåéò ôçí INFO åíôïëÞ ìå ôçí ALL åðéëïãÞ
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1034,7 +1040,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER channel password description
+	REGISTER channel description
 CHAN_REGISTER_DISABLED
 	Óõãíþìç, ç õðçñåóßá êáôï÷ýñùóåéò êáíáëéþí äåí ëåéôïõñãåß ãéá ôçí þñá.
 CHAN_REGISTER_NOT_LOCAL
@@ -1053,36 +1059,11 @@ CHAN_REGISTRATION_FAILED
 	Óõãíþìç, ç êáôï÷ýñùóç áðÝôõ÷å.
 CHAN_REGISTERED
 	Ôï êáíÜëé %s åßíáé êáôï÷õñùìÝíï áðü ôï øåõäþíõìü óïõ: %s
-CHAN_PASSWORD_IS
-	Ï êùäéêüò ôïõ êáíáëéïý åßíáé %s - èõìÞóïõ ôïí ãéáôß èá ôïí ÷ñåéáóôåßò ìåôÜ.
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
 	Please use the symbol of # when attempting to register
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY channel password
-CHAN_IDENTIFY_FAILED
-	Óõãíþìç, ç áíáãíþñéóç ãéá ôï êáíÜëé áðÝôõ÷å.
-CHAN_IDENTIFY_SUCCEEDED
-	Ï êùäéêüò Ýãéíå äåêôüò - ôþñá Ý÷åéò founder-level ðñüóâáóç óôï %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT channel nickname
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT channel [nickname]
-CHAN_LOGOUT_SUCCEEDED
-	Ï ÷ñÞóôçò %s Ýãéíå logged out áðü ôï êáíÜëé %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	¼ëïé ïé ÷ñÞóôåò logged out áðü ôï êáíÜëé %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP channel
@@ -1113,14 +1094,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s äåí ìðïñåß íá åßíáé successor óôï êáíÜëé %s ãéáôß åßíáé founder óå áõôü.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Óõãíþìç, äåí ìðüñåóå íá ãßíåé äåêôüò ï êùäéêüò.
-CHAN_PASSWORD_CHANGED
-	%s ï êùäéêüò Üëëáîå.
-CHAN_PASSWORD_CHANGED_TO
-	%s ï êùäéêüò Üëëáîå óå %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	ÐåñéãñáöÞ ôïõ %s Üëëáîå óå %s.
@@ -1271,6 +1244,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
@@ -1653,16 +1657,8 @@ CHAN_CLEARED_USERS
 	¼ëïé ïé ÷ñÞóôåò Ýãéíáí kick áðü ôï êáíÜëé %s.
 CHAN_CLEARED_INVITES
 	All invites on channel %s have been removed.
-
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS êáíÜëé
-CHAN_GETPASS_UNAVAILABLE
-	Ç åíôïëÞ GETPASS äåí åßíáé äéáèÝóéìç ãéáôß ç êùäéêïðïßçóç åßíáé óå ëåéôïõñãßá.
-CHAN_GETPASS_PASSWORD_IS
-	Ï êùäéêüò ãéá ôï êáíÜëé %s åßíáé %s.
 	
-# SENDPASS responses
+# GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY channel
 CHAN_GETKEY_NOKEY
@@ -1670,28 +1666,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS êáíÜëé
-CHAN_SENDPASS_UNAVAILABLE
-	Ç åíôïëÞ SENDPASS äåí åßíáé äéáèÝóéìç ãéáôß ç êùäéêïðïßçóç åßíáé óå ëåéôïõñãßá.
-CHAN_SENDPASS_SUBJECT
-	Ï êùäéêüò ôïõ êáíáëéïý (%s)
-CHAN_SENDPASS_HEAD
-	Ãåéá,
-CHAN_SENDPASS_LINE_1
-	Ìáò åéäïðïßçóåò íá óïõ óôåßëïõìå ôïí êùäéêü ôïõ êáíáëéïý %s ìÝóù e-mail.
-CHAN_SENDPASS_LINE_2
-	Ï êùäéêüò åßíáé %s. Ãéá ðåñéóóüôåñç áóöÜëåéá, èá ðñÝðåé íá ôï áëëÜîåéò ôï ãñçãïñüñôåñï áðü ôç óôéãìÞ ðïõ Ýëáâåò áõôü ôï e-mail.
-CHAN_SENDPASS_LINE_3
-	Áí äåí îÝñåéò ãéáôß óïõ óôÜëèçêå áõôü ôï mail, ðáñáêáëþ áãíïçóÝ ôï.
-CHAN_SENDPASS_LINE_4
-	ÐÁÑÁÊÁËÙ ÌÇÍ ÁÐÁÍÔÇÓÅÉÓ ÓÅ ÁÕÔÏ ÔÏ MAIL!
-CHAN_SENDPASS_LINE_5
-	%s administrators.
-CHAN_SENDPASS_OK
-	Ï êùäéêüò ôïõ %s óôÜëèçêå åðéôõ÷þò.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID êáíÜëé [ëüãïò]
@@ -4165,11 +4139,11 @@ CHAN_HELP_CMD_STATUS
 	               êáíÜëé
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Êáôï÷õñþíåé Ýíá êáíÜëé
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Óáò áíáãíùñßæåé ìå êùäéêü
 CHAN_HELP_CMD_SET
 	    SET        Ñõèìßæåé ôéò åðéëïãÝò êáé ôéò ðëçñïöïñßåò
 	               ôïõ êáíáëéïý	
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        ÁëëÜæåé ôçí ëßóôá ôùí AOP ÷ñçóôþí
 CHAN_HELP_CMD_SOP
@@ -4182,8 +4156,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áðüññéøçò
 CHAN_HELP_CMD_DROP
 	    DROP       Áêõñþíåé ôçí êáôï÷ýñùóç åíüò êáíáëéïý
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   ÓôÝëíåé ôïí ÷áìÝíï êùäéêü ôïõ êáíáëéïý
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4200,8 +4172,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4270,23 +4240,6 @@ CHAN_HELP_REGISTER
 	ðñþôá êáôï÷õñþóåé ôï øåõäþíõìü óáò.  Áí äåí ôï Ý÷åôå êÜíåé,
 	%R%s HELP ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ.
 
-CHAN_HELP_IDENTIFY
-	Óýíôáîç: IDENTIFY êáíÜëé êùäéêüò
-	
-	Óå áíáãíùñßæåé ï %S ùò founder ôïõ æçôïýìåíïõ êáíáëéïý.
-	ÐïëëÝò åðéëïãÝò áðáéôïýí áõôÞ ôçí åíôïëÞ ðñéí óõíå÷ßóåôå ìå ôéò
-	Üëëåò.  Ï êùäéêüò èá ðñÝðåé íá åßíáé ï ßäéïò ìå áõôüí ðïõ êÜíáôå
-	ôçí åíôïëÞ êáôï÷ýñùóçò.
-	
-CHAN_HELP_LOGOUT
-	Óýíôáîç: LOGOUT êáíÜëé øåõäþíõìï
-	
-	ÁõôÞ ç åíôïëÞ åßíáé ãéá øåõäþíõìá ðïõ äåí êÜíïõí åíôïëÞ áíáãíþñéóçò
-	ãéá ôï æçôïýìåíï êáíÜëé.
-	
-	Áí åßóáé ï founder ôïõ êáíáëéïý, ìðïñåßò íá êÜíåéò log out ïðïéïäÞðïôå,
-	åêôüò êáé áí êÜíåéò ìüíï log out ôïí åáõôü óïõ.
-
 CHAN_HELP_DROP
 	Óýíôáîç: DROP êáíÜëé
 	
@@ -4303,7 +4256,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       ÁëëÜæåé ôïí founder ôïõ êáíáëéïý
 	    SUCCESSOR     ÁëëÜæåé ôïí successor ôïõ êáíáëéïý
-	    PASSWORD      ÁëëÜæåé ôïí êùäéêü ôïõ founder
 	    DESC          ÁëëÜæåé ôçí ðåñéãñáöÞ ôïõ êáíáëéïý
 	    URL           Óõó÷åôßæåé Ýíá URL ìå ôï êáíÜëé
 	    EMAIL         Óõó÷åôßæåé Ýíá E-mail ìå ôï êáíÜëé
@@ -4342,12 +4294,6 @@ CHAN_HELP_SET_SUCCESSOR
 	Áí üìùò, ï successor Ý÷åé êáôï÷õñþóåé ðïëëÜ êáíÜëéá,
 	áí äçë Ý÷åé (%d), ôï êáíÜëé èá óâçóôåß,óáí íá ìçí åß÷å ïñéóôåß
 	successor.  Ôï íÝï øåõäþíõìï èá ðñÝðåé íá åßíáé êáôï÷õñùìÝíï.
-	
-CHAN_HELP_SET_PASSWORD
-	Óýíôáîç: SET êáíÜëé PASSWORD êùäéêü
-	
-	ÁëëÜæåôå ôïí êùäéêü ðïõ êÜíåôå åíôïëÞ áíáãíþñéóçò ùò founder ôïõ
-	êáíáëéïý.
 
 CHAN_HELP_SET_DESC
 	Óýíôáîç: SET êáíÜëé DESC ðåñéãñáöÞ
@@ -4526,6 +4472,45 @@ CHAN_HELP_SET_OPNOTICE
 	¼ôáí åíåñãïðïéåßôáé ç åíçìÝñùóç op, ï %S óôÝëíåé Ýíá notice óôïõò ops 
 	ôïõ êáíáëéïý, êÜèå öïñÜ ðïõ ÷ñçóéìïðïéïýíôáé ïé åíôïëÝò OP, DEOP, AKICK êáé 
 	ACCESS áðü êÜðïéï ÷ñÞóôç ãéá ôï êáíÜëé.
+
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
 	
 CHAN_HELP_AOP
 	Óýíôáîç: AOP êáíÜëé ADD øåõäþíõìï
@@ -5005,15 +4990,6 @@ CHAN_HELP_GETKEY
 	Óýíôáîç: GETKEY êáíÜëé
 	
 	Óáò äåß÷íåé ôï êëåéäß ôïõ óõãêåêñéìÝíïõ êáíáëéïý.
-	
-CHAN_HELP_SENDPASS
-	Óýíôáîç: SENDPASS êáíÜëé
-	
-	ÓôÝëíåé ôïí êùäéêü ôïõ áíÜëïãïõ êáíáëéïý ìÝóù e-mail address
-	óôïí founder ôïõ. ÁõôÞ ç åíôïëÞ åßíáé ÷ñÞóéìç 
-	ãéá üóïõò Ý÷ïõí ÷Üóåé ôïí êùäéêü.
-	
-	×ñçóéìïðïéåßôáé ìüíï áðü IRC operators óå óõãêåêñéìÝíá äßêôõá.
 
 CHAN_SERVADMIN_HELP
 	
@@ -5021,21 +4997,6 @@ CHAN_SERVADMIN_HELP
 	åíôïëÞ áíáãíþñéóçò ìÝóù êùäéêïý, ìðïñïýí íá äïýí ôçí access, AKICK,
 	êáé ôá level ïðïéïõäÞðïôå êáíáëéïý.
 	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Óýíôáîç: LOGOUT êáíÜëé [øåõäþíõìï]
-	
-	Ìå áõôÞ ôçí åíôïëÞ, Ýíáò founder Þ êÜðïéïò ðïõ Ý÷åé âáèìü founder êÜíåé ôï 
-	áíôßèåôï áðü ôçí åíôïëÞ áíáãíþñéóçò (no-identify).
-	    
-	Ìðïñåß Ýíáò founder åíüò êáíáëéïý, íá êÜíåé log out ïðïéïäÞðïôå,
-	áêüìá êáé ôïí åáõôü ôïõ.
-	
-	Áí åßóáé Services Operator, ìðïñåßò íá êÜíåéò log out 
-	ïðïéïäÞðïå áðü ôï êáíÜëé ÷ùñßò íá åßóáé ï founder Þ íá ãßíåéò ï founder
-	ôïõ êáíáëéïý. Åðßóçò, ìðïñåßò íá ÷ñçóéìïðïéÞóåéò áõôÞ ôçí ðáñÜìåôñï ãéá
-	øåõäþíõìï; ìå áõôü èá êÜíåéò log out üëïõò ôïõò áíáãíùñéóìÝíïõò (identified)
-	÷ñÞóôåò ôïõ êáíáëéïý.
-	
 CHAN_SERVADMIN_HELP_DROP
 	Óýíôáîç: DROP êáíÜëé
 	
diff --git a/lang/hun.l b/lang/hun.l
index c84aecfb7..e2256a610 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1008,6 +1008,12 @@ CHAN_LEVEL_TOPIC
 	Használhatja a TOPIC parancsot
 CHAN_LEVEL_INFO
 	Használhatja az INFO parancsot az ALL opcióval
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatikus válaszok
 CHAN_IS_REGISTERED
@@ -1025,7 +1031,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER #szoba jelszó leírás
+	REGISTER #szoba leírás
 CHAN_REGISTER_DISABLED
 	Sajnálom,  a csatorna regisztráció jelenleg szünetel.
 CHAN_REGISTER_NOT_LOCAL
@@ -1044,36 +1050,11 @@ CHAN_REGISTRATION_FAILED
 	Sajnálom,  regisztráció sikertelen.
 CHAN_REGISTERED
 	Regisztráltam a %s csatornát a (%s) nickre.
-CHAN_PASSWORD_IS
-	Csatorna jelszava: %s - Jegyezd fel a késõbbi használathoz.
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
 	Please use the symbol of # when attempting to register
 
-
-# IDENTIFY válaszok
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY   #szoba   jelszó
-CHAN_IDENTIFY_FAILED
-	Sajnálom,  azonosítás sikertelen.
-CHAN_IDENTIFY_SUCCEEDED
-	Jelszavad elfogadva - founder szintû a hozzáférésed a %s csatornán.
-
-# LOGOUT válaszok
-CHAN_LOGOUT_SYNTAX
-	LOGOUT #szoba nicknév
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT #szoba  [nicknév]
-CHAN_LOGOUT_SUCCEEDED
-	%s felhasználó kijelentkezett a %s csatornáról.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Minden felhasználó kijelentkezett a %s csatornáról (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP válaszok
 CHAN_DROP_SYNTAX
 	DROP #szoba
@@ -1104,14 +1085,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s nem lehet a %s csatorna successora, mert õ a founder is.
 
-# SET PASSWORD válaszok
-CHAN_SET_PASSWORD_FAILED
-	A jelszó beállítása sikertelen.
-CHAN_PASSWORD_CHANGED
-	%s csatorna jelszava megváltozott.
-CHAN_PASSWORD_CHANGED_TO
-	%s csatorna új jelszava: %s.
-
 # SET DESC válaszok
 CHAN_DESC_CHANGED
 	%s csatorna leírás megváltoztatva: %s.
@@ -1262,6 +1235,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP üzenetek
 CHAN_AOP_SYNTAX
 	AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]
@@ -1648,43 +1652,13 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	All invites on channel %s have been removed.
 
-# GETPASS válaszok
-CHAN_GETPASS_SYNTAX
-	GETPASS #szoba
-CHAN_GETPASS_UNAVAILABLE
-	GETPASS elérhetetlen, mig az encryption használatban van.
-CHAN_GETPASS_PASSWORD_IS
-	A (%s) csatorna  jelszava: %s.
-
-# SENDPASS válaszok
+# GETKEY válaszok
 CHAN_GETKEY_SYNTAX
 	GETKEY channel
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
-
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS #szoba
-CHAN_SENDPASS_UNAVAILABLE
-	SENDPASS elérhetetlen, amíg az encryption használatban van
-CHAN_SENDPASS_SUBJECT
-	Csatorna jelszava: (%s)
-CHAN_SENDPASS_HEAD
-	Hi,
-CHAN_SENDPASS_LINE_1
-	Kérted a szoba jelszavának megküldését %s címre.
-CHAN_SENDPASS_LINE_2
-	%s a szobajeszó.Biztonság kedvéért váltóztasd meg olvasás után
-CHAN_SENDPASS_LINE_3
-	Ha nem te kérted a levelet akkor töréld és feljts el
-CHAN_SENDPASS_LINE_4
-	KÉRLEN NE VÁLASZOLJ A LEVÉLRE!
-CHAN_SENDPASS_LINE_5
-	%s administrators.
-CHAN_SENDPASS_OK
-	Jelszó %s elküldve.
 	
 # FORBID válaszok
 CHAN_FORBID_SYNTAX
@@ -4088,10 +4062,10 @@ CHAN_HELP_CMD_STATUS
 	               szintjét a megadott csatornán
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Szoba regisztrálása
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Azonosíthatod magad a jelszavaddal
 CHAN_HELP_CMD_SET
 	    SET        Beállíthatod a csatornád opcióit
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        AutoOperátor lista beállítása
 CHAN_HELP_CMD_SOP
@@ -4104,8 +4078,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      AutoKirúgás listára teheted a "rossz" usereket
 CHAN_HELP_CMD_DROP
 	    DROP       Törölheted a csatornád regisztrációját
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Elveszett a jelszavad? Jelszó küldés.
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4122,8 +4094,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4194,22 +4164,6 @@ CHAN_HELP_REGISTER
 	regisztrálnod kell a nickneved és azonosítanod kell
 	magad. (NickServ identify jelszó)
 	Ha még nem nézted meg, akkor lásd még: %R%s HELP.
-	
-CHAN_HELP_IDENTIFY
-	Syntax: IDENTIFY #szoba jelszó
-	
-	%S a parancs beírása után founder szintet ad a csatornán.
-	Több parancs kiadása elõtt szükséges, hogy használd ezt.
-	A jelszónak egyeznie kell a megadott jelszóval.
-	
-CHAN_HELP_LOGOUT
-	Syntax: LOGOUT #szoba nicknév
-	
-	Ez a parancs kijelentkezésre birja a nicket, vagyis újra
-	kell azonosítania, hogy újra megkapja a hozzáférést.
-	
-	Ha te vagy a szoba founderje, akkor bárkit ki tudsz
-	jelentkeztetni, vagy ki tudsz jelentkezni akár te is.
 
 CHAN_HELP_DROP
 	Syntax: DROP #szoba
@@ -4267,12 +4221,6 @@ CHAN_HELP_SET_SUCCESSOR
 	is ez történik, ha nem volt megadva successor.
 	A nicknek regisztrálnak kell lennie.
 
-CHAN_HELP_SET_PASSWORD
-	Syntax: SET #szoba PASSWORD  jelszó
-	
-	Beállítja a founder jelszót a csatornára, amivel
-	a founder azonosíthatja magát.
-
 CHAN_HELP_SET_DESC
 	Syntax: SET #szoba DESC leírás
 	
@@ -4444,6 +4392,45 @@ CHAN_HELP_SET_OPNOTICE
 	fog küldeni a csatornára, amikor a felhasználók használják
 	az OP, VOICE, vagy a hozzájuk kapcsolódó parancsokat a
 	szoban.
+
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
 	
 CHAN_HELP_AOP
 	Syntax: AOP #szoba ADD nick
@@ -4945,35 +4932,12 @@ CHAN_HELP_GETKEY
 	Syntax: GETKEY #szoba 
 	
 	Megadja a szoba kulcsot.
-	
-CHAN_HELP_SENDPASS
-	Syntax: SENDPASS #szoba
-	
-	Elküldi E-mailben a csatornádra beállított jelszót. Neked
-	a szoba founderjének kell lenned, hogy használhasd ezt
-	a parancsot és elõször azonosítanod kell magadat.
-	
-	Lehet korlátozni IRC operatorok részére a hálózaton.
-	
+
 CHAN_SERVADMIN_HELP
 	
 	Szervíz adminok tudják droppolni a csatornákat anélkül, 
 	hogy a szoba jelszót használnának, és megnézhetika az
 	access, AKICK, és beállitási szint listát a csatornán.
-	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Syntax: LOGOUT #szoba [nicknév]
-	
-	A parancs naplózza a kijelentekeztetést, neki ójra kell
-	azonosítani magukat,hogy visszakapják a hozzáféréseiket.	
-	
-	Ha ta  vagy a csatörna alpító, képes vagy kijelentkeztetni
-	mást, te képes vagy magad is.	
-	
-	Ha szervíz admin vagy akkor kijelentekeztethetsz valakit a 
-	csatornáról anélkül, hogy te lenneél a founder.Elhagyhatod
-	a nincnév paramétert, és akkor az összes bejelentkezett 
-	felhasználót kijelentkezteted a csatornáról.	
 
 CHAN_SERVADMIN_HELP_DROP
 	Syntax: DROP #szoba
diff --git a/lang/it.l b/lang/it.l
index 93e39fbd6..273be9e66 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1000,6 +1000,12 @@ CHAN_LEVEL_TOPIC
 	Permette l'uso del comando TOPIC
 CHAN_LEVEL_INFO
 	Permette l'uso del comando INFO con l'opzione ALL
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1017,7 +1023,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER canale password descrizione
+	REGISTER canale descrizione
 CHAN_REGISTER_DISABLED
 	Spiacente, la registrazione dei canali è temporaneamente disabilitata.
 CHAN_REGISTER_NOT_LOCAL
@@ -1036,36 +1042,11 @@ CHAN_REGISTRATION_FAILED
 	Spiacente, la registrazione non è andata a buon fine.
 CHAN_REGISTERED
 	Il canale %s è stato registrato sotto il tuo nick: %s.
-CHAN_PASSWORD_IS
-	La tua password di canale è %s - non dimenticarla!
 CHAN_REGISTER_NONE_CHANNEL
 	Hai provato a registrare un canale non esistente %s
 CHAN_SYMBOL_REQUIRED
 	Per favore usa il simbolo # provando a registrare
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY canale password
-CHAN_IDENTIFY_FAILED
-	Spiacente, l'identificazione è fallita.
-CHAN_IDENTIFY_SUCCEEDED
-	Password accettata - sei identificato come fondatore di %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT canale nick
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT canale [nick]
-CHAN_LOGOUT_SUCCEEDED
-	L'utente %s non è più identificato per il canale %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Tutti gli utenti non sono più identificati per il canale %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	Non puoi eseguire il logout da %s (sei founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s non è stato loggato in %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP canale
@@ -1096,14 +1077,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s non può essere il successore del canale %s perché ne è il fondatore.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Spiacente, il cambio di password non è andato a buon fine.
-CHAN_PASSWORD_CHANGED
-	La password di %s è stata cambiata.
-CHAN_PASSWORD_CHANGED_TO
-	La password di %s è stata impostata a %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	La descrizione di %s è stata impostata a %s.
@@ -1254,6 +1227,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	Il sistema xOP non è disponibile.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]
@@ -1624,15 +1628,7 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	Tutti gli invites sono stati rimossi dal canale %s.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS canale
-CHAN_GETPASS_UNAVAILABLE
-	Il comando GETPASS è inutilizzabile perché è in uso la criptazione dei dati.
-CHAN_GETPASS_PASSWORD_IS
-	La chiave (password) del canale %s è %s.
-
-# SENDPASS responses
+# GETHEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY canale
 CHAN_GETKEY_NOKEY
@@ -1640,28 +1636,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	La key per il canale %s è %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS canale
-CHAN_SENDPASS_UNAVAILABLE
-	Il comando SENDPASS è inutilizzabile perché è in uso la criptazione dei dati.
-CHAN_SENDPASS_SUBJECT
-	Password del canale (%s)
-CHAN_SENDPASS_HEAD
-	Salve,
-CHAN_SENDPASS_LINE_1
-	Hai richiesto di ricevere via e-mail la password del canale %s.
-CHAN_SENDPASS_LINE_2
-	La password è %s. Per ragioni di sicurezza, ti invitiamo a cambiarla il più presto possibile con il comando "/cs set canale password".
-CHAN_SENDPASS_LINE_3
-	Se non sai perché hai ricevuto questa mail, ignorala.
-CHAN_SENDPASS_LINE_4
-	IMPORTANTE! Non rispondere a questa mail!
-CHAN_SENDPASS_LINE_5
-	Gli amministratori di %s.
-CHAN_SENDPASS_OK
-	La password di %s è stata inviata.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID canale [motivo]
@@ -4040,10 +4014,10 @@ CHAN_HELP_CMD_STATUS
 	                un utente su un canale
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registra un canale
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Ti identifica come fondatore di un canale
 CHAN_HELP_CMD_SET
 	    SET        Imposta le opzioni e le informazioni di canale
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Modifica la lista degli utenti AOP
 CHAN_HELP_CMD_SOP
@@ -4056,8 +4030,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Modifica la lista AutoKick
 CHAN_HELP_CMD_DROP
 	    DROP       Annulla la registrazione di un canale
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Invia la password del proprio canale via e-mail
 CHAN_HELP_CMD_BAN
 	    BAN        Permette di bannare un utente
 CHAN_HELP_CMD_CLEAR
@@ -4074,8 +4046,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Espelle un utente da un canale (kick)
 CHAN_HELP_CMD_LIST
 	    LIST       Mostra la lista dei canali
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Deidentifica dal canale specificato
 CHAN_HELP_CMD_OP
 	    OP         Assegna lo stato di operatore a un utente (+o)
 CHAN_HELP_CMD_TOPIC
@@ -4145,24 +4115,6 @@ CHAN_HELP_REGISTER
 	registrato il tuo nick. Se non l'hai fatto, digita
 	%R%s HELP per avere informazioni su come farlo.
 
-CHAN_HELP_IDENTIFY
-	Sintassi: IDENTIFY canale password
-	
-	Ti identifica con %S come fondatore del canale specificato.
-	Molti comandi richiedono che tu sia identificato per
-	poter essere eseguiti. La password deve essere la stessa
-	utilizzata con il comando REGISTER.
-	
-CHAN_HELP_LOGOUT
-	Sintassi: LOGOUT canale nick
-	
-	Annulla l'effetto del comando IDENTIFY per il canale
-	specificato, cioè fa in modo che tu non sia più riconosciuto
-	per quel canale.
-	
-	Se sei il fondatore del canale puoi deidentificare chiunque,
-	altrimenti puoi deidentificare solo te stesso.
-
 CHAN_HELP_DROP
 	Sintassi: DROP canale
 	
@@ -4180,7 +4132,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Imposta il fondatore del canale
 	    SUCCESSOR     Imposta il successore del fondatore del canale
-	    PASSWORD      Imposta la password del canale
 	    DESC          Imposta la descrizione del canale
 	    URL           Associa un URL al canale
 	    EMAIL         Associa un indirizzo e-mail al canale
@@ -4225,12 +4176,6 @@ CHAN_HELP_SET_SUCCESSOR
 	successore.
 	Il nick specificato deve essere registrato.
 
-CHAN_HELP_SET_PASSWORD
-	Sintassi: SET canale PASSWORD password
-	
-	Imposta la password del canale, utilizzata per essere
-	identificati come fondatori del canale stesso.
-
 CHAN_HELP_SET_DESC
 	Sintassi: SET canale DESC descrizione
 	
@@ -4422,6 +4367,45 @@ CHAN_HELP_SET_OPNOTICE
 	Quando l'opzione è attiva, %S invierà un notice al
 	canale quando vengono usati i comandi OP e DEOP.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Sintassi: AOP canale ADD nick
 	          AOP canale DEL {nick | numero | lista}
@@ -4943,16 +4927,6 @@ CHAN_HELP_GETKEY
 	Sintassi: GETKEY canale
 	
 	Restituisce la chiave (password) del canale specificato.
-	
-CHAN_HELP_SENDPASS
-	Sintassi: SENDPASS canale
-	
-	Invia la password del canale specificato all'indirizzo e-mail
-	del fondatore (specificato nelle opzioni del nick del fondatore
-	stesso). Questo comando è utile quando un utente ha dimenticato
-	la password del canale.
-	
-	Potrebbe essere disponibile soltanto per gli IrcOp.
 
 CHAN_SERVADMIN_HELP
 	
@@ -4960,20 +4934,6 @@ CHAN_SERVADMIN_HELP
 	senza che siano identificati con la password, e possono vedere
 	la lista di accesso, la lista AKICK e le liste di configurazione
 	dei livelli per qualsiasi canale.
-	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Sintassi: LOGOUT canale [nick]
-	
-	Questo comando fa si' che il nick specificato non sia più
-	identificato sul canale indicato.
-	
-	Se sei il fondatore del canale, puoi deidentificare chiunque,
-	altrimenti puoi deidentificare solo te stesso.
-	
-	Se sei un Services Operator, puoi deidentificare chiunque da
-	qualsiasi canale senza dover essere il fondatore del canale.
-	Inoltre puoi omettere il parametro nick; questo farà in modo
-	che tutti gli utenti siano deidentificati dal canale.
 
 CHAN_SERVADMIN_HELP_DROP
 	Sintassi: DROP canale
diff --git a/lang/nl.l b/lang/nl.l
index 8bd24005d..56ce81d2a 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -1015,6 +1015,12 @@ CHAN_LEVEL_TOPIC
 	Toegestaan om TOPIC te gebruiken
 CHAN_LEVEL_INFO
 	Toegestaan om INFO met de ALL optie te gebruiken
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1032,7 +1038,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER kanaal wachtwoord beschrijving
+	REGISTER kanaal beschrijving
 CHAN_REGISTER_DISABLED
 	Sorry, kanaal registratie is tijdelijk uitgeschakeld.
 CHAN_REGISTER_NOT_LOCAL
@@ -1051,36 +1057,11 @@ CHAN_REGISTRATION_FAILED
 	Sorry, registratie gefaald.
 CHAN_REGISTERED
 	Kanaal %s is geregistreerd onder jouw nickname: %s
-CHAN_PASSWORD_IS
-	Het wachtwoord van je kanaal is %s - onthoudt dit voor later gebruik.
 CHAN_REGISTER_NONE_CHANNEL
 	Je hebt geprobeerd om niet-bestaand kanaal %s te registeren.
 CHAN_SYMBOL_REQUIRED
 	Gebruik het # symbool wanner je probeert een kanaal te registeren.
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY kanaal wachtwoord
-CHAN_IDENTIFY_FAILED
-	Sorry, identificatie gefaald.
-CHAN_IDENTIFY_SUCCEEDED
-	Wachtwoord goedgekeurd - je hebt nu stichter-niveau toegang to %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT kanaal nickname
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT kanaal [nickname]
-CHAN_LOGOUT_SUCCEEDED
-	Gebruiker %s is uitgelogd van kanaal %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Alle geidentificeerde gebruikers zijn uitgelogd van kanaal %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP kanaal
@@ -1111,14 +1092,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s kan de opvolger niet zijn op kanaal %s omdat hij/zij founder is.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Sorry, kan wachtwoord niet zetten.
-CHAN_PASSWORD_CHANGED
-	%s wachtwoord veranderd.
-CHAN_PASSWORD_CHANGED_TO
-	%s wachtwoord veranderd in %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	Beschrijving van %s veranderd in %s.
@@ -1270,6 +1243,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]
@@ -1641,15 +1645,7 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	All invites on channel %s have been removed.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS kanaal
-CHAN_GETPASS_UNAVAILABLE
-	GETPASS commando onbeschikbaar wegens encryptie van de gegevens.
-CHAN_GETPASS_PASSWORD_IS
-	Wachtwoord voor kanaal %s is %s.
-	
-# SENDPASS responses
+# GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY channel
 CHAN_GETKEY_NOKEY
@@ -1657,28 +1653,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS kanaal
-CHAN_SENDPASS_UNAVAILABLE
-	SENDPASS commando onbeschikbaar wegens encryptie van de gegevens.
-CHAN_SENDPASS_SUBJECT
-	Kanaal wachtwoord (%s)
-CHAN_SENDPASS_HEAD
-	Hallo,
-CHAN_SENDPASS_LINE_1
-	Je hebt het wachtwoord aangevraag van kanaal %s via e-mail.
-CHAN_SENDPASS_LINE_2
-	Het wachtwoord is %s. Wegens veiligheidsredenen zou je deze zo snel mogelijk moeten veranderen.
-CHAN_SENDPASS_LINE_3
-	Als je niet weet waarom deze e-mail verstuurd is, negeer deze dan.
-CHAN_SENDPASS_LINE_4
-	ANTWOORD NIET OP DEZE MAIL!
-CHAN_SENDPASS_LINE_5
-	%s beheerders.
-CHAN_SENDPASS_OK
-	Wachtwoord %s is verstuurd.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID kanaal [reden]
@@ -4125,10 +4099,10 @@ CHAN_HELP_CMD_STATUS
 	               op een kanaal weer
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registreer een kanaal
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Identificeer jezelf met je wachtwoord
 CHAN_HELP_CMD_SET
 	    SET        Stel kanaal opties en informatie in
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Wijzig de lijst van AOP's
 CHAN_HELP_CMD_SOP
@@ -4141,8 +4115,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Beheer de AutoKick lijst
 CHAN_HELP_CMD_DROP
 	    DROP       Annuleer een kanaalregistratie
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Wachtwoord vergeten?
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4159,8 +4131,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4227,24 +4197,6 @@ CHAN_HELP_REGISTER
 	bekijk dan %R%s HELP voor informatie over hoe je
 	dit kunt doen.
 
-CHAN_HELP_IDENTIFY
-	Gebruik: IDENTIFY kanaal wachtwoord
-	
-	Identificeert je bij %S als de stichter van het gegeven
-	kanaal. Veel commando's verplichten je dit commando te
-	gebruiken voordat je ze gebruikt. Het wachtwoord moet
-	identiek zijn aan degene verstuurd met het REGISTER
-	commando.
-
-CHAN_HELP_LOGOUT
-	Gebruik: LOGOUT kanaal nick
-	
-	Dit commando zorgt ervoor dat de opgegeven nick niet meer
-	geidentificeerd is voor het opgegeven kanaal
-	
-	Als je de stichter van het kanaal bent kan je iedereen
-	uitloggen, anders alleen jezelf.
-
 CHAN_HELP_DROP
 	Gebruik: DROP kanaal
 	
@@ -4262,7 +4214,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Stelt de stichter van het kanaal in
 	    SUCCESSOR     Stelt de opvolger van het kanaal in
-	    PASSWORD      Stelt het stichterwachtwoord in
 	    DESC          Stelt de kanaalbeschrijving in
 	    URL           Associeer een URL met het kanaal
 	    EMAIL         Associate een E-mail adres met het kanaal
@@ -4306,12 +4257,6 @@ CHAN_HELP_SET_SUCCESSOR
 	er geen opvolger is ingesteld. De nieuwe nick moet een
 	geregistreerde nick zijn.
 
-CHAN_HELP_SET_PASSWORD
-	Gebruik: SET kanaal PASSWORD wachtwoord
-	
-	Stelt het wachtwoord in dat gebruikt wordt om de stichter
-	van het kanaal te identificeren.
-
 CHAN_HELP_SET_DESC
 	Gebruik: SET kanaal DESC beschrijving
 	
@@ -4502,6 +4447,45 @@ CHAN_HELP_SET_OPNOTICE
 	het kanaal sturen wanneer de OP of DEOP commando's worden
 	gebruikt voor een gebruiker in het kanaal.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Gebruik: AOP kanaal ADD nick
 	         AOP kanaal DEL {nick | entry-nr | lijst}
@@ -5001,16 +4985,6 @@ CHAN_HELP_GETKEY
 	Gebruik: GETKEY kanaal
 	
 	Geef de key van het gegeven kanaal terug.
-	
-CHAN_HELP_SENDPASS
-	Gebruik: SENDPASS kanaal
-	
-	Stuur het wachtwoord van het gegeven kanaal naar het email
-	adres gespecificeerd in NickServ voor de stichter van het
-	kanaal. Dit commando is erg bruikbaar om verloren wacht-
-	woorden terug te halen.
-	
-	Kan gelimiteerd zijn tot IRC operators op sommige netwerken.
 
 CHAN_SERVADMIN_HELP
 	
@@ -5018,20 +4992,6 @@ CHAN_SERVADMIN_HELP
 	ze hoeven te indentificeren via een wachtwoord, en kunnen de
 	toegangs-, AKICK-, en niveau-lijsten bekijken voor elk kanaal.
 
-CHAN_SERVADMIN_HELP_LOGOUT
-	Gebruik: LOGOUT kanaal [nick]
-	
-	Dit kanaal zorgt ervoor dat de gegeven nick niet meer
-	geidentificeerd is voor het gegeven kanaal.
-	
-	Als je de stichter van het kanaal bent kun je iedereen
-	uitloggen, anders kun je alleen jezelf uitloggen.
-	
-	Als je een Services Operatorstrator bent kun je iedereen
-	uitloggen van elke kanaal zonder daar stichter-rechten te
-	hebben. Je kan ook het nick-paramenter weglaten: dit
-	zorgt ervoor dat iedereen uitgelogd zal worden.
-
 CHAN_SERVADMIN_HELP_DROP
 	Gebruik: DROP kanaal
 	
diff --git a/lang/pl.l b/lang/pl.l
index 12ff00ec9..da09681dd 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1306,6 +1306,15 @@ CHAN_LEVEL_TOPIC
 CHAN_LEVEL_INFO
 	Pozwala u¿ywaæ opcji ALL w komendzie INFO
 
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
+
 # Automatic responses
 CHAN_IS_REGISTERED
 	Ten kana³ zosta³ zarejestrowany z %s.
@@ -1324,7 +1333,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER kana³ has³o opis
+	REGISTER kana³ opis
 
 CHAN_REGISTER_DISABLED
 	Rejestracja kana³ów jest tymczasowo wy³±czona.
@@ -1354,41 +1363,12 @@ CHAN_REGISTERED
 	Kana³ %s zosta³ teraz zarejestrowany.
 	Jako %s jeste¶ od teraz jego w³a¶cicielem.
 
-CHAN_PASSWORD_IS
-	Has³o do Twojego kana³u to %s
-
 CHAN_REGISTER_NONE_CHANNEL
 	Próbujesz rejestrowaæ nieistniej±cy kana³ %s
 
 CHAN_SYMBOL_REQUIRED
 	U¿yj symboli # lub & podczas rejestracji
 
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY kana³ has³o
-
-CHAN_IDENTIFY_FAILED
-	Identyfikacja nie powiod³a siê.
-
-CHAN_IDENTIFY_SUCCEEDED
-	Has³o przyjête - masz uprawnienia w³a¶ciciela kana³u %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT kana³ nick
-
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT kana³ [nick]
-
-CHAN_LOGOUT_SUCCEEDED
-	U¿ytkownik %s zosta³ wylogowany z kana³u %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Wylogowano zidentyfikowanych u¿ytkowników z kana³u %s (bez w³a¶ciciela).
-CHAN_LOGOUT_FOUNDER_FAILED
-	Nie mo¿esz siê wylogowaæ z %s (jeste¶ w³a¶cicielem).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	U¿ytkownik %s nie by³ zalogowany na kanale %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP kana³
@@ -1426,16 +1406,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s nie mo¿e byæ zastêpc± na kanale %s, poniewa¿ jest jego w³a¶cicielem.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Zmiana has³a nie powiod³a siê.
-
-CHAN_PASSWORD_CHANGED
-	Has³o do kana³u %s zosta³o zmienione.
-
-CHAN_PASSWORD_CHANGED_TO
-	Has³o do kana³u %s zosta³o zmienione na %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	Opis kana³u %s zosta³ zmieniony na %s.
@@ -1623,6 +1593,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	System xOP nie jest dostêpny.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]
@@ -2151,16 +2152,6 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	Wszystkie zaproszenia z kana³u %s zosta³y usuniête.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS kana³
-
-CHAN_GETPASS_UNAVAILABLE
-	Komenda GETPASS nie dzia³a, bo has³a s± szyfrowane.
-
-CHAN_GETPASS_PASSWORD_IS
-	Has³o kana³u %s to %s.
-
 # GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY kana³
@@ -2171,38 +2162,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Kluczem do kana³u %s jest %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS kana³
-
-CHAN_SENDPASS_UNAVAILABLE
-	Komenda SENDPASS nie dzia³a, bo has³a s± szyfrowane.
-
-CHAN_SENDPASS_SUBJECT
-	Has³o do kana³u %s
-
-CHAN_SENDPASS_HEAD
-	Witaj!
-
-CHAN_SENDPASS_LINE_1
-	Za¿±da³e¶(a¶) wys³ania has³a do kana³u %s na e-mail.
-
-CHAN_SENDPASS_LINE_2
-	Twoje has³o to: %s.
-	Dla w³asnego bezpieczeñstwa nale¿y to has³o natychmiast zmieniæ na inne.
-
-CHAN_SENDPASS_LINE_3
-	Je¶li nie wiesz dlaczego ta wiadomo¶æ dotar³a do Ciebie zignoruj j±. Je¶li ta sytuacja bêdzie siê powtarzaæ skontaktuj siê z administratorem sieci.
-
-CHAN_SENDPASS_LINE_4
-	PROSZÊ NIE ODPOWIADAÆ NA T¡ WIADOMO¦Æ!
-
-CHAN_SENDPASS_LINE_5
-	Administratorzy sieci %s.
-
-CHAN_SENDPASS_OK
-	Has³o do kana³u %s zosta³o wys³ane.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID kana³ [powód]
@@ -5120,12 +5079,12 @@ CHAN_HELP_CMD_STATUS
 CHAN_HELP_CMD_REGISTER
 	    REGISTER    Rejestruje kana³
 
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY    Identyfikuje w³a¶ciciela kana³u
-
 CHAN_HELP_CMD_SET
 	    SET         Modyfikuje ustawienia kana³u
 
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
+
 CHAN_HELP_CMD_AOP
 	    AOP         Zarz±dza list± AOP (operatorów)
 
@@ -5144,9 +5103,6 @@ CHAN_HELP_CMD_AKICK
 CHAN_HELP_CMD_DROP
 	    DROP        Usuwa kana³
 
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS    Pomaga odzyskaæ utracone has³o
-
 CHAN_HELP_CMD_BAN
 	    BAN         Banuje wskazan± osobê na kanale
 
@@ -5171,9 +5127,6 @@ CHAN_HELP_CMD_KICK
 CHAN_HELP_CMD_LIST
 	    LIST        Listuje zarejestrowane kana³y pasuj±ce do wzorca
 
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT      Wyloguje wskazan± osobê
-
 CHAN_HELP_CMD_OP
 	    OP          Nadaje wskazanej osobie uprawnienia operatora
 
@@ -5252,24 +5205,6 @@ CHAN_HELP_REGISTER
 	zarejestrowany nick, aby uzyskaæ wiêcej informacji
 	na temat zarz±dzania nickiem wpisz: %R%s HELP
 
-CHAN_HELP_IDENTIFY
-	Sk³adnia: IDENTIFY kana³ has³o
-	
-	Autoryzuje u¿ytkownika w serwisie %S jako w³a¶ciciela
-	wskazanego kana³u. Wiele wa¿nych komend wymaga dokonania
-	identyfikacji przed ich u¿yciem. Has³em jest to samo
-	has³o, którego u¿yto przy komendzie REGISTER.
-
-CHAN_HELP_LOGOUT
-	Sk³adnia: LOGOUT kana³ nick
-	
-	Pozwala na wylogowanie wskazanego u¿ytkownika z kana³u.
-	W celu odzyskania uprawnieñ u¿ytkownik bêdzie musia³
-	ponownie siê zidentyfikowaæ.
-	
-	Ka¿dy mo¿e wylogowaæ siebie, natomiast w³a¶ciciel kana³u
-	mo¿e wylogowaæ ka¿dego.
-
 CHAN_HELP_DROP
 	Sk³adnia: DROP kana³
 	
@@ -5287,7 +5222,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Ustawia nick w³a¶ciciela kana³u
 	    SUCCESSOR     Ustawia nick spadkobiercy kana³u
-	    PASSWORD      Ustawia has³o w³a¶ciciela
 	    DESC          Ustawia opis kana³u
 	    URL           Przypisuje adres www do kana³u
 	    EMAIL         Przypisuje adres e-mail do kana³u
@@ -5327,10 +5261,6 @@ CHAN_HELP_SET_SUCCESSOR
 	spadkobiercy, który staje siê nowym w³a¶cicielem.
 	Je¿eli spadkobierca jest w³a¶cicielem zbyt du¿ej
 	liczby kana³ów (%d) to kana³ zostanie odrejestrowany.
-CHAN_HELP_SET_PASSWORD
-	Sk³adnia: SET kana³ PASSWORD has³o
-	
-	Zmienia has³o w³a¶ciciela kana³u.
 
 CHAN_HELP_SET_DESC
 	Sk³adnia: SET kana³ DESC opis
@@ -5520,6 +5450,45 @@ CHAN_HELP_SET_OPNOTICE
 	informowa³ u¿ytkowników przebywaj±cych na kanale,
 	kiedy zostanie u¿yta komenda OP lub DEOP.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Sk³adnia: AOP kana³ ADD nick
 	          AOP kana³ DEL {nick | numer | lista}
@@ -6034,16 +6003,6 @@ CHAN_HELP_GETKEY
 	
 	Zwraca has³o wstêpu do wskazanego kana³u.
 
-CHAN_HELP_SENDPASS
-	Sk³adnia: SENDPASS kana³
-	
-	Wysy³a has³o do podanego kana³u na adres e-mail
-	przypisany do nicka w³a¶ciciela kana³u. Ta komenda
-	pomaga odzyskaæ zapomniane has³o.
-	
-	Ta komenda w niektórych sieciach mo¿e byæ dostêpna
-	jedynie dla osób z uprawnieniami IRC operatora.
-
 CHAN_SERVADMIN_HELP
 	
 	Administratorzy serwisów mog± usun±æ ka¿dy kana³
@@ -6051,20 +6010,6 @@ CHAN_SERVADMIN_HELP
 	Mog± przegl±daæ listê dostêpu ka¿dego kana³u,
 	listê AKICK, ustawienia poziomów dostêpu itd.
 
-CHAN_SERVADMIN_HELP_LOGOUT
-	Sk³adnia: LOGOUT kana³ nick
-	
-	Pozwala na wylogowanie wskazanego u¿ytkownika z kana³u.
-	W celu odzyskania uprawnieñ u¿ytkownik bêdzie musia³
-	ponownie siê zidentyfikowaæ.
-	
-	Ka¿dy mo¿e wylogowaæ siebie, natomiast w³a¶ciciel kana³u
-	mo¿e wylogowaæ ka¿dego.
-	
-	Administrator serwisów mo¿e wylogowaæ dowoln± osobê
-	z dowolnego kana³u. Pominiêcie nicka powoduje wylogowanie
-	wszystkich zidentyfikowanych osób.
-
 CHAN_SERVADMIN_HELP_DROP
 	Sk³adnia: DROP kana³
 	
diff --git a/lang/pt.l b/lang/pt.l
index 9b72d2bdf..0f5bd44d7 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -1017,6 +1017,12 @@ CHAN_LEVEL_TOPIC
 	Permitido o uso do comando TOPIC
 CHAN_LEVEL_INFO
 	Permitido o uso do comando INFO com a opção ALL
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1034,7 +1040,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER canal senha descrição
+	REGISTER canal descrição
 CHAN_REGISTER_DISABLED
 	Desculpe, o registro de canais está temporariamente desativado.
 CHAN_REGISTER_NOT_LOCAL
@@ -1053,35 +1059,11 @@ CHAN_REGISTRATION_FAILED
 	Desculpe, o registro falhou.
 CHAN_REGISTERED
 	O canal %s está registrado sob seu nick: %s
-CHAN_PASSWORD_IS
-	A senha do seu canal é %s - guarde ela para uso posterior.
 CHAN_REGISTER_NONE_CHANNEL
 	Você tentou registrar um canal não existente: %s
 CHAN_SYMBOL_REQUIRED
 	Por favor use o símbolo # quando tentar registrar
 
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY canal senha
-CHAN_IDENTIFY_FAILED
-	Desculpe, a identificação falhou.
-CHAN_IDENTIFY_SUCCEEDED
-	Senha aceita - você está sendo reconhecido agora como dono do %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT canal nick
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT canal [nick]
-CHAN_LOGOUT_SUCCEEDED
-	Usuário %s foi desconectado do canal %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Todos os usuários registrados foram desconectados do canal %s (except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP canal
@@ -1112,14 +1094,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s não pode ser o successor do canal %s porque ele é o founder.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Desculpe, a mudança de senha falhou.
-CHAN_PASSWORD_CHANGED
-	A senha do %s foi alterada.
-CHAN_PASSWORD_CHANGED_TO
-	A senha do %s foi alterada para %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	Descrição do canal %s alterada para %s.
@@ -1270,6 +1244,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]
@@ -1641,14 +1646,6 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	Todos os Invites do canal %s foram removidos.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS canal
-CHAN_GETPASS_UNAVAILABLE
-	Comando GETPASS indisponível: modo de encriptação em uso.
-CHAN_GETPASS_PASSWORD_IS
-	Senha do canal %s é %s.
-	
 # GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY canal
@@ -1657,28 +1654,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS canal
-CHAN_SENDPASS_UNAVAILABLE
-	Comando SENDPASS indisponível: modo de encriptação em uso.
-CHAN_SENDPASS_SUBJECT
-	Senha do canal (%s)
-CHAN_SENDPASS_HEAD
-	Olá,
-CHAN_SENDPASS_LINE_1
-	Você pediu para receber a senha do canal %s por e-mail.
-CHAN_SENDPASS_LINE_2
-	A senha é %s. Por motivos de segurança, recomendamos que você mude a senha assim que receber este e-mail.
-CHAN_SENDPASS_LINE_3
-	Se você não sabe porque este e-mail lhe foi enviado, por favor ignore-o.
-CHAN_SENDPASS_LINE_4
-	POR FAVOR NÃO RESPONDA ESTE E-MAIL!
-CHAN_SENDPASS_LINE_5
-	Administradores do %s.
-CHAN_SENDPASS_OK
-	Senha do canal %s foi enviada.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID canal [motivo]
@@ -4045,10 +4020,10 @@ CHAN_HELP_CMD_STATUS
 	    STATUS     Fornece o atual nível de acesso de um usuário em um canal
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registra um canal
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Identifica seu nick
 CHAN_HELP_CMD_SET
 	    SET        Ajusta as opções e informações do canal
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Modifica a lista de AOP (AutoOP) de um canal
 CHAN_HELP_CMD_SOP
@@ -4061,8 +4036,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Faz a manutenção da Lista de Autokick
 CHAN_HELP_CMD_DROP
 	    DROP       Cancela o registro de um canal
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Ajuda para recuperar senhas
 CHAN_HELP_CMD_BAN
 	    BAN        Bane o nick selecionado em um canal
 CHAN_HELP_CMD_CLEAR
@@ -4079,8 +4052,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicka (expulsa) um nick de um canal
 CHAN_HELP_CMD_LIST
 	    LIST       Lista todos os canais registrados que combinam com o padrão fornecido
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Desconecta um determinado nick
 CHAN_HELP_CMD_OP
 	    OP         Atribui status de OP a um nick no canal
 CHAN_HELP_CMD_TOPIC
@@ -4149,24 +4120,6 @@ CHAN_HELP_REGISTER
 	registrado seu nick. Se ainda não tiver seu nick registrado,
 	digite %R%s HELP para mais informações de como fazê-lo.
 
-CHAN_HELP_IDENTIFY
-	Sintaxe: IDENTIFY canal senha
-	
-	Identifica você no %S como fundador do canal fornecido.
-	Muitos comandos exigem que você use este comando antes
-	de usá-los. A senha deverá ser a mesma usada por você
-	no comando REGISTER.
-	
-CHAN_HELP_LOGOUT
-	Sintaxe: LOGOUT canal nick
-	
-	Este comando faz com que um determinado nick seja des-identificado
-	do canal, fazendo com que seja necessário ele se identificar
-	novamente para recuperar seu acesso.
-	
-	Se você for o Founder do canal, pode usar este comando em
-	qualquer usuário e em si mesmo.
-
 CHAN_HELP_DROP
 	Sintaxe: DROP canal
 	
@@ -4184,7 +4137,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Ajusta o fundador do canal
 	    SUCCESSOR     Ajusta o sucessor do canal
-	    PASSWORD      Ajusta a senha do founder
 	    DESC          Ajusta a descrição do canal
 	    URL           Associa uma URL a um canal
 	    EMAIL         Associa um E-mail a um canal
@@ -4223,12 +4175,6 @@ CHAN_HELP_SET_SUCCESSOR
 	(%d), o canal será dropado, como se nenhum sucessor tivesse
 	sido ajustado. O novo nick deverá estar registrado.
 
-CHAN_HELP_SET_PASSWORD
-	Sintaxe: SET canal PASSWORD senha
-	
-	Ajusta a senha utilizada para identificação do
-	fundador do canal.
-
 CHAN_HELP_SET_DESC
 	Sintaxe: SET canal DESC descrição
 	
@@ -4416,6 +4362,45 @@ CHAN_HELP_SET_OPNOTICE
 	o canal sempre que os comandos OP ou DEOP forem usados em um
 	usuário no canal.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Sintaxe: AOP canal ADD nick
 	         AOP canal DEL {nick | entrada | lista-entradas}
@@ -4902,17 +4887,6 @@ CHAN_HELP_GETKEY
 	Sintaxe: GETKEY canal
 	
 	Retorna a key (do modo +k) de um determinado canal.
-	
-CHAN_HELP_SENDPASS
-	Sintaxe: SENDPASS canal
-	
-	Envia a senha de um determinado canal para o fundador
-	do mesmo, usando o e-mail gravado no nick dele. Este
-	comando é realmente útil quando se trata de senhas
-	perdidas.
-	
-	Pode estar limitado aos Operadores de IRC em
-	algumas Redes.
 
 CHAN_SERVADMIN_HELP
 	
@@ -4920,22 +4894,6 @@ CHAN_SERVADMIN_HELP
 	DROP mesmo sem se identificarem como donos do canal, e podem
 	também ver as listas de acesso, AKICK, e níveis de qualquer
 	canal.
-	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Sintaxe: LOGOUT canal [nick]
-	
-	Este comando faz com que um determinado nick seja des-identificado
-	do canal, fazendo com que seja necessário ele se identificar
-	novamente para recuperar seu acesso.
-	
-	Se você for o Founder do canal, pode usar este comando em
-	qualquer usuário e em si mesmo.
-	
-	Se você for um Administrador dos Services, poderá
-	desconectar qualquer um de qualquer canal sem precisar
-	ser o Founder dos mesmos. Além disso, você pode omitir
-	o parâmetro nick; com isso, irá des-identificar todos
-	os usuários registrados do canal.
 
 CHAN_SERVADMIN_HELP_DROP
 	Sintaxe: DROP canal
diff --git a/lang/ru.l b/lang/ru.l
index 191297938..99968ff25 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -999,6 +999,12 @@ CHAN_LEVEL_TOPIC
 	Óðîâåíü äîñòóïà ê êîìàíäå TOPIC
 CHAN_LEVEL_INFO
 	Óðîâåíü äîñòóïà ê êîìàíäå INFO ñ ïàðàìåòðîì ALL
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1014,7 +1020,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER #êàíàë ïàðîëü îïèñàíèå
+	REGISTER #êàíàë îïèñàíèå
 CHAN_REGISTER_DISABLED
 	Èçâèíèòå, ðåãèñòðàöèÿ êàíàëîâ âðåìåííî ïðèîñòàíîâëåíà.
 CHAN_REGISTER_NOT_LOCAL
@@ -1033,36 +1039,11 @@ CHAN_REGISTRATION_FAILED
 	Èçâèíèòå, íî çàðåãèñòðèðîâàòü êàíàë íåóäàëîñü.
 CHAN_REGISTERED
 	Êàíàë %s óñïåøíî çàðåãèñòðèðîâàí íà íèê %s
-CHAN_PASSWORD_IS
-	Ïàðîëü îò âàøåãî êàíàëà -  %s - çàïîìíèòå åãî äëÿ äàëüíåéøåãî èñïîëüçîâàíèÿ.
 CHAN_REGISTER_NONE_CHANNEL
 	Âû ïûòàåòåñü çàðåãèñòðèðîâàòü íåñóùåñòâóþùèé êàíàë %s
 CHAN_SYMBOL_REQUIRED
 	Âû äîëæíû óêàçàòü ñèìâîë # ïåðåä íàçâàíèåì êàíàëà.
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY #êàíàë ïàðîëü
-CHAN_IDENTIFY_FAILED
-	Èçâèíèòå, íî ïðîèçâåñòè èäåíòèôèêàöèþ íåóäàëîñü.
-CHAN_IDENTIFY_SUCCEEDED
-	Ïàðîëü ïðèíÿò, òåïåðü âàø óðîâåíü äîñòóïà íà êàíàëå %s - âëàäåëåö.
-CHAN_LOGOUT_FOUNDER_FAILED
-	Âû íå ìîæåòå äåèäåíòèôèöèðîâàòü ñåáÿ îòíîñòèòåëüíî êàíàëà %s ò.ê. âû åãî ðåàëüíûé âëàäåëåö.
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT #êàíàë íèê
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT #êàíàë [íèê]
-CHAN_LOGOUT_SUCCEEDED
-	Ïîëüçîâàòåëü %s óñïåøíî äåèäåíòèôèöèðîâàí îò êàíàëà %s.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Âñå ïîëüçîâàòåëè, èäåíòèôèöèðîâàííûå ê êàíàëó %s, óñïåøíî äåèäåíòèôèöèðîâàíû.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP #êàíàë
@@ -1093,14 +1074,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s íå ìîæåò áûòü íàñëåäíèêîì êàíàëà %s òàê êàê îí åãî âëàäåëåö.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Èçâèíèòå, óñòàíîâèòü ïàðîëü íåóäàëîñü.
-CHAN_PASSWORD_CHANGED
-	Ïàðîëü äëÿ êàíàëà %s óñïåøíî èçìåíåí.
-CHAN_PASSWORD_CHANGED_TO
-	Ïàðîëü äëÿ êàíàëà %s èçìåíåí íà %s.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	Îïèñàíèå êàíàëà %s èçìåíåíî íà %s.
@@ -1251,6 +1224,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	Ñèñòåìà ïðèâåëåãèé xOP íåäîñòóïíà.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåð çàïèñ]
@@ -1622,14 +1626,6 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	Âñå èñêëþ÷åíèÿ íà ïðèãëàøåíèå êàíàëà %s óäàëåíû.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS #êàíàë
-CHAN_GETPASS_UNAVAILABLE
-	Êîìàíäà GETPASS íåäîñòóïíà, òàê êàê èñïîëüçóåòñÿ øèôðîâàíèå ïàðîëåé.
-CHAN_GETPASS_PASSWORD_IS
-	Ïàðîëü êàíàëà %s - %s.
-
 # GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY #êàíàë
@@ -1638,28 +1634,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS #êàíàë
-CHAN_SENDPASS_UNAVAILABLE
-	Êîìàíäà SENDPASS íåäîñòóïíà, òàê êàê èñïîëüçóåòñÿ øèôðîâàíèå ïàðîëåé.
-CHAN_SENDPASS_SUBJECT
-	Ïàðîëü îò êàíàëà %s
-CHAN_SENDPASS_HEAD
-	Äîáðîãî âðåìåíè ñóòîê, ìíîãîóâàæàåìûé/àÿ!
-CHAN_SENDPASS_LINE_1
-	Áûë ïîëó÷åí çàïðîñ íà âîññòàíîâëåíèå ïàðîëÿ îò âàøåãî êàíàëà %s
-CHAN_SENDPASS_LINE_2
-	Òåêóùèé ïàðîëü: %s * Äëÿ áîëüøåé áåçîïàñíîñòè, ðåêîìåíäóåòñÿ èçìåíèòü åãî êàê ìîæíî ñêîðåå.
-CHAN_SENDPASS_LINE_3
-	Åñëè âû íå çàïðàøèâàëè ýòî ïèñüìî, ïðîñòî ïðîèãíîðèðóéòå åãî.
-CHAN_SENDPASS_LINE_4
-	ÏÎÆÀËÓÉÑÒÀ, ÍÅ ÎÒÂÅ×ÀÉÒÅ ÍÀ ÝÒÎ ÏÈÑÜÌÎ!
-CHAN_SENDPASS_LINE_5
-	Àäìèíèñòðàöèÿ ñåòè %s.
-CHAN_SENDPASS_OK
-	Ïàðîëü îò êàíàëà %s áûë âûñëàí íà email-àäðåñ åãî âëàäåëüöà.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID #êàíàë [ïðè÷èíà]
@@ -4107,10 +4081,10 @@ CHAN_HELP_CMD_STATUS
 	               ïîëüçîâàòåëÿ íà óêàçàííîì êàíàëå
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Ðåãèñòðàöèÿ êàíàëà
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Èäåíòèôèöèêàöèÿ ê êàíàëó â êà÷åñòâå âëàäåëüöà
 CHAN_HELP_CMD_SET
 	    SET        Íàñòðîéêà ðàçëè÷íûõ îïöèé êàíàëà
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        Óïðàâëåíèå ñïèñêîì AOP'îâ êàíàëà
 CHAN_HELP_CMD_SOP
@@ -4123,8 +4097,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Óïðàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà
 CHAN_HELP_CMD_DROP
 	    DROP       Óäàëåíèå êàíàëà èç áàçû äàííûõ ñåðâèñîâ
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Âîññòàíîâëåíèå 'çàáûòîãî' ïàðîëÿ îò êàíàëà
 CHAN_HELP_CMD_BAN
 	    BAN        Óñòàíîâêà áàíà íà êàíàëå
 CHAN_HELP_CMD_CLEAR
@@ -4141,8 +4113,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Âûêèäûâàåò óêàçàííîãî ïîëüçîâàòåëÿ ñ êàíàëà
 CHAN_HELP_CMD_LIST
 	    LIST       Çàïðîñ ñïèñêà âñåõ çàðåãèñòðèðîâàííûõ êàíàëîâ
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Äåèäåíòèôèêàöèÿ óêàçàííîãî ïîëüçîâàòåëÿ îò êàíàëà
 CHAN_HELP_CMD_OP
 	    OP         Óñòàíîâêà ñòàòóñà îïåðàòîðà (+o) óêàçàííîìó íèêó íà êàíàëå
 CHAN_HELP_CMD_TOPIC
@@ -4214,26 +4184,6 @@ CHAN_HELP_REGISTER
 	äîëæíû ñïåðâà çàðåãèñòðèðîâàòü ñâîé íèê. Áîëåå ïîäðîáíàÿ èíôîðìàöèÿ
 	î òîì, êàê ðåãèñòðèðîâàòü íèê, äîñòóïíà ïî %R%s HELP
 
-CHAN_HELP_IDENTIFY
-	Ñèíòàêñèñ: IDENTIFY #êàíàë ïàðîëü
-	
-	Ïîçâîëÿåò èäåíòèôèöèðîâàòüñÿ íà %S â êà÷åñòâå âëàäåëüöà
-	óêàçàííîãî êàíàëà. Ìíîãèå êîìàíäû ïî óïðàâëåíèþ êàíàëîì íåäîñòóïíû
-	äî òåõ ïîð, ïîêà âû íå èäåíòèôèöèðóåòåñü ê êàíàëó.  êà÷åñòâå ïàðîëÿ
-	íåîáõîäèìî óêàçûâàòü òîò ñàìûé ïàðîëü, êîòîðûé âû óêàçûâàëè ïðè
-	ðåãèñòðàöèè âàøåãî êàíàëà.
-	Ïðèìå÷àíèå: âàì íåîáÿçàòåëüíî èäåíòèôèöèðîâàòüñÿ ê êàíàëó, åñëè âû
-	åãî ðåàëüíûé âëàäåëåö, äîñòàòî÷íî ïðîñòî èäåíòèôèöèðîâàòüñÿ ê íèêó.
-	
-CHAN_HELP_LOGOUT
-	Ñèíòàêñèñ: LOGOUT #êàíàë íèê
-	
-	Äàííàÿ êîìàíäà ïîçâîëÿåò äåèäåíòèôèöèðîâàòü ëþáîé íèê, êîòîðûé
-	ñ ïîìîùüþ ïàðîëÿ èäåíòèôèöèðîâàëñÿ ê êàíàëó â êà÷åñòâå âëàäåëåöà.
-	
-	Åñëè âû ÿâëÿåòåñü ðåàëüíûì âëàäåëüöåì êàíàëà, ó âàñ åñòü âîçìîæíîñòü
-	äåèäåíòèôèöèðîâàòü êîãî óãîäíî, â èíîì ñëó÷àå - òîëüêî ñåáÿ.
-
 CHAN_HELP_DROP
 	Ñèíòàêñèñ: DROP #êàíàë
 	
@@ -4249,7 +4199,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       ñìåíà âëàäåëüöà êàíàëà
 	    SUCCESSOR     óñòàíîâêà íàñëåäíèêà êàíàëà
-	    PASSWORD      ñìåíà ïàðîëÿ êàíàëà
 	    DESC          èçìåíåíèå îïèñàíèÿ êàíàëà
 	    URL           óñòàíîâêà URL-àäðåñà êàíàëà
 	    EMAIL         óñòàíîâêà Email-àäðåñà êàíàëà
@@ -4289,12 +4238,6 @@ CHAN_HELP_SET_SUCCESSOR
 	êàíàëîì è òîò áóäåò óäàëåí. Êî âñåìó ïðî÷åìó, íèê íàñëåäíèêà êàíàëà
 	äîëæåí áûòü çàðåãèñòðèðîâàííûì íèêîì.
 
-CHAN_HELP_SET_PASSWORD
-	Ñèíòàêñèñ: SET #êàíàë PASSWORD ïàðîëü
-	
-	Ïîçâîëÿåò èçìåíèòü òåêóùèé ïàðîëü êàíàëà, èñïîëüçóåìûé äëÿ
-	èäåíòèôèêàöèè ê íåìó (êàíàëó) â êà÷åñòâå âëàäåëüöà.
-
 CHAN_HELP_SET_DESC
 	Ñèíòàêñèñ: SET #êàíàë DESC îïèñàíèå
 	
@@ -4493,6 +4436,45 @@ CHAN_HELP_SET_OPNOTICE
 	Êîãäà îï-óâåäîìëåíèå âêëþ÷åíî, %S áóäåò ïîñûëàòü íîòèñ
 	íà êàíàë êàæäûé ðàç, êîãäà êòî-ëèáî èñïîëüçóåò êîìàíäû OP/DEOP.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Ñèíòàêñèñ: AOP #êàíàë ADD íèê
 	           AOP #êàíàë DEL {íèê | íîìåð_çàïèñè | ñïèñîê_çàïèñåé}
@@ -5012,34 +4994,11 @@ CHAN_HELP_GETKEY
 	
 	Ïîçâîëÿåò çàïðîñèòü ó ñåðâèñîâ êëþ÷-ïàðîëü êàíàëà.
 
-CHAN_HELP_SENDPASS
-	Ñèíòàêñèñ: SENDPASS #êàíàë
-	
-	Îòïðàâëÿåò ïàðîëü îò êàíàëà íà email-àäðåñ åãî  ðåàëüíîãî âëàäåëüöà,
-	ïðîïèñàííîãî â ãðàôå Founder (âëàäåëåö).
-	
-	Ïðèìå÷àíèå: â çàâèñèìîñòè îò íàñòðîåê ñåòè, äîñòóï ê äàííîé êîìàíäå
-	ìîæåò áûòü îãðàíè÷åí äî IRC-îïåðàòîðîâ.
-
 CHAN_SERVADMIN_HELP
 	
 	Àäìèíèñòðàòîðû ñåðâèñîâ ìîãóò óäàëèòü ëþáîé êàíàë áåç èäåíòèôèêàöèè
 	ê  íåìó  â  êà÷åñòâå  âëàäåëüöà, ìîãóò ïðîñìàòðèâàòü ñïèñêè äîñòóïà
 	êàíàëîâ, à òàê æå, ñïèñêè àêèêîâ è óñòàíîâêè óðîâíåé äîñòóïà êàíàëîâ.
-	
-CHAN_SERVADMIN_HELP_LOGOUT
-	Ñèíòàêñèñ: LOGOUT #êàíàë [íèê]
-	
-	Äåèäåíòèôèöèðóåò óêàçàííûé íèê îò êàíàëà, ñíèìàÿ òåì ñàìûì ñ íåãî
-	ñòàòóñ âëàäåëüöà.  Åñëè  âû  ðåàëüíûé  âëàäåëåö êàíàëà, âû ìîæåòå
-	äåèäåíòèôèöèðîâàòü  ëþáîãî,  â  ïðîòèâíîì  ñëó÷àå - òîëüêî  ñåáÿ.
-	Ïðèìå÷àíèå: äåèäåíòèôèöèðóþòñÿ òîëüêî òå ïîëüçîâàòåëè,  êîòîðûå
-	èäåíòèôèöèðîâàëèñü ê êàíàëó ïîñðåäñòâîì êîìàíäû IDENTIFY.
-	
-	Êàê Àäìèíèñòðàòîð ñåðâèñîâ, âû ìîæåòå  äåèäåíòèôèöèðîâàòü ëþáîãî
-	ïîëüçîâàòåëÿ  îò  ëþáîãî  êàíàëà,  áåç  êàêîé-ëèáî  äîïîëíèòåëüíîé
-	èäåíòèôèêàöèè ê êàíàëó. Åñëè âû íå óêàæåòå íèê, òî äåèäåíòèôèöðîâàíû
-	áóäóò âñå ïîëüçîâàòåëè êàíàëà.
 
 CHAN_SERVADMIN_HELP_DROP
 	Ñèíòàêñèñ: DROP #êàíàë
diff --git a/lang/tr.l b/lang/tr.l
index 9b0c0ac3f..86fb06d8b 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1024,6 +1024,12 @@ CHAN_LEVEL_TOPIC
 	TOPIC komutunu kullanmaya yetkili
 CHAN_LEVEL_INFO
 	INFO komutunu ALL seçenegiyle kullanmaya yetkili
+CHAN_LEVEL_AUTOOWNER
+	Automatic mode +q
+CHAN_LEVEL_OWNER
+	Allowed to use OWNER command
+CHAN_LEVEL_OWNERME
+	Allowed to (de)owner him/herself
 
 # Automatic responses
 CHAN_IS_REGISTERED
@@ -1041,7 +1047,7 @@ CHAN_X_INVALID
 
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
-	REGISTER kanaladý þifre açýklama
+	REGISTER kanaladý açýklama
 CHAN_REGISTER_DISABLED
 	Kanal kaydý geçici olarak devre dýþýdýr.
 CHAN_REGISTER_NOT_LOCAL
@@ -1060,36 +1066,11 @@ CHAN_REGISTRATION_FAILED
 	Kanal kaydý baþarýsýz.
 CHAN_REGISTERED
 	%s kanalý bu nicke kayýt edildi: %s
-CHAN_PASSWORD_IS
-	Kanal þifreniz %s - ilerde kullanacaðýnýz için unutmayýnýz ve kimseye söylemeyiniz.
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
 	Please use the symbol of # when attempting to register
 
-
-# IDENTIFY responses
-CHAN_IDENTIFY_SYNTAX
-	IDENTIFY kanaladý þifreniz
-CHAN_IDENTIFY_FAILED
-	Geçersiz þifre.
-CHAN_IDENTIFY_SUCCEEDED
-	Þifre kabul edildi - %s kanalýnda founder seviyesinde eriþim kazandýnýz.
-
-# LOGOUT responses
-CHAN_LOGOUT_SYNTAX
-	LOGOUT kanaladý nick
-CHAN_LOGOUT_SERVADMIN_SYNTAX
-	LOGOUT kanaladý [nick]
-CHAN_LOGOUT_SUCCEEDED
-	Kullanýcý %s artýk %s kanalý tarafýndan tanýnmýyor.
-CHAN_LOGOUT_ALL_SUCCEEDED
-	Tüm tanýmlý kullanýcýlar artýk %s kanalý tarafýndan tanýnmýyor (Except the channel founder).
-CHAN_LOGOUT_FOUNDER_FAILED
-	You may not log out of %s (you are founder).
-CHAN_LOGOUT_NOT_LOGGEDIN
-	%s was not logged into %s.
-
 # DROP responses
 CHAN_DROP_SYNTAX
 	DROP kanaladý
@@ -1120,14 +1101,6 @@ CHAN_SUCCESSOR_UNSET
 CHAN_SUCCESSOR_IS_FOUNDER
 	%s %s kanalýnda successor olamaz çünkü zaten o kanalýn founderý.
 
-# SET PASSWORD responses
-CHAN_SET_PASSWORD_FAILED
-	Þifre deðiþimi baþarýsýz.
-CHAN_PASSWORD_CHANGED
-	%s kanalýnýn þifresi deðiþtirildi.
-CHAN_PASSWORD_CHANGED_TO
-	%s kanalýnýn þifresi %s olarak deðiþtirildi.
-
 # SET DESC responses
 CHAN_DESC_CHANGED
 	%s kanalýnýn açýklamasý %s olarak deðiþtirildi.
@@ -1278,6 +1251,37 @@ CHAN_XOP_ACCESS
 CHAN_XOP_NOT_AVAILABLE
 	xOP system is not available.
 
+# QOP messages
+CHAN_QOP_SYNTAX
+	QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]
+CHAN_QOP_DISABLED
+	Sorry, channel QOP list modification is temporarily disabled.
+CHAN_QOP_NICKS_ONLY
+	Channel QOP lists may only contain registered nicknames.
+CHAN_QOP_ADDED
+	%s added to %s QOP list.
+CHAN_QOP_MOVED
+	%s moved to %s QOP list.
+CHAN_QOP_NO_SUCH_ENTRY
+	No such entry (#%d) on %s QOP list.
+CHAN_QOP_NOT_FOUND
+	%s not found on %s QOP list.
+CHAN_QOP_NO_MATCH
+	No matching entries on %s QOP list.
+CHAN_QOP_DELETED
+	%s deleted from %s QOP list.
+CHAN_QOP_DELETED_ONE
+	Deleted 1 entry from %s QOP list.
+CHAN_QOP_DELETED_SEVERAL
+	Deleted %d entries from %s QOP list.
+CHAN_QOP_LIST_EMPTY
+	%s QOP list is empty.
+CHAN_QOP_LIST_HEADER
+	QOP list for %s:
+	  Num  Nick
+CHAN_QOP_CLEAR
+	Channel %s QOP list has been cleared.
+
 # AOP messages
 CHAN_AOP_SYNTAX
 	AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]
@@ -1649,15 +1653,7 @@ CHAN_CLEARED_USERS
 CHAN_CLEARED_INVITES
 	All invites on channel %s have been removed.
 
-# GETPASS responses
-CHAN_GETPASS_SYNTAX
-	GETPASS kanaladý
-CHAN_GETPASS_UNAVAILABLE
-	GETPASS komutu devre dýþý çünkü þifreleme(encryption) devrede.
-CHAN_GETPASS_PASSWORD_IS
-	%s kanalýnýn þifresi %s.
-	
-# SENDPASS responses
+# GETKEY responses
 CHAN_GETKEY_SYNTAX
 	GETKEY channel
 CHAN_GETKEY_NOKEY
@@ -1665,28 +1661,6 @@ CHAN_GETKEY_NOKEY
 CHAN_GETKEY_KEY
 	Key for channel %s is %s.
 
-# SENDPASS responses
-CHAN_SENDPASS_SYNTAX
-	SENDPASS kanaladý
-CHAN_SENDPASS_UNAVAILABLE
-	SENDPASS komutu devre dýþý çünkü þifreleme(encryption) devrede.
-CHAN_SENDPASS_SUBJECT
-	Kanal þifresi (%s)
-CHAN_SENDPASS_HEAD
-	Selam,
-CHAN_SENDPASS_LINE_1
-	%s kanalýnýzýn þifresinin e-mail adresinize gönderilmesini istemiþsiniz.
-CHAN_SENDPASS_LINE_2
-	Kanal Þifresi %s. Güvenlik nedenlerinden dolayý, þifrenizi bu maili aldýktan sonra deðiþtirirseniz iyi olur.
-CHAN_SENDPASS_LINE_3
-	Eðer bu mailin niye size gönderildiðini bilmiyorsanýz, lütfen ciddiye almayýn.
-CHAN_SENDPASS_LINE_4
-	LÜTFEN BU MAÝLE CEVAP VERMEYÝN!
-CHAN_SENDPASS_LINE_5
-	%s yönetimi.
-CHAN_SENDPASS_OK
-	%s kanalýnýn þifresi gönderildi.
-
 # FORBID responses
 CHAN_FORBID_SYNTAX
 	FORBID kanaladý [sebep]
@@ -4159,10 +4133,10 @@ CHAN_HELP_CMD_STATUS
 	    STATUS     Kullanýcýnýn kanaldaki access seviyesini söyler
 CHAN_HELP_CMD_REGISTER
 	    REGISTER   Kanalý kaydeder
-CHAN_HELP_CMD_IDENTIFY
-	    IDENTIFY   Þifreyle sizi kanalýn sahibi olarak tanýmlar
 CHAN_HELP_CMD_SET
 	    SET        Kanal özelliklerini ve bilgisini ayarlar
+CHAN_HELP_CMD_QOP
+	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
 	    AOP        AOP listesini düzenler
 CHAN_HELP_CMD_SOP
@@ -4175,8 +4149,6 @@ CHAN_HELP_CMD_AKICK
 	    AKICK      Autokick listesini düzenler
 CHAN_HELP_CMD_DROP
 	    DROP       Kanal kaydýný siler
-CHAN_HELP_CMD_SENDPASS
-	    SENDPASS   Kayýp þifrelerinizi söyler
 CHAN_HELP_CMD_BAN
 	    BAN        Bans a selected nick on a channel
 CHAN_HELP_CMD_CLEAR
@@ -4193,8 +4165,6 @@ CHAN_HELP_CMD_KICK
 	    KICK       Kicks a selected nick from a channel
 CHAN_HELP_CMD_LIST
 	    LIST       Lists all registered channels matching the given pattern
-CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     This command will logout the selected nickname
 CHAN_HELP_CMD_OP
 	    OP         Gives Op status to a selected nick on a channel
 CHAN_HELP_CMD_TOPIC
@@ -4259,23 +4229,6 @@ CHAN_HELP_REGISTER
 	Eðer kaydetmediyseniz %R%s HELP yazarak nasýl yapacaðýnýz
 	hakkýnda bilgi alabilirsiniz.
 
-CHAN_HELP_IDENTIFY
-	Kullanýmý: IDENTIFY kanaladý þifre
-	
-	%S tarafýndan kanalýn founderý olarak tanýnmanýzý saðlar.
-	Birçok komutu kullanabilmek için kendinizi kanalýn sahibi
-	(founder) olarak bu komutu kullanarak tanýtmanýz gerekir.
-	Þifre kanalý kaydederken  kullandýðýnýz þifreyle aynýdýr.
-
-CHAN_HELP_LOGOUT
-	Kullanýmý: LOGOUT kanaladý nick
-	
-	Bu komut belirtilen nickin artýk belirtilen kanal için
-	tanýmlanmamasýný saðlar.
-	
-	Eðer kanalýn founderý iseniz istediðiniz kiþi üzerinde,
-	deðilseniz kendi üzerinizde bu komutu kullanabilirsiniz.
-
 CHAN_HELP_DROP
 	Kullanýmý: DROP kanaladý
 	
@@ -4293,7 +4246,6 @@ CHAN_HELP_SET
 	
 	    FOUNDER       Kanal founderýný belirler
 	    SUCCESSOR     Kanal successorýný belirler
-	    PASSWORD      Founder þifresini belirler
 	    DESC          Kanal açýklamasýný belirler
 	    URL           Kanala bir URL adresini iliþkilendirir
 	    EMAIL         Kanala bir E-mail adresini iliþkilendirir
@@ -4334,11 +4286,6 @@ CHAN_HELP_SET_SUCCESSOR
 	için bir successor belirtilmemiþse kanalýn kaydý silinir(drop).
 	Komutta belirtilen nickin kayýtlý olmasý gereklidir.
 
-CHAN_HELP_SET_PASSWORD
-	Kullanýmý: SET kanaladý PASSWORD þifre
-	
-	Kanal founderýnýn þifresini deðiþtirir.
-
 CHAN_HELP_SET_DESC
 	Kullanýmý: SET kanaladý DESC açýklama
 	
@@ -4519,6 +4466,45 @@ CHAN_HELP_SET_OPNOTICE
 	üzerinde OP veya DEOP komutlarýnýn kullanýldýðýný
 	belirten bir mesaj gönderir.
 
+CHAN_HELP_QOP
+	Syntax: QOP channel ADD nick
+	        QOP channel DEL {nick | entry-num | list}
+	        QOP channel LIST [mask | list]
+	        QOP channel CLEAR
+	
+	Maintains the QOP (AutoOwner) list for a channel. The QOP 
+	list gives users the right to be auto-owner on your channel,
+	which gives them almost (or potentially, total) access.
+	
+	The QOP ADD command adds the given nickname to the
+	QOP list.
+	
+	The QOP DEL command removes the given nick from the
+	QOP list.  If a list of entry numbers is given, those
+	entries are deleted.  (See the example for LIST below.)
+	
+	The QOP LIST command displays the QOP list.  If
+	a wildcard mask is given, only those entries matching the
+	mask are displayed.  If a list of entry numbers is given,
+	only those entries are shown; for example:
+
+	   QOP #channel LIST 2-5,7-9
+	      Lists AOP entries numbered 2 through 5 and
+	      7 through 9.
+	      
+	The QOP CLEAR command clears all entries of the
+	QOP list.
+	
+	The QOP commands are limited to
+	founders (unless SECUREOPS is off). However, any user on the
+	QOP list may use the QOP LIST command.
+	
+	This command may have been disabled for your channel, and
+	in that case you need to use the access list. See 
+	%R%S HELP ACCESS for information about the access list,
+	and %R%S HELP SET XOP to know how to toggle between 
+	the access list and xOP list systems.
+
 CHAN_HELP_AOP
 	Kullanýmý: AOP kanaladi ADD nick
 	           AOP kanaladi DEL {nick | kayit-no | liste}
@@ -4976,35 +4962,11 @@ CHAN_HELP_GETKEY
 	
 	Belirtilen kanalýn anahtarýný söyler.
 
-CHAN_HELP_SENDPASS
-	Kullanýmý: SENDPASS kanaladý
-	
-	Kanalýn þifresini founderýn nick kayýtlarýnda belirtilen
-	e-mail adresine gönderir. Bu komut kanal þifresini 
-	unutanlarýn çok iþine yarayacaktýr.
-	
-	Bazý networklerde IRC operatörlerinin Kullanýmýyla 
-	sýnýrlandýrýlmýþ olabilir.
-
 CHAN_SERVADMIN_HELP
 	
 	Servis adminleri kanalýn kaydýný þifreyle tanýtmadan silebilir,
 	ve access, Akick ve seviye ayarlarýný görüntüleyebilirler.
 
-CHAN_SERVADMIN_HELP_LOGOUT
-	Kullanýmý: LOGOUT kanaladý [nick]
-	
-	Bu komut belirtilen nickin artýk belirtilen kanalda
-	tanýmlanmamasýný saðlar.
-	
-	Eðer kanal founderý iseniz, istediðiniz kiþide, deðilseniz
-	sadece kendinizde bu komutu kullanabilirsiniz.
-	
-	Eðer Servis admini iseniz, kanal founderý olmanýza gerek
-	olmadan istediðiniz kiþide bu komutu kullanabilirsiniz.
-	Hatta nick parametresini boþ býrakarak o kanalda kendini
-	kanala tanýtmýþ herkesi tanýmlanmamýþ yapabilirsiniz.
-
 CHAN_SERVADMIN_HELP_DROP
 	Kullanýmý: DROP kanaladý
 	
diff --git a/src/channels.c b/src/channels.c
index 3e921e182..8556179ea 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1650,15 +1650,15 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
 	 */
 	if (give_modes && (get_ignore(user->nick) == NULL)
 		&& (!user->nc || !(user->nc->flags & NI_AUTOOP))) {
-		if (owner && is_founder(user, ci))
+		if (owner && (IsFounder(user, ci) || check_access(user, ci, CA_AUTOOWNER)))
 			add_modes |= CUS_OWNER;
 		else if (admin && check_access(user, ci, CA_AUTOPROTECT))
 			add_modes |= CUS_PROTECT;
-		if (check_access(user, ci, CA_AUTOOP))
+		if (op && check_access(user, ci, CA_AUTOOP))
 			add_modes |= CUS_OP;
-		else if (ModeManager::FindChannelModeByName(CMODE_HALFOP) && check_access(user, ci, CA_AUTOHALFOP))
+		else if (halfop && check_access(user, ci, CA_AUTOHALFOP))
 			add_modes |= CUS_HALFOP;
-		else if (check_access(user, ci, CA_AUTOVOICE))
+		else if (voice && check_access(user, ci, CA_AUTOVOICE))
 			add_modes |= CUS_VOICE;
 	}
 
@@ -1671,16 +1671,16 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
 	if (((ci->flags & CI_SECUREOPS) || (c->usercount == 1)
 		 || check_access(user, ci, CA_AUTODEOP))
 		&& !is_ulined(user->server->name)) {
-		if (owner && (status & CUS_OWNER) && !is_founder(user, ci))
+		if (owner && (status & CUS_OWNER) && !IsFounder(user, ci))
 			rem_modes |= CUS_OWNER;
 		if (admin && (status & CUS_PROTECT)
 			&& !check_access(user, ci, CA_AUTOPROTECT)
 			&& !check_access(user, ci, CA_PROTECTME))
 			rem_modes |= CUS_PROTECT;
-		if ((status & CUS_OP) && !check_access(user, ci, CA_AUTOOP)
+		if (op && (status & CUS_OP) && !check_access(user, ci, CA_AUTOOP)
 			&& !check_access(user, ci, CA_OPDEOPME))
 			rem_modes |= CUS_OP;
-		if (ModeManager::FindChannelModeByName(CMODE_HALFOP) && (status & CUS_HALFOP)
+		if (halfop && (status & CUS_HALFOP)
 			&& !check_access(user, ci, CA_AUTOHALFOP)
 			&& !check_access(user, ci, CA_HALFOPME))
 			rem_modes |= CUS_HALFOP;
diff --git a/src/chanserv.c b/src/chanserv.c
index a6aee4aaf..991b708ef 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -59,6 +59,9 @@ static int def_levels[][2] = {
 	{ CA_BAN,						5 },
 	{ CA_TOPIC,		 ACCESS_INVALID },
 	{ CA_INFO,		  ACCESS_INVALID },
+	{ CA_AUTOOWNER,		ACCESS_INVALID },
+	{ CA_OWNER,		ACCESS_INVALID },
+	{ CA_OWNERME,		ACCESS_INVALID },
 	{ -1 }
 };
 
@@ -67,7 +70,7 @@ LevelInfo levelinfo[] = {
 	{ CA_AUTODEOP,	  "AUTODEOP",	 CHAN_LEVEL_AUTODEOP },
 	{ CA_AUTOHALFOP,	"AUTOHALFOP",   CHAN_LEVEL_AUTOHALFOP },
 	{ CA_AUTOOP,		"AUTOOP",	   CHAN_LEVEL_AUTOOP },
-	{ CA_AUTOPROTECT,   "",  CHAN_LEVEL_AUTOPROTECT },
+	{ CA_AUTOPROTECT,   "AUTOPROTECT",  CHAN_LEVEL_AUTOPROTECT },
 	{ CA_AUTOVOICE,	 "AUTOVOICE",	CHAN_LEVEL_AUTOVOICE },
 	{ CA_NOJOIN,		"NOJOIN",	   CHAN_LEVEL_NOJOIN },
 	{ CA_SIGNKICK,	  "SIGNKICK",	 CHAN_LEVEL_SIGNKICK },
@@ -87,8 +90,8 @@ LevelInfo levelinfo[] = {
 	{ CA_INVITE,		"INVITE",	   CHAN_LEVEL_INVITE },
 	{ CA_OPDEOP,		"OPDEOP",	   CHAN_LEVEL_OPDEOP },
 	{ CA_OPDEOPME,	  "OPDEOPME",	 CHAN_LEVEL_OPDEOPME },
-	{ CA_PROTECT,	   "",	  CHAN_LEVEL_PROTECT },
-	{ CA_PROTECTME,	 "",	CHAN_LEVEL_PROTECTME },
+	{ CA_PROTECT,	   "PROTECT",	  CHAN_LEVEL_PROTECT },
+	{ CA_PROTECTME,	 "PROTECTME",	CHAN_LEVEL_PROTECTME },
 	{ CA_TOPIC,		 "TOPIC",		CHAN_LEVEL_TOPIC },
 	{ CA_UNBAN,		 "UNBAN",		CHAN_LEVEL_UNBAN },
 	{ CA_VOICE,		 "VOICE",		CHAN_LEVEL_VOICE },
@@ -100,6 +103,9 @@ LevelInfo levelinfo[] = {
 	{ CA_GREET,		"GREET",		CHAN_LEVEL_GREET },
 	{ CA_NOKICK,		"NOKICK",	   CHAN_LEVEL_NOKICK },
 	{ CA_SAY,		"SAY",		CHAN_LEVEL_SAY },
+	{ CA_AUTOOWNER,		"AUTOOWNER",	CHAN_LEVEL_AUTOOWNER },
+	{ CA_OWNER,		"OWNER",	CHAN_LEVEL_OWNER },
+	{ CA_OWNERME,		"OWNERME",	CHAN_LEVEL_OWNERME },
 		{ -1 }
 };
 int levelinfo_maxwidth = 0;
@@ -381,7 +387,10 @@ void load_cs_dbase()
 			} else {
 				ci->successor = NULL;
 			}
-			SAFE(read = read_buffer(ci->founderpass, f));
+
+			char nothing[PASSMAX];
+			SAFE(read = read_buffer(nothing, f)); // XXX founder pass was removed.. just here so it works
+
 			SAFE(read_string(&ci->desc, f));
 			if (!ci->desc)
 				ci->desc = sstrdup("");
@@ -646,7 +655,11 @@ void save_cs_dbase()
 				SAFE(write_string(ci->successor->display, f));
 			else
 				SAFE(write_string(NULL, f));
-			SAFE(written = write_buffer(ci->founderpass, f));
+
+			char nothing[PASSMAX]; /* founder passwords were removed! */
+			strcpy(nothing, "nothing\0");
+			SAFE(written = write_buffer(nothing, f));
+
 			SAFE(write_string(ci->desc, f));
 			SAFE(write_string(ci->url, f));
 			SAFE(write_string(ci->email, f));
@@ -1107,8 +1120,8 @@ int check_should_owner(User * user, char *chan)
 	if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+')
 		return 0;
 
-	if (((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci))
-		|| (!(ci->flags & CI_SECUREFOUNDER) && is_founder(user, ci))) {
+	if (((ci->flags & CI_SECUREFOUNDER) && IsRealFounder(user, ci))
+		|| (!(ci->flags & CI_SECUREFOUNDER) && IsFounder(user, ci))) {
 		ircdproto->SendMode(whosends(ci), chan, "+o%s %s %s", cm->ModeChar, user->nick,
 					   user->nick);
 		return 1;
@@ -1613,7 +1626,7 @@ int check_access(User * user, ChannelInfo * ci, int what)
 		ci->last_used = time(NULL);
 
 	if (what == ACCESS_FOUNDER)
-		return is_founder(user, ci);
+		return IsFounder(user, ci);
 	if (level >= ACCESS_FOUNDER)
 		return (what == CA_AUTODEOP || what == CA_NOJOIN) ? 0 : 1;
 	/* Hacks to make flags work */
@@ -1691,8 +1704,6 @@ int delchan(ChannelInfo * ci)
 {
 	unsigned i;
 	NickCore *nc;
-	User *u;
-	struct u_chaninfolist *cilist, *cilist_next;
 
 	if (!ci) {
 		if (debug) {
@@ -1726,34 +1737,6 @@ int delchan(ChannelInfo * ci)
 		alog("debug: delchan() Bot has been removed moving on");
 	}
 
-	if (debug >= 2) {
-		alog("debug: delchan() founder cleanup");
-	}
-	for (i = 0; i < 1024; i++) {
-		for (u = userlist[i]; u; u = u->next) {
-			cilist = u->founder_chans;
-			while (cilist) {
-				cilist_next = cilist->next;
-				if (cilist->chan == ci) {
-					if (debug)
-						alog("debug: Dropping founder login of %s for %s",
-							 u->nick, ci->name);
-					if (cilist->next)
-						cilist->next->prev = cilist->prev;
-					if (cilist->prev)
-						cilist->prev->next = cilist->next;
-					else
-						u->founder_chans = cilist->next;
-					delete cilist;
-				}
-				cilist = cilist_next;
-			}
-		}
-	}
-	if (debug >= 2) {
-		alog("debug: delchan() founder cleanup done");
-	}
-
 	if (ci->next)
 		ci->next->prev = ci->prev;
 	if (ci->prev)
@@ -1862,68 +1845,67 @@ void reset_levels(ChannelInfo * ci)
 
 /*************************************************************************/
 
-/* Does the given user have founder access to the channel? */
-
-int is_founder(User * user, ChannelInfo * ci)
+/** Is the user a channel founder? (owner)
+ * @param user The user
+ * @param ci The channel
+ * @return true or false
+ */
+bool IsFounder(User *user, ChannelInfo *ci)
 {
-	if (!user || !ci) {
-		return 0;
-	}
-
-	if (user->isSuperAdmin) {
-		return 1;
-	}
-
-	if (user->nc && user->nc == ci->founder) {
-		if ((nick_identified(user)
-			 || (user->IsRecognized() && !(ci->flags & CI_SECURE))))
-			return 1;
-	}
-	if (is_identified(user, ci))
-		return 1;
-	return 0;
-}
+	ChanAccess *access = NULL;
 
-/*************************************************************************/
+	if (!user || !ci)
+		return false;
 
-int is_real_founder(User * user, ChannelInfo * ci)
-{
-	if (user->isSuperAdmin) {
-		return 1;
+	if (IsRealFounder(user, ci))
+		return true;
+	
+	if (user->nc)
+		access = ci->GetAccess(user->nc);
+	else
+	{
+		NickAlias *na = findnick(user->nick);
+		if (na)
+			access = ci->GetAccess(na->nc);
 	}
+	
+	/* If they're QOP+ and theyre identified or theyre recognized and the channel isn't secure */
+	if (access && access->level >= ACCESS_QOP && (user->nc || (user->IsRecognized() && !(ci->flags & CI_SECURE))))
+		return true;
 
-	if (user->nc && user->nc == ci->founder) {
-		if ((nick_identified(user)
-			 || (user->IsRecognized() && !(ci->flags & CI_SECURE))))
-			return 1;
-	}
-	return 0;
+	return false;
 }
 
-/*************************************************************************/
+/** Is the user the real founder?
+ * @param user The user
+ * @param ci The channel
+ * @return true or false
+ */
+bool IsRealFounder(User *user, ChannelInfo *ci)
+{
+	if (!user || !ci)
+		return false;
 
-/* Has the given user password-identified as founder for the channel? */
+	if (user->isSuperAdmin)
+		return true;
 
-int is_identified(User * user, ChannelInfo * ci)
-{
-	struct u_chaninfolist *c;
+	if (user->nc && user->nc == ci->founder)
+		return true;
 
-	for (c = user->founder_chans; c; c = c->next) {
-		if (c->chan == ci)
-			return 1;
-	}
-	return 0;
+	return false;
 }
 
-/*************************************************************************/
-
-/* Return the access level the given user has on the channel.  If the
- * channel doesn't exist, the user isn't on the access list, or the channel
- * is CS_SECURE and the user hasn't IDENTIFY'd with NickServ, return 0. */
 
-int get_access(User * user, ChannelInfo * ci)
+/** Return the access level for the user on the channel.
+ * If the channel doesn't exist, the user isn't on the access list, or the
+ * channel is CI_SECURE and the user isn't identified, return 0
+ * @param user The user
+ * @param ci The cahnnel
+ * @return The level, or 0
+ */
+int get_access(User *user, ChannelInfo *ci)
 {
-	ChanAccess *access;
+	ChanAccess *access = NULL;
 
 	if (!ci || !user)
 		return 0;
@@ -1931,20 +1913,24 @@ int get_access(User * user, ChannelInfo * ci)
 	/* SuperAdmin always has highest level */
 	if (user->isSuperAdmin)
 		return ACCESS_SUPERADMIN;
-
-	if (is_founder(user, ci))
+	
+	if (IsFounder(user, ci))
 		return ACCESS_FOUNDER;
-
-	if (!user->nc)
-		return 0;
-
-	if (nick_identified(user)
-		|| (user->IsRecognized() && !(ci->flags & CI_SECURE)))
-		if ((access = ci->GetAccess(user->nc)))
-			return access->level;
-
+	
 	if (nick_identified(user))
-		return 0;
+	{
+		access = ci->GetAccess(user->nc);
+		if (access)
+			return access->level;
+	}
+	else
+	{
+		NickAlias *na = findnick(user->nick);
+		if (na)
+			access = ci->GetAccess(na->nc);
+		if (access && user->IsRecognized() && !(ci->flags & CI_SECURE))
+			return access->level;
+	}
 
 	return 0;
 }
@@ -1958,7 +1944,7 @@ void update_cs_lastseen(User * user, ChannelInfo * ci)
 	if (!ci || !user || !user->nc)
 		return;
 
-	if (is_founder(user, ci) || nick_identified(user)
+	if (IsFounder(user, ci) || nick_identified(user)
 		|| (user->IsRecognized() && !(ci->flags & CI_SECURE)))
 		if ((access = ci->GetAccess(user->nc)))
 			access->last_seen = time(NULL);
@@ -2031,22 +2017,22 @@ const char *get_xop_level(int level)
 {
 	ChannelMode *halfop = ModeManager::FindChannelModeByName(CMODE_HALFOP);
 
-	if (level < ACCESS_VOP) {
+	if (level < ACCESS_VOP)
 		return "Err";
-	} else if (halfop && level < ACCESS_HOP) {
+	else if (halfop && level < ACCESS_HOP)
 		return "VOP";
-	} else if (!halfop && level < ACCESS_AOP) {
+	else if (!halfop && level < ACCESS_AOP)
 		return "VOP";
-	} else if (halfop && level < ACCESS_AOP) {
+	else if (halfop && level < ACCESS_AOP)
 		return "HOP";
-	} else if (level < ACCESS_SOP) {
+	else if (level < ACCESS_SOP)
 		return "AOP";
-	} else if (level < ACCESS_FOUNDER) {
+	else if (level < ACCESS_QOP)
 		return "SOP";
-	} else {
+	else if (level < ACCESS_FOUNDER)
+		return "QOP";
+	else
 		return "Founder";
-	}
-
 }
 
 /*************************************************************************/
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index cb1590719..64d999768 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -84,7 +84,7 @@ class CommandBSInfo : public Command
 		}
 		else if ((ci = cs_findchan(query)))
 		{
-			if (!is_founder(u, ci) && !u->nc->HasPriv("botserv/administration"))
+			if (!IsFounder(u, ci) && !u->nc->HasPriv("botserv/administration"))
 			{
 				notice_lang(s_BotServ, u, ACCESS_DENIED);
 				return MOD_CONT;
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 2fbca088a..bdf32b9d7 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -315,7 +315,7 @@ class CommandCSAccess : public Command
 				return MOD_CONT;
 			}
 
-			if (!is_founder(u, ci) && !u->nc->HasPriv("chanserv/access/modify"))
+			if (!IsFounder(u, ci) && !u->nc->HasPriv("chanserv/access/modify"))
 			{
 				notice_lang(s_ChanServ, u, ACCESS_DENIED);
 				return MOD_CONT;
@@ -376,7 +376,7 @@ class CommandCSLevels : public Command
 			this->OnSyntaxError(u);
 		else if (ci->flags & CI_XOP)
 			notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP);
-		else if (!is_founder(u, ci) && !u->nc->HasPriv("chanserv/access/modify"))
+		else if (!IsFounder(u, ci) && !u->nc->HasPriv("chanserv/access/modify"))
 			notice_lang(s_ChanServ, u, ACCESS_DENIED);
 		else if (cmd == "SET") {
 			level = strtol(s, &error, 10);
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index ede481bcb..c700dc21e 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -253,7 +253,7 @@ class CommandCSAKick : public Command
 				 * higher access. - Viper */
 				for (i = 0; i < 1024; i++) {
 					for (u2 = userlist[i]; u2; u2 = u2->next) {
-						if (is_founder(u2, ci) || (get_access(u2, ci) >= get_access(u, ci))) {
+						if (IsFounder(u2, ci) || (get_access(u2, ci) >= get_access(u, ci))) {
 							if (match_usermask(mask, u2)) {
 								notice_lang(s_ChanServ, u, ACCESS_DENIED);
 								delete [] mask;
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index a8b838f1f..3a5ca45a7 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -49,7 +49,7 @@ class CommandCSDrop : public Command
 			return MOD_CONT;
 		}
 
-		if ((ci->flags & CI_SECUREFOUNDER ? !is_real_founder(u, ci) : !is_founder(u, ci)) && !u->nc->HasCommand("chanserv/drop"))
+		if ((ci->flags & CI_SECUREFOUNDER ? !IsRealFounder(u, ci) : !IsFounder(u, ci)) && !u->nc->HasCommand("chanserv/drop"))
 		{
 			notice_lang(s_ChanServ, u, ACCESS_DENIED);
 			return MOD_CONT;
@@ -81,7 +81,7 @@ class CommandCSDrop : public Command
 		 * drop the channel before issuing the wallops.
 		 */
 		if (WallDrop) {
-			if ((level < ACCESS_FOUNDER) || (!is_real_founder(u, ci) && ci->flags & CI_SECUREFOUNDER))
+			if ((level < ACCESS_FOUNDER) || (!IsRealFounder(u, ci) && ci->flags & CI_SECUREFOUNDER))
 				ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick, chan);
 		}
 
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
deleted file mode 100644
index 5a17bdb7b..000000000
--- a/src/core/cs_getpass.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2009 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- * $Id$
- *
- */
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSGetPass : public Command
-{
- public:
-	CommandCSGetPass() : Command("GETPASS", 1, 1, "chanserv/getpass")
-	{
-		this->SetFlag(CFLAG_ALLOW_SUSPENDED);
-	}
-
-	CommandReturn Execute(User *u, std::vector<ci::string> &params)
-	{
-		const char *chan = params[0].c_str();
-		char tmp_pass[PASSMAX];
-		ChannelInfo *ci;
-
-		ci = cs_findchan(chan);
-
-		if (!enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1))
-		{
-			notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
-			return MOD_CONT;
-		}
-
-		alog("%s: %s!%s@%s used GETPASS on %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name);
-		if (WallGetpass)
-		{
-			ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used GETPASS on channel \2%s\2", u->nick, chan);
-		}
-		notice_lang(s_ChanServ, u, CHAN_GETPASS_PASSWORD_IS, chan, tmp_pass);
-		return MOD_CONT;
-	}
-
-	bool OnHelp(User *u, const ci::string &subcommand)
-	{
-		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
-		return true;
-	}
-
-	void OnSyntaxError(User *u)
-	{
-		syntax_error(s_ChanServ, u, "GETPASS",  CHAN_GETPASS_SYNTAX);
-	}
-};
-
-class CSGetPass : public Module
-{
- public:
-	CSGetPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
-	{
-		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
-		this->SetType(CORE);
-		this->AddCommand(CHANSERV, new CommandCSGetPass());
-
-		char tmp_pass[PASSMAX];
-		if (!enc_decrypt("tmp", tmp_pass, PASSMAX - 1))
-			throw ModuleException("Incompatible with the encryption module being used");
-	}
-	void ChanServHelp(User *u)
-	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
-	}
-};
-
-MODULE_INIT(CSGetPass)
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
deleted file mode 100644
index 6629e2819..000000000
--- a/src/core/cs_identify.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2009 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- * $Id$
- *
- */
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSIdentify : public Command
-{
- public:
-	CommandCSIdentify(const std::string &cname) : Command(cname, 2, 2)
-	{
-	}
-
-	CommandReturn Execute(User *u, std::vector<ci::string> &params)
-	{
-		const char *chan = params[0].c_str();
-		const char *pass = params[1].c_str();
-		ChannelInfo *ci;
-		struct u_chaninfolist *uc;
-
-		ci = cs_findchan(chan);
-
-		if (is_founder(u, ci))
-		{
-			notice_lang(s_ChanServ, u, NICK_ALREADY_IDENTIFIED);
-			return MOD_CONT;
-		}
-
-		int res;
-
-		if ((res = enc_check_password(pass, ci->founderpass)) == 1)
-		{
-			if (!is_identified(u, ci))
-			{
-				uc = new u_chaninfolist;
-				uc->prev = NULL;
-				uc->next = u->founder_chans;
-				if (u->founder_chans)
-					u->founder_chans->prev = uc;
-				u->founder_chans = uc;
-				uc->chan = ci;
-				alog("%s: %s!%s@%s identified for %s", s_ChanServ, u->nick,
-					 u->GetIdent().c_str(), u->host, ci->name);
-			}
-
-			notice_lang(s_ChanServ, u, CHAN_IDENTIFY_SUCCEEDED, chan);
-		}
-		else if (res < 0)
-		{
-			alog("%s: check_password failed for %s", s_ChanServ, ci->name);
-			notice_lang(s_ChanServ, u, CHAN_IDENTIFY_FAILED);
-		}
-		else
-		{
-			alog("%s: Failed IDENTIFY for %s by %s!%s@%s",
-				 s_ChanServ, ci->name, u->nick, u->GetIdent().c_str(), u->host);
-			notice_lang(s_ChanServ, u, PASSWORD_INCORRECT);
-			bad_password(u);
-		}
-
-		return MOD_CONT;
-	}
-
-	bool OnHelp(User *u, const ci::string &subcommand)
-	{
-		notice_help(s_ChanServ, u, CHAN_HELP_IDENTIFY);
-		return true;
-	}
-
-	void OnSyntaxError(User *u)
-	{
-		syntax_error(s_ChanServ, u, "IDENTIFY", CHAN_IDENTIFY_SYNTAX);
-	}
-};
-
-class CSIdentify : public Module
-{
- public:
-	CSIdentify(const std::string &modname, const std::string &creator) : Module(modname, creator)
-	{
-		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
-		this->SetType(CORE);
-		this->AddCommand(CHANSERV, new CommandCSIdentify("IDENTIFY"));
-		// XXX: we need aliases.
-		this->AddCommand(CHANSERV, new CommandCSIdentify("ID"));
-	}
-	void ChanServHelp(User *u)
-	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
-	}
-};
-
-MODULE_INIT(CSIdentify)
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
deleted file mode 100644
index e7c39b329..000000000
--- a/src/core/cs_logout.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2009 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- * $Id$
- *
- */
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSLogout : public Command
-{
- private:
-	int make_unidentified(User *u, ChannelInfo *ci)
-	{
-		struct u_chaninfolist *uci;
-
-		if (!u || !ci)
-			return 0;
-
-		for (uci = u->founder_chans; uci; uci = uci->next)
-		{
-			if (uci->chan == ci)
-			{
-				if (uci->next)
-					uci->next->prev = uci->prev;
-				if (uci->prev)
-					uci->prev->next = uci->next;
-				else
-					u->founder_chans = uci->next;
-				delete uci;
-
-				return 1;
-			}
-		}
-
-		return 0;
-	}
-
- public:
-	CommandCSLogout() : Command("LOGOUT", 1, 2)
-	{
-	}
-
-	CommandReturn Execute(User *u, std::vector<ci::string> &params)
-	{
-		const char *chan = params[0].c_str();
-		const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
-		ChannelInfo *ci = cs_findchan(chan);
-		User *u2 = NULL;
-		int is_admin = u->nc->HasCommand("chanserv/logout");
-
-		if (!is_admin && !nick)
-			this->OnSyntaxError(u);
-		else if (nick && !(u2 = finduser(nick)))
-			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
-		else if (u2 != u && !is_real_founder(u, ci) && !is_admin)
-			notice_lang(s_ChanServ, u, ACCESS_DENIED);
-		else if (u2 == u && is_real_founder(u, ci))
-			/* Since founders can not logout we should tell them -katsklaw */
-			notice_lang(s_ChanServ, u, CHAN_LOGOUT_FOUNDER_FAILED, chan);
-		else
-		{
-			if (u2)
-			{
-				if (make_unidentified(u2, ci))
-				{
-					notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan);
-					alog("%s: User %s!%s@%s has been logged out of channel %s.", s_ChanServ, u2->nick, u2->GetIdent().c_str(), u2->host, chan);
-				}
-				else
-					notice_lang(s_ChanServ, u, CHAN_LOGOUT_NOT_LOGGEDIN, nick, chan);
-			}
-			else
-			{
-				int i;
-				for (i = 0; i < 1024; i++)
-					for (u2 = userlist[i]; u2; u2 = u2->next)
-						make_unidentified(u2, ci);
-				notice_lang(s_ChanServ, u, CHAN_LOGOUT_ALL_SUCCEEDED, chan);
-				alog("%s: User %s!%s@%s logged all identified users out of channel %s.", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, chan);
-			}
-
-		}
-		return MOD_CONT;
-	}
-
-	bool OnHelp(User *u, const ci::string &subcommand)
-	{
-		if (u->nc && u->nc->HasCommand("chanserv/logout"))
-			notice_help(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
-		else
-			notice_help(s_NickServ, u, CHAN_HELP_LOGOUT);
-		return true;
-	}
-
-	void OnSyntaxError(User *u)
-	{
-		if (u->nc->HasCommand("chanserv/logout"))
-			syntax_error(s_NickServ, u, "LOGOUT", CHAN_LOGOUT_SERVADMIN_SYNTAX);
-		else
-			syntax_error(s_NickServ, u, "LOGOUT", CHAN_LOGOUT_SYNTAX);
-	}
-};
-
-class CSLogout : public Module
-{
- public:
-	CSLogout(const std::string &modname, const std::string &creator) : Module(modname, creator)
-	{
-		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
-		this->SetType(CORE);
-		this->AddCommand(CHANSERV, new CommandCSLogout());
-	}
-	void ChanServHelp(User *u)
-	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
-	}
-};
-
-MODULE_INIT(CSLogout)
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 4e8162c02..8c45e328f 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -76,8 +76,6 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c
 	return MOD_CONT;
 }
 
-// XXX: Future enhancement. Default these to the sender, with an optional target arg.
-
 class CommandCSOp : public Command
 {
  public:
@@ -329,7 +327,7 @@ class CommandCSOwner : public Command
 			return MOD_CONT;
 		}
 
-		return do_util(u, cm, (params.size() > 0 ? params[0].c_str() : NULL), NULL, true, ACCESS_FOUNDER, ACCESS_FOUNDER, "OWNER", 0);
+		return do_util(u, cm, (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL), true, CA_OWNER, CA_OWNERME, "OWNER", 0);
 	}
 
 	bool OnHelp(User *u, const ci::string &subcommand)
@@ -360,7 +358,7 @@ class CommandCSDeOwner : public Command
 			return MOD_CONT;
 		}
 
-		return do_util(u, cm, (params.size() > 0 ? params[0].c_str() : NULL), NULL, false, ACCESS_FOUNDER, ACCESS_FOUNDER, "OWNER", 0);
+		return do_util(u, cm, (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL), false, CA_OWNER, CA_OWNERME, "DEOWNER", 0);
 	}
 
 	bool OnHelp(User *u, const ci::string &subcommand)
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 62737d4aa..d0f6f3765 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -18,7 +18,7 @@
 class CommandCSRegister : public Command
 {
  public:
-	CommandCSRegister() : Command("REGISTER", 3, 3)
+	CommandCSRegister() : Command("REGISTER", 2, 2)
 	{
 		this->SetFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL);
 	}
@@ -26,13 +26,9 @@ class CommandCSRegister : public Command
 	CommandReturn Execute(User *u, std::vector<ci::string> &params)
 	{
 		const char *chan = params[0].c_str();
-		const char *pass = params[1].c_str();
-		const char *desc = params[2].c_str();
+		const char *desc = params[1].c_str();
 		Channel *c;
 		ChannelInfo *ci;
-		struct u_chaninfolist *uc;
-		char founderpass[PASSMAX];
-		char tmp_pass[PASSMAX];
 		ChannelMode *cm;
 
 		if (readonly)
@@ -57,21 +53,11 @@ class CommandCSRegister : public Command
 			notice_lang(s_ChanServ, u, CHAN_MUST_BE_CHANOP);
 		else if (CSMaxReg && u->nc->channelcount >= CSMaxReg && !u->nc->HasPriv("chanserv/no-register-limit"))
 			notice_lang(s_ChanServ, u, u->nc->channelcount > CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, CSMaxReg);
-		else if (!stricmp(u->nick, pass) || (StrictPasswords && strlen(pass) < 5))
-			notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
-		else if (enc_encrypt_check_len(strlen(pass), PASSMAX - 1))
-			notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
 		else if (!(ci = makechan(chan)))
 		{
 			alog("%s: makechan() failed for REGISTER %s", s_ChanServ, chan);
 			notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
 		}
-		else if (strscpy(founderpass, pass, PASSMAX), enc_encrypt_in_place(founderpass, PASSMAX) < 0)
-		{
-			alog("%s: Couldn't encrypt password for %s (REGISTER)", s_ChanServ, chan);
-			notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
-			delchan(ci);
-		}
 		else
 		{
 			c->ci = ci;
@@ -83,7 +69,6 @@ class CommandCSRegister : public Command
 			ci->last_used = ci->time_registered;
 			ci->founder = u->nc;
 
-			memcpy(ci->founderpass, founderpass, PASSMAX);
 			ci->desc = sstrdup(desc);
 			if (c->topic)
 			{
@@ -98,16 +83,6 @@ class CommandCSRegister : public Command
 			alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan, u->nick, u->GetIdent().c_str(), u->host);
 			notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick);
 
-			if (enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1) == 1)
-				notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, tmp_pass);
-
-			uc = new u_chaninfolist;
-			uc->next = u->founder_chans;
-			uc->prev = NULL;
-			if (u->founder_chans)
-				u->founder_chans->prev = uc;
-			u->founder_chans = uc;
-			uc->chan = ci;
 			/* Implement new mode lock */
 			check_modes(c);
 			/* On most ircds you do not receive the admin/owner mode till its registered */
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
deleted file mode 100644
index c9972bfe1..000000000
--- a/src/core/cs_sendpass.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2009 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- * $Id$
- *
- */
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSendPass : public Command
-{
- public:
-	CommandCSSendPass() : Command("SENDPASS", 1, 1)
-	{
-	}
-
-	CommandReturn Execute(User *u, std::vector<ci::string> &params)
-	{
-		const char *chan = params[0].c_str();
-		ChannelInfo *ci = cs_findchan(chan);
-		NickCore *founder = ci->founder;;
-
-		if (RestrictMail && !u->nc->HasCommand("chanserv/sendpass"))
-			notice_lang(s_ChanServ, u, ACCESS_DENIED);
-		else
-		{
-			char buf[BUFSIZE];
-			char tmp_pass[PASSMAX];
-			if (enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1) == 1)
-			{
-				MailInfo *mail;
-
-				snprintf(buf, sizeof(buf), getstring(founder, CHAN_SENDPASS_SUBJECT), ci->name);
-				mail = MailBegin(u, founder, buf, s_ChanServ);
-				if (!mail)
-					return MOD_CONT;
-
-				fprintf(mail->pipe, "%s", getstring(founder, CHAN_SENDPASS_HEAD));
-				fprintf(mail->pipe, "\n\n");
-				fprintf(mail->pipe, getstring(founder, CHAN_SENDPASS_LINE_1),
-						ci->name);
-				fprintf(mail->pipe, "\n\n");
-				fprintf(mail->pipe, getstring(founder, CHAN_SENDPASS_LINE_2),
-						tmp_pass);
-				fprintf(mail->pipe, "\n\n");
-				fprintf(mail->pipe, "%s", getstring(founder, CHAN_SENDPASS_LINE_3));
-				fprintf(mail->pipe, "\n\n");
-				fprintf(mail->pipe, "%s", getstring(founder, CHAN_SENDPASS_LINE_4));
-				fprintf(mail->pipe, "\n\n");
-				fprintf(mail->pipe, getstring(founder, CHAN_SENDPASS_LINE_5),
-						NetworkName);
-				fprintf(mail->pipe, "\n.\n");
-
-				MailEnd(mail);
-
-				alog("%s: %s!%s@%s used SENDPASS on %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, chan);
-				notice_lang(s_ChanServ, u, CHAN_SENDPASS_OK, chan);
-			}
-			else
-				notice_lang(s_ChanServ, u, CHAN_SENDPASS_UNAVAILABLE);
-		}
-		return MOD_CONT;
-	}
-
-	bool OnHelp(User *u, const ci::string &subcommand)
-	{
-		notice_help(s_ChanServ, u, CHAN_HELP_SENDPASS);
-		return true;
-	}
-
-	void OnSyntaxError(User *u)
-	{
-		syntax_error(s_ChanServ, u, "SENDPASS", CHAN_SENDPASS_SYNTAX);
-	}
-};
-
-class CSSendPass : public Module
-{
- public:
-	CSSendPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
-	{
-		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
-		this->SetType(CORE);
-
-		this->AddCommand(CHANSERV, new CommandCSSendPass());
-
-		if (!UseMail)
-			throw ModuleException("sendpass may not be loaded if UseMail is loaded");
-
-		char tmp_pass[PASSMAX];
-		if (!enc_decrypt("tmp", tmp_pass, PASSMAX - 1))
-			throw ModuleException("Incompatible with the encryption module being used");
-	}
-	void ChanServHelp(User *u)
-	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
-	}
-};
-
-MODULE_INIT(CSSendPass)
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 716144d2c..17955dbf2 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -96,44 +96,6 @@ class CommandCSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandReturn DoSetPassword(User * u, ChannelInfo * ci, const char *param)
-	{
-		int len = strlen(param);
-
-		if (stricmp(u->nick, param) == 0 || (StrictPasswords && len < 5)) {
-			notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
-			return MOD_CONT;
-		}
-
-		if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
-			notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
-			return MOD_CONT;
-		}
-
-		if (enc_encrypt(param, len, ci->founderpass, PASSMAX -1) < 0) {
-			alog("%s: Failed to encrypt password for %s (set)", s_ChanServ,
-				 ci->name);
-			notice_lang(s_ChanServ, u, CHAN_SET_PASSWORD_FAILED);
-			return MOD_CONT;
-		}
-
-		notice_lang(s_ChanServ, u, CHAN_PASSWORD_CHANGED, ci->name);
-
-		if (get_access(u, ci) < ACCESS_FOUNDER) {
-			alog("%s: %s!%s@%s set password as Services admin for %s",
-				 s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name);
-			if (WallSetpass)
-				ircdproto->SendGlobops(s_ChanServ,
-								 "\2%s\2 set password as Services admin for channel \2%s\2",
-								 u->nick, ci->name);
-		} else {
-			alog("%s: %s!%s@%s changed password of %s (founder: %s)",
-				 s_ChanServ, u->nick, u->GetIdent().c_str(), u->host,
-				 ci->name, ci->founder->display);
-		}
-		return MOD_CONT;
-	}
-
 	CommandReturn DoSetDesc(User * u, ChannelInfo * ci, const char *param)
 	{
 		if (ci->desc)
@@ -476,7 +438,9 @@ class CommandCSSet : public Command
 					/* This will probably cause wrong levels to be set, but hey,
 					 * it's better than losing it altogether.
 					 */
-					if (CHECKLEV(CA_AKICK) || CHECKLEV(CA_SET)) {
+					if (access->level == ACCESS_QOP) {
+						access->level = ACCESS_QOP;
+					} else if (CHECKLEV(CA_AKICK) || CHECKLEV(CA_SET)) {
 						access->level = ACCESS_SOP;
 					} else if (CHECKLEV(CA_AUTOOP) || CHECKLEV(CA_OPDEOP)
 							   || CHECKLEV(CA_OPDEOPME)) {
@@ -578,9 +542,9 @@ class CommandCSSet : public Command
 		else if (cmd == "FOUNDER") {
 			if (!is_servadmin
 				&& (ci->
-					flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+					flags & CI_SECUREFOUNDER ? !IsRealFounder(u,
 																ci) :
-					!is_founder(u, ci))) {
+					!IsFounder(u, ci))) {
 				notice_lang(s_ChanServ, u, ACCESS_DENIED);
 			} else {
 				DoSetFounder(u, ci, param);
@@ -588,23 +552,13 @@ class CommandCSSet : public Command
 		} else if (cmd == "SUCCESSOR") {
 			if (!is_servadmin
 				&& (ci->
-					flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+					flags & CI_SECUREFOUNDER ? !IsRealFounder(u,
 																ci) :
-					!is_founder(u, ci))) {
+					!IsFounder(u, ci))) {
 				notice_lang(s_ChanServ, u, ACCESS_DENIED);
 			} else {
 				DoSetSuccessor(u, ci, param);
 			}
-		} else if (cmd == "PASSWORD") {
-			if (!is_servadmin
-				&& (ci->
-					flags & CI_SECUREFOUNDER ? !is_real_founder(u,
-																ci) :
-					!is_founder(u, ci))) {
-				notice_lang(s_ChanServ, u, ACCESS_DENIED);
-			} else {
-				DoSetPassword(u, ci, param);
-			}
 		} else if (cmd == "DESC") {
 			DoSetDesc(u, ci, param);
 		} else if (cmd == "URL") {
@@ -630,9 +584,9 @@ class CommandCSSet : public Command
 		} else if (cmd == "SECUREFOUNDER") {
 			if (!is_servadmin
 				&& (ci->
-					flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+					flags & CI_SECUREFOUNDER ? !IsRealFounder(u,
 																ci) :
-					!is_founder(u, ci))) {
+					!IsFounder(u, ci))) {
 				notice_lang(s_ChanServ, u, ACCESS_DENIED);
 			} else {
 				DoSetSecureFounder(u, ci, param);
@@ -674,8 +628,6 @@ class CommandCSSet : public Command
 			notice_help(s_ChanServ, u, CHAN_HELP_SET_FOUNDER);
 		else if (subcommand == "SUCCESSOR")
 			notice_help(s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR);
-		else if (subcommand == "PASSWORD")
-			notice_help(s_ChanServ, u, CHAN_HELP_SET_PASSWORD);
 		else if (subcommand == "DESC")
 			notice_help(s_ChanServ, u, CHAN_HELP_SET_DESC);
 		else if (subcommand == "URL")
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 4fd3bcd7a..48b0b627a 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -25,6 +25,7 @@ enum
 	XOP_SOP,
 	XOP_VOP,
 	XOP_HOP,
+	XOP_QOP,
 	XOP_TYPES
 };
 
@@ -98,7 +99,20 @@ int xop_msgs[XOP_TYPES][XOP_MESSAGES] = {
 	 CHAN_HOP_DELETED_SEVERAL,
 	 CHAN_HOP_LIST_EMPTY,
 	 CHAN_HOP_LIST_HEADER,
-	 CHAN_HOP_CLEAR}
+	 CHAN_HOP_CLEAR},
+	 {CHAN_QOP_DISABLED,
+	 CHAN_QOP_NICKS_ONLY,
+	 CHAN_QOP_ADDED,
+	 CHAN_QOP_MOVED,
+	 CHAN_QOP_NO_SUCH_ENTRY,
+	 CHAN_QOP_NOT_FOUND,
+	 CHAN_QOP_NO_MATCH,
+	 CHAN_QOP_DELETED,
+	 CHAN_QOP_DELETED_ONE,
+	 CHAN_QOP_DELETED_SEVERAL,
+	 CHAN_QOP_LIST_EMPTY,
+	 CHAN_QOP_LIST_HEADER,
+	 CHAN_QOP_CLEAR}
 };
 
 class XOPBase : public Command
@@ -335,7 +349,7 @@ class XOPBase : public Command
 			return MOD_CONT;
 		}
 
-		if (!is_founder(u, ci) && !u->nc->HasPriv("chanserv/access/modify"))
+		if (!IsFounder(u, ci) && !u->nc->HasPriv("chanserv/access/modify"))
 		{
 			notice_lang(s_ChanServ, u, ACCESS_DENIED);
 			return MOD_CONT;
@@ -392,6 +406,30 @@ class XOPBase : public Command
 	virtual void OnSyntaxError(User *u) = 0;
 };
 
+class CommandCSQOP : public XOPBase
+{
+ public:
+	CommandCSQOP() : XOPBase("QOP")
+	{
+	}
+
+	CommandReturn Execute(User *u, std::vector<ci::string> &params)
+	{
+		return this->DoXop(u, params, ACCESS_QOP, xop_msgs[XOP_QOP]);
+	}
+
+	bool OnHelp(User *u, const ci::string &subcommand)
+	{
+		notice_help(s_ChanServ, u, CHAN_HELP_QOP);
+		return true;
+	}
+
+	void OnSyntaxError(User *u)
+	{
+		syntax_error(s_ChanServ, u, "QOP", CHAN_QOP_SYNTAX);
+	}
+};
+
 class CommandCSAOP : public XOPBase
 {
  public:
@@ -497,7 +535,10 @@ class CSXOP : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
-		this->AddCommand(CHANSERV, new CommandCSAOP());
+		if (ModeManager::FindChannelModeByName(CMODE_OWNER))
+			this->AddCommand(CHANSERV, new CommandCSQOP());
+		if (ModeManager::FindChannelModeByName(CMODE_PROTECT))
+			this->AddCommand(CHANSERV, new CommandCSAOP());
 		if (ModeManager::FindChannelModeByName(CMODE_HALFOP))
 			this->AddCommand(CHANSERV, new CommandCSHOP());
 		this->AddCommand(CHANSERV, new CommandCSSOP());
@@ -505,7 +546,10 @@ class CSXOP : public Module
 	}
 	void ChanServHelp(User *u)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP);
+		if (ModeManager::FindChannelModeByName(CMODE_OWNER))
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_QOP);
+		if (ModeManager::FindChannelModeByName(CMODE_PROTECT))
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP);
 		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AOP);
 		if (ModeManager::FindChannelModeByName(CMODE_HALFOP))
 			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HOP);
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index d72753208..a4d051e47 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -31,7 +31,6 @@ class CommandNSLogout : public Command
 		ci::string param = params.size() > 1 ? params[1] : "";
 		User *u2;
 		NickAlias *na;
-		struct u_chaninfolist *ci, *ci2;
 
 		if (!u->nc->IsServicesOper() && nick)
 			this->OnSyntaxError(u);
@@ -56,15 +55,6 @@ class CommandNSLogout : public Command
 			alog("%s: %s!%s@%s logged out nickname %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u2->nick);
 
 			/* Remove founder status from this user in all channels */
-			ci = u2->founder_chans;
-			while (ci)
-			{
-				ci2 = ci->next;
-				delete ci;
-				ci = ci2;
-			}
-			u2->founder_chans = NULL;
-
 			if (nick)
 				notice_lang(s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick);
 			else
diff --git a/src/users.c b/src/users.c
index 32dadbbba..65d2f7831 100644
--- a/src/users.c
+++ b/src/users.c
@@ -43,7 +43,6 @@ User::User(const std::string &snick, const std::string &suid)
 	server = NULL;
 	nc = NULL;
 	chans = NULL;
-	founder_chans = NULL;
 	invalid_pw_count = timestamp = my_signon = invalid_pw_time = lastmemosend = lastnickreg = lastmail = 0;
 	OnAccess = false;
 
@@ -225,7 +224,6 @@ void User::SetRealname(const std::string &srealname)
 User::~User()
 {
 	struct u_chanlist *c, *c2;
-	struct u_chaninfolist *ci, *ci2;
 	char *srealname;
 
 	if (LogUsers)
@@ -288,16 +286,6 @@ User::~User()
 	cancel_user(this);
 
 	if (debug >= 2)
-		alog("debug: User::~User(): free founder data");
-	ci = this->founder_chans;
-	while (ci)
-	{
-		ci2 = ci->next;
-		delete ci;
-		ci = ci2;
-	}
-
-	if (debug >= 2)
 		alog("debug: User::~User(): delete from list");
 
 	if (this->prev)
@@ -426,7 +414,6 @@ void get_user_stats(long *nusers, long *memuse)
 	int i;
 	User *user;
 	struct u_chanlist *uc;
-	struct u_chaninfolist *uci;
 
 	for (i = 0; i < 1024; i++) {
 		for (user = userlist[i]; user; user = user->next) {
@@ -444,8 +431,6 @@ void get_user_stats(long *nusers, long *memuse)
 				mem += strlen(user->server->name) + 1;
 			for (uc = user->chans; uc; uc = uc->next)
 				mem += sizeof(*uc);
-			for (uci = user->founder_chans; uci; uci = uci->next)
-				mem += sizeof(*uci);
 		}
 	}
 	*nusers = count;