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 (u