Switched cs_set to the subcommand system and added cs_saset

13 files changed, 1069 insertions, 377 deletions

diff --git a/lang/cat.l b/lang/cat.l
index bd2c34d8a..b63731df7 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1101,6 +1101,34 @@ CHAN_DROP_DISABLED
 CHAN_DROPPED
 	El canal %s ha estat eliminat.
 
+# SASET responses
+CHAN_SASET_SYNTAX
+	SASET channel option parameters
+CHAN_SASET_KEEPTOPIC_SYNTAX
+	SASET channel KEEPTOPIC {ON | OFF}
+CHAN_SASET_OPNOTICE_SYNTAX
+	SASET channel OPNOTICE {ON | OFF}
+CHAN_SASET_PEACE_SYNTAX
+	SASET channel PEACE {ON | OFF}
+CHAN_SASET_PERSIST_SYNTAX
+	SASET channel PERSIST {ON | OFF}
+CHAN_SASET_PRIVATE_SYNTAX
+	SASET channel PRIVATE {ON | OFF}
+CHAN_SASET_RESTRICTED_SYNTAX
+	SASET channel RESTRICTED {ON | OFF}
+CHAN_SASET_SECURE_SYNTAX
+	SASET channel SECURE {ON | OFF}
+CHAN_SASET_SECUREFOUNDER_SYNTAX
+	SASET channel SECUREFOUNDER {ON | OFF}
+CHAN_SASET_SECUREOPS_SYNTAX
+	SASET channel SECUREOPS {ON | OFF}
+CHAN_SASET_SIGNKICK_SYNTAX
+	SASET channel SIGNKICK {ON | OFF}
+CHAN_SASET_TOPICLOCK_SYNTAX
+	SASET channel TOPICLOCK {ON | OFF}
+CHAN_SASET_XOP_SYNTAX
+	SASET channel XOP {ON | OFF}
+
 # SET responses
 CHAN_SET_SYNTAX
 	SET canal opció per ametres
@@ -4254,6 +4282,8 @@ CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registra un canal
 CHAN_HELP_CMD_SET
 	    SET        Establir opcions i informació d'un canal
+CHAN_HELP_CMD_SASET
+	    SASET      Forcefully set channel options and information
 CHAN_HELP_CMD_QOP
 	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
@@ -4357,7 +4387,15 @@ CHAN_HELP_DROP
 	Desenregistra el canal especificat. Nomès pot ser utilitzat pel
 	fundador del canal.
 
-CHAN_HELP_SET
+CHAN_HELP_SASET_HEAD
+	Syntax: SASET channel option parameters
+	
+	Allows Services Operators to forcefully change settings
+	on channels.
+	
+	Available options:
+
+CHAN_HELP_SET_HEAD
 	Sintaxis: SET canal opció parametres
 	
 	Li permet al fundador del canal establir varies opcions
@@ -4365,44 +4403,67 @@ CHAN_HELP_SET
 	
 	Opcions disponibles:
 	
+CHAN_HELP_CMD_SET_FOUNDER
 	    FOUNDER       Estableix el fundador d'un canal
+CHAN_HELP_CMD_SET_SUCCESSOR
 	    SUCCESSOR     Estableix el successor d'un canal
+CHAN_HELP_CMD_SET_DESC
 	    DESC          Estableix la descripció del canal
+CHAN_HELP_CMD_SET_URL
 	    URL           Associa una URL amb el canal
+CHAN_HELP_CMD_SET_EMAIL
 	    EMAIL         Associa un E-mail amb el canal
+CHAN_HELP_CMD_SET_ENTRYMSG
 	    ENTRYMSG      Estableix un missatge a enviar als
 	                  usuaris quant entrin al canal
+CHAN_HELP_CMD_SET_BANTYPE
 	    BANTYPE       Estableix com els serveis posen bans
 	                  en el canal
+CHAN_HELP_CMD_SET_MLOCK
 	    MLOCK         Fixa els Modes de canal on o off
+CHAN_HELP_CMD_SET_KEEPTOPIC
 	    KEEPTOPIC     Rete el topic quant el canal no
 	                  esta en uso
+CHAN_HELP_CMD_SET_OPNOTICE
 	    OPNOTICE      Envia una noticia quant les comandes
 	                  OP/DEOP son utilitzats
+CHAN_HELP_CMD_SET_PEACE
 	    PEACE         Regula l'ús de comandes critiques
+CHAN_HELP_CMD_SET_PRIVATE
 	    PRIVATE       Oculta el canal de la comanda LIST
+CHAN_HELP_CMD_SET_RESTRICTED
 	    RESTRICTED    Restringeix l'accés al canal
+CHAN_HELP_CMD_SET_SECURE
 	    SECURE        Activa les opcions de seguretat de %S
+CHAN_HELP_CMD_SET_SECUREOPS
 	    SECUREOPS     Estricte control de l'estatus de chanop
+CHAN_HELP_CMD_SET_SECUREFOUNDER
 	    SECUREFOUNDER Estricto control de l'estatus de fundador
 	                  del canal
+CHAN_HELP_CMD_SET_SIGNKICK
 	    SIGNKICK      Firma kicks fets amb la comanda KICK
+CHAN_HELP_CMD_SET_TOPICLOCK
 	    TOPICLOCK     El topic sols pot ser canviat amb
 	                  TOPIC
+CHAN_HELP_CMD_SET_XOP
 	    XOP           Canvia el sistema de privilegis d'usuari
+CHAN_HELP_CMD_SET_PERSIST
 	    PERSIST       Set the channel as permanent
+CHAN_HELP_CMD_SET_NOEXPIRE
+	    NOEXPIRE      Prevent the channel from expiring
+CHAN_HELP_SET_TAIL
 	
 	Escriu %R%S HELP opció per més informació
 	sobre una opció en particular.
 
 CHAN_HELP_SET_FOUNDER
-	Sintaxis: SET canal FOUNDER nick
+	Sintaxis: %s canal FOUNDER nick
 	
 	Canvia el fundador d'un canal. El nou nickname ha de
 	ser un d'enregistrat.
 
 CHAN_HELP_SET_SUCCESSOR
-	Sintaxis: SET canal SUCCESSOR nick
+	Sintaxis: %s canal SUCCESSOR nick
 	
 	Canvia el successor d'un canal. Si el nickname fundador
 	caduca o es eliminat mentres el canal esta encara registrat,
@@ -4413,13 +4474,13 @@ CHAN_HELP_SET_SUCCESSOR
 	d'enregistrat.
 
 CHAN_HELP_SET_DESC
-	Sintaxis: SET canal DESC descripció
+	Sintaxis: %s canal DESC descripció
 	
 	Estableix la descripció pel canal, la que es mostrada
 	amb les comandes LIST i INFO.
 
 CHAN_HELP_SET_URL
-	Sintaxis: SET canal URL [url]
+	Sintaxis: %s canal URL [url]
 	
 	Associa l'URL especificada amb el canal. Aquesta URL sera mostrada
 	quant algu sol.liciti informació sobre el canal amb
@@ -4427,7 +4488,7 @@ CHAN_HELP_SET_URL
 	esborra la URL actual pel canal.
 
 CHAN_HELP_SET_EMAIL
-	Sintaxis: SET canal EMAIL [direcció]
+	Sintaxis: %s canal EMAIL [direcció]
 	
 	Associa l'adreça e-mail especificada amb el canal.
 	Aquesta adreça sera mostrada quant algu sol.liciti
@@ -4436,14 +4497,14 @@ CHAN_HELP_SET_EMAIL
 	actual pel canal.
 
 CHAN_HELP_SET_ENTRYMSG
-	Sintaxis: SET canal ENTRYMSG [missatge]
+	Sintaxis: %s canal ENTRYMSG [missatge]
 	
 	Especifica el missatge que sera enviat via /notice als
 	usuaris quant ingressin al canal. Si cap parametre
 	es especificat, cap missatge sera enviat al entrar al canal.
 	
 CHAN_HELP_SET_BANTYPE
-	Sintaxis: SET canal BANTYPE tipus_de_ban
+	Sintaxis: %s canal BANTYPE tipus_de_ban
 	
 	Especifica el tipus de ban que sera utilitzat pels
 	serveis quant necessitin banear algu
@@ -4457,7 +4518,7 @@ CHAN_HELP_SET_BANTYPE
 	3: ban de la forma *!*usuari@*.domini
 
 CHAN_HELP_SET_KEEPTOPIC
-	Sintaxis: SET canal KEEPTOPIC {ON | OFF}
+	Sintaxis: %s canal KEEPTOPIC {ON | OFF}
 	
 	Habilita o deshabilita l'opció de retenció de topic 
 	per un canal. Quant la retenció de topic esta
@@ -4467,7 +4528,7 @@ CHAN_HELP_SET_KEEPTOPIC
 	el canal sigui creat.
 
 CHAN_HELP_SET_TOPICLOCK
-	Sintàxi: SET canal TOPICLOCK {ON | OFF}
+	Sintàxi: %s canal TOPICLOCK {ON | OFF}
 	
 	Habilita o deshabilita L'opció de fixació de topic
 	per a un canal. Quan la fixació de topic està
@@ -4475,7 +4536,7 @@ CHAN_HELP_SET_TOPICLOCK
 	sigui canviat excepte amb la comanda TOPIC.
 
 CHAN_HELP_SET_MLOCK
-	Sintàxi: SET canal MLOCK Modes
+	Sintàxi: %s canal MLOCK Modes
 	
 	Estableix el paràmetre de fixació de Modes pel canal.
 	%S et permet definir certs Modes de canal per a estar
@@ -4513,7 +4574,7 @@ CHAN_HELP_SET_MLOCK
 	        són lliures d'estar encesos o apagats.
 
 CHAN_HELP_SET_PEACE
-	Sintàxi: SET canal PEACE {ON | OFF}
+	Sintàxi: %s canal PEACE {ON | OFF}
 	
 	Habilita o deshabilita l'opció de pau per a un
 	canal. Quan pau està establerta, un usuari no
@@ -4522,21 +4583,21 @@ CHAN_HELP_SET_PEACE
 	comandes de %S.
 
 CHAN_HELP_SET_PRIVATE
-	Sintàxi: SET canal PRIVATE {ON | OFF}
+	Sintàxi: %s canal PRIVATE {ON | OFF}
 	
 	Habilita o deshabilita l'opció de privacitat per a un canal.
 	Quan privacitat està establerta, un %R%S LIST no
 	inclourà el canal en cap llista.
 
 CHAN_HELP_SET_RESTRICTED
-	Sintàxi: SET canal RESTRICTED {ON | OFF}
+	Sintàxi: %s canal RESTRICTED {ON | OFF}
 	
 	Enables or disables the restricted access option for a
 	channel.  When restricted access is set, users not on the access list will
 	instead be kicked and banned from the channel.
 
 CHAN_HELP_SET_SECURE
-	Sintàxi: SET canal SECURE {ON | OFF}
+	Sintàxi: %s canal SECURE {ON | OFF}
 	
 	Habilita o deshabilita les característiques de seguretat
 	de %S per a un canal. Quan SECURE està
@@ -4546,7 +4607,7 @@ CHAN_HELP_SET_SECURE
 	accés.
 
 CHAN_HELP_SET_SECUREOPS
-	Sintàxi: SET canal SECUREOPS {ON | OFF}
+	Sintàxi: %s canal SECUREOPS {ON | OFF}
 	
 	Habilita o deshabilita l'opció seguretat de ops per a un
 	canal.  Quan seguretat de ops està establerta, usuaris
@@ -4554,7 +4615,7 @@ CHAN_HELP_SET_SECUREOPS
 	obtenir l' estatus d'operador de canal.
 	
 CHAN_HELP_SET_SECUREFOUNDER
-	Sintàxi: SET canal SECUREFOUNDER {ON | OFF}
+	Sintàxi: %s canal SECUREFOUNDER {ON | OFF}
 	
 	Habilita o deshabilita l'opció seguretat de fundador per a
 	un canal. Quan seguretat de fundador està establerta, només
@@ -4563,7 +4624,7 @@ CHAN_HELP_SET_SECUREFOUNDER
 	amb %S.
 	
 CHAN_HELP_SET_SIGNKICK
-	Sintàxi: SET canal SIGNKICK {ON | LEVEL | OFF}
+	Sintàxi: %s canal SIGNKICK {ON | LEVEL | OFF}
 	
 	Habilita o deshabilita els kicks firmats per a un
 	canal. Quan SIGNKICK està establert, kicks
@@ -4575,7 +4636,7 @@ CHAN_HELP_SET_SIGNKICK
 	firmats. Veure %R%S HELP LEVELS per a més informació.
 
 CHAN_HELP_SET_XOP
-	Sintàxi: SET canal XOP {ON | OFF}
+	Sintàxi: %s canal XOP {ON | OFF}
 	
 	Habilita o deshabilita el sistema de llistes xOP per a un canal.
 	Quan XOP està establert, has de fer servir les comandes AOP/SOP/VOP
@@ -4597,7 +4658,7 @@ CHAN_HELP_SET_XOP
 	problema.
 
 CHAN_HELP_SET_PERSIST
-	Syntax: SET channel PERSIST {ON | OFF}
+	Syntax: %s channel PERSIST {ON | OFF}
 
 	Enables or disables the persistant channel setting.
 	When persistant is set, the service bot will remain
@@ -4620,7 +4681,7 @@ CHAN_HELP_SET_PERSIST
 	set persist on or off.
 
 CHAN_HELP_SET_OPNOTICE
-	Sintàxi: SET canal OPNOTICE {ON | OFF}
+	Sintàxi: %s canal OPNOTICE {ON | OFF}
 	
 	Habilita o deshabilita l'opció de op-notice per a un canal.
 	Quan op-notice està establert, %S enviarà una noticia
@@ -5196,14 +5257,6 @@ CHAN_SERVADMIN_HELP_DROP
 	administradors de serveis poden eliminar un
 	canal per el qual no s'haguin identificado.
 
-CHAN_SERVADMIN_HELP_SET
-	
-	Administradors de serveis poden tambié establir la
-	Opció NOEXPIRE, amb la qual s'evita que els canals
-	expirin. A més, administradors de
-	serveis poden establir opcions per a qualsevol canal
-	sense haver d'identificarse per clau en el canal.
-
 CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 	Sintàxi: SET canal NOEXPIRE {ON | OFF}
 	
diff --git a/lang/de.l b/lang/de.l
index f457eccc0..c1286a050 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1122,6 +1122,34 @@ CHAN_DROP_DISABLED
 CHAN_DROPPED
 	Channel %s wurde aus der Datenbank entfernt.
 
+# SASET responses
+CHAN_SASET_SYNTAX
+	SASET channel option parameter
+CHAN_SASET_KEEPTOPIC_SYNTAX
+	SASET channel KEEPTOPIC {ON | OFF}
+CHAN_SASET_OPNOTICE_SYNTAX
+	SASET channel OPNOTICE {ON | OFF}
+CHAN_SASET_PEACE_SYNTAX
+	SASET channel PEACE {ON | OFF}
+CHAN_SASET_PERSIST_SYNTAX
+	SASET channel PERSIST {ON | OFF}
+CHAN_SASET_PRIVATE_SYNTAX
+	SASET channel PRIVATE {ON | OFF}
+CHAN_SASET_RESTRICTED_SYNTAX
+	SASET channel RESTRICTED {ON | OFF}
+CHAN_SASET_SECURE_SYNTAX
+	SASET channel SECURE {ON | OFF}
+CHAN_SASET_SECUREFOUNDER_SYNTAX
+	SASET channel SECUREFOUNDER {ON | OFF}
+CHAN_SASET_SECUREOPS_SYNTAX
+	SASET channel SECUREOPS {ON | OFF}
+CHAN_SASET_SIGNKICK_SYNTAX
+	SASET channel SIGNKICK {ON | OFF}
+CHAN_SASET_TOPICLOCK_SYNTAX
+	SASET channel TOPICLOCK {ON | OFF}
+CHAN_SASET_XOP_SYNTAX
+	SASET channel XOP {ON | OFF}
+
 # SET responses
 CHAN_SET_SYNTAX
 	SET Channel Option Parameter
@@ -4287,6 +4315,8 @@ CHAN_HELP_CMD_REGISTER
 CHAN_HELP_CMD_SET
 	    SET        Bestimmte Channel-Optionen und
 	               Informationen einstellen
+CHAN_HELP_CMD_SASET
+	    SASET      Forcefully set channel options and information
 CHAN_HELP_CMD_QOP
 	    QOP        Verwaltet die QOP-Liste von einem Channel
 CHAN_HELP_CMD_AOP
@@ -4394,7 +4424,15 @@ CHAN_HELP_DROP
 	Entfernt die Registrierung des angegebenen Channels.
 	Kann nur vom Channel-Founder benutzt werden.
 
-CHAN_HELP_SET
+CHAN_HELP_SASET_HEAD
+	Syntax: SASET channel option parameters
+	
+	Allows Services Operators to forcefully change settings
+	on channels.
+	
+	Available options:
+
+CHAN_HELP_SET_HEAD
 	Syntax: SET Channel Option Parameter
 	
 	Erlaubt es dem Channel-Founder bestimmte Optionen
@@ -4402,44 +4440,65 @@ CHAN_HELP_SET
 	
 	Verfügbare Optionen:
 	
+CHAN_HELP_CMD_SET_FOUNDER
 	    FOUNDER       Stellt den Gründer des Channels ein
+CHAN_HELP_CMD_SET_SUCCESSOR
 	    SUCCESSOR     Stellt den Vertreter des Founders ein
+CHAN_HELP_CMD_SET_DESC
 	    DESC          Ändert die Channel-Beschreibung
+CHAN_HELP_CMD_SET_URL
 	    URL           Verbindet eine URL mit dem Channel
+CHAN_HELP_CMD_SET_EMAIL
 	    EMAIL         Verbindet eine eMail-Adresse mit dem
 	                  Channel
+CHAN_HELP_CMD_SET_ENTRYMSG
 	    ENTRYMSG      Stellt eine Begrüssungsmeldung des
 	                  Channels ein
-	    TOPIC         Ändert das Topic im Channel
+CHAN_HELP_CMD_SET_BANTYPE
 	    BANTYPE       Ändert den Ban-Typ, den die Services
 	                  in dem Channel anwenden
+CHAN_HELP_CMD_SET_KEEPTOPIC
 	    KEEPTOPIC     Topic behalten, wenn Channel nicht
 	                  benutzt wird
+CHAN_HELP_CMD_SET_TOPICLOCK
 	    TOPICLOCK     Topic kann nur durch TOPIC geändert werden
+CHAN_HELP_CMD_SET_MLOCK
 	    MLOCK         Channel-Modes fest einstellen
+CHAN_HELP_CMD_SET_PRIVATE
 	    PRIVATE       Den Channel vom /LIST-Befehl verstecken
+CHAN_HELP_CMD_SET_RESTRICTED
 	    RESTRICTED    Eingeschränkter Zugriff auf den Channel
+CHAN_HELP_CMD_SET_SECURE
 	    SECURE        Aktiviert %S's Sicherheits-funktionen
+CHAN_HELP_CMD_SET_SECUREOPS
 	    SECUREOPS     Strengere Kontrolle des Op-Status im Channel
+CHAN_HELP_CMD_SET_SECUREFOUNDER
 	    SECUREFOUNDER Strengere Kontrolle des Founder-Status
+CHAN_HELP_CMD_SET_SIGNKICK
 	    SIGNKICK      Kicks durch ChanServ in dem Channel
 	                  werden durch den Kicker signiert
+CHAN_HELP_CMD_SET_OPNOTICE
 	    OPNOTICE      Sendet eine Notice wenn Op/Deop-Befehl
 	                  benutzt werden
+CHAN_HELP_CMD_SET_XOP
 	    XOP           Schaltet das Listen System ein oder aus
+CHAN_HELP_CMD_SET_PERSIST
 	    PERSIST       Set the channel as permanent
+CHAN_HELP_CMD_SET_NOEXPIRE
+	    NOEXPIRE      Prevent the channel from expiring
+CHAN_HELP_SET_TAIL
 	
 	Tippe %R%S HELP Option für weitere Informationen
 	zu einem bestimmten Befehl.
 
 CHAN_HELP_SET_FOUNDER
-	Syntax: SET Channel FOUNDER Nickname
+	Syntax: %s Channel FOUNDER Nickname
 	
 	Ändert den Gründer (Founder) eines Channels. Der neue
 	Nickname muss registriert sein.
 
 CHAN_HELP_SET_SUCCESSOR
-	Syntax: SET Channel SUCCESSOR Nickname
+	Syntax: %s Channel SUCCESSOR Nickname
 	
 	Ändert den Vertreter des Gründers in dem Channel. Wenn
 	der Nickname des Gründers ausläuft oder gedropped wird,
@@ -4451,13 +4510,13 @@ CHAN_HELP_SET_SUCCESSOR
 	Der Nickname des Vertreters muss registriert sein.
 
 CHAN_HELP_SET_DESC
-	Syntax: SET Channel DESC Beschreibung
+	Syntax: %s Channel DESC Beschreibung
 	
 	Ändert die Beschreibung für einen Channel, die bei
 	dem LIST und INFO Befehl angezeigt wird.
 
 CHAN_HELP_SET_URL
-	Syntax: SET Channel URL [Url]
+	Syntax: %s Channel URL [Url]
 	
 	Verbindet die angegebene URL mit dem Channel. Diese
 	URL wird angezeigt, wenn jemand Informationen
@@ -4466,7 +4525,7 @@ CHAN_HELP_SET_URL
 	URL gelöscht.
 
 CHAN_HELP_SET_EMAIL
-	Syntax: SET Channel EMAIL [eMail-Adresse]
+	Syntax: %s Channel EMAIL [eMail-Adresse]
 	
 	Verbindet die angegebene eMail-Adresse mit dem
 	Channel. Diese eMail-Adresse wird angezeigt,
@@ -4475,7 +4534,7 @@ CHAN_HELP_SET_EMAIL
 	angegeben, wird die aktuelle eMail-Adresse gelöscht.
 
 CHAN_HELP_SET_ENTRYMSG
-	Syntax: SET Channel ENTRYMSG [Nachricht]
+	Syntax: %s Channel ENTRYMSG [Nachricht]
 	
 	Ändert die Nachricht, die User beim Joinen des
 	Channels per /notice bekommen. Wird kein Parameter
@@ -4483,7 +4542,7 @@ CHAN_HELP_SET_ENTRYMSG
 	angezeigt.
 	
 CHAN_HELP_SET_BANTYPE
-	Syntax: SET Channel BANTYPE Ban-Typ
+	Syntax: %s Channel BANTYPE Ban-Typ
 	
 	Stellt den Ban-Typ für den Channel ein, den die
 	Services anwenden, wenn sie einen Ban eintragen
@@ -4497,7 +4556,7 @@ CHAN_HELP_SET_BANTYPE
 	3: Ban in der Form *!*user@*.domain
 
 CHAN_HELP_SET_KEEPTOPIC
-	Syntax: SET Channel KEEPTOPIC {ON | OFF}
+	Syntax: %s Channel KEEPTOPIC {ON | OFF}
 	
 	Aktiviert oder deaktiviert die Topic Wiederherstellung für
 	den Channel. Wird diese Option eingeschaltet, wird das 
@@ -4507,7 +4566,7 @@ CHAN_HELP_SET_KEEPTOPIC
 	kommt.
 
 CHAN_HELP_SET_TOPICLOCK
-	Syntax: SET Channel TOPICLOCK {ON | OFF}
+	Syntax: %s Channel TOPICLOCK {ON | OFF}
 	
 	Aktiviert oder deaktiviert die topic lock-Option
 	für den angegebenen Channel.
@@ -4516,7 +4575,7 @@ CHAN_HELP_SET_TOPICLOCK
 	ausser es wurde durch TOPIC eingestellt.
 
 CHAN_HELP_SET_MLOCK
-	Syntax: SET Channel MLOCK Modi
+	Syntax: %s Channel MLOCK Modi
 	
 	Stellt den Mode-Lock-Parameter für den angegebenen
 	Channel ein. %S ermöglicht es dir, einzustellen,
@@ -4551,7 +4610,7 @@ CHAN_HELP_SET_MLOCK
 	        kann jetzt wahlweise an oder ausgeschaltet werden.
 
 CHAN_HELP_SET_PEACE
-	Syntax: SET Channel PEACE {ON | OFF}
+	Syntax: %s Channel PEACE {ON | OFF}
 
 	Aktiviert oder deaktiviert die peace Option. Wenn
 	peace aktiviert ist, kann ein User einen anderen User
@@ -4559,21 +4618,21 @@ CHAN_HELP_SET_PEACE
 	%S  kicken, bannen oder dessen Channelstatus löschen.
 
 CHAN_HELP_SET_PRIVATE
-	Syntax: SET Channel PRIVATE {ON | OFF}
+	Syntax: %s Channel PRIVATE {ON | OFF}
 	
 	Schaltet den Privat-Modus für einen Channel an
 	oder aus. Wird er aktiviert, wird der Channel in der
 	Ausgabe von%R%S LIST nicht mehr auftauchen.
 
 CHAN_HELP_SET_RESTRICTED
-	Syntax: SET Channel RESTRICTED {ON | OFF}
+	Syntax: %s Channel RESTRICTED {ON | OFF}
 	
 	Enables or disables the restricted access option for a
 	channel.  When restricted access is set, users not on the access list will
 	instead be kicked and banned from the channel.
 
 CHAN_HELP_SET_SECURE
-	Syntax: SET Channel SECURE {ON | OFF}
+	Syntax: %s Channel SECURE {ON | OFF}
 	
 	Aktiviert oder deaktiviert die Sicherheitsfunktionen
 	von %S für den angegebenen Channel. 
@@ -4583,7 +4642,7 @@ CHAN_HELP_SET_SECURE
 	in der Zugriffsliste des Channels steht.
 
 CHAN_HELP_SET_SECUREOPS
-	Syntax: SET Channel SECUREOPS {ON | OFF}
+	Syntax: %s Channel SECUREOPS {ON | OFF}
 	
 	Ändert die Secure-Ops Option für einen Channel.
 	Wird diese Option eingeschaltet, können Nicknamen, 
@@ -4591,7 +4650,7 @@ CHAN_HELP_SET_SECUREOPS
 	keinen Op-Status erhalten.
 	
 CHAN_HELP_SET_SECUREFOUNDER
-	Syntax: SET Channel SECUREFOUNDER {ON | OFF}
+	Syntax: %s Channel SECUREFOUNDER {ON | OFF}
 	
 	Aktiviert oder deaktiviert die Secure Founder-Option
 	für einen Channel.
@@ -4602,7 +4661,7 @@ CHAN_HELP_SET_SECUREFOUNDER
 	hat.
 	
 CHAN_HELP_SET_SIGNKICK
-	Syntax: SET Channel SIGNKICK {ON | LEVEL | OFF}
+	Syntax: %s Channel SIGNKICK {ON | LEVEL | OFF}
 	
 	Aktiviert oder deaktiviert signierte Kicks für einen
 	Channel. Ist SIGNKICK aktiviert, wird der Grund
@@ -4615,7 +4674,7 @@ CHAN_HELP_SET_SIGNKICK
 	Siehe %R%S HELP LEVELS für weitere Informationen.
 
 CHAN_HELP_SET_XOP
-	Syntax: SET Channel XOP {ON | OFF}
+	Syntax: %s Channel XOP {ON | OFF}
 	
 	Aktiviert oder deaktiviert das xOP Listen System für einen Channel.
 	Wenn XOP aktiviert ist, musst du AOP/SOP/VOP
@@ -4636,7 +4695,7 @@ CHAN_HELP_SET_XOP
 	jedoch fehlerfrei.
 
 CHAN_HELP_SET_PERSIST
-	Syntax: SET channel PERSIST {ON | OFF}
+	Syntax: %s channel PERSIST {ON | OFF}
 
 	Enables or disables the persistant channel setting.
 	When persistant is set, the service bot will remain
@@ -4659,7 +4718,7 @@ CHAN_HELP_SET_PERSIST
 	set persist on or off.
 
 CHAN_HELP_SET_OPNOTICE
-	Syntax: SET Channel OPNOTICE {ON | OFF}
+	Syntax: %s Channel OPNOTICE {ON | OFF}
 	
 	Aktiviert oder deaktiviert die Op-Notice Option für
 	einen Channel.
@@ -5230,16 +5289,6 @@ CHAN_SERVADMIN_HELP_DROP
 	(löschen) ohne sich vorher gegenüber dem Channel als 
 	Founder zu identifizieren.
 
-CHAN_SERVADMIN_HELP_SET
-	
-	Services Administratoren können zusätzlich die Option NOEXPIRE
-	an einem Channel setzen, dies verhindert den automatischen
-	Auslauf des Channels.
-	
-	Weiterhin können Services Administratoren Einstellungen 
-	eines Channels verändern, ohne sich vorher für ihn
-	identifizieren zu müssen.
-
 CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 	Syntax: SET Channel NOEXPIRE {ON | OFF}
 	
diff --git a/lang/en_us.l b/lang/en_us.l
index fca68c14b..9616558c0 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1077,6 +1077,34 @@ CHAN_DROP_DISABLED
 CHAN_DROPPED
 	Channel %s has been dropped.
 
+# SASET responses
+CHAN_SASET_SYNTAX
+	SASET channel option parameters
+CHAN_SASET_KEEPTOPIC_SYNTAX
+	SASET channel KEEPTOPIC {ON | OFF}
+CHAN_SASET_OPNOTICE_SYNTAX
+	SASET channel OPNOTICE {ON | OFF}
+CHAN_SASET_PEACE_SYNTAX
+	SASET channel PEACE {ON | OFF}
+CHAN_SASET_PERSIST_SYNTAX
+	SASET channel PERSIST {ON | OFF}
+CHAN_SASET_PRIVATE_SYNTAX
+	SASET channel PRIVATE {ON | OFF}
+CHAN_SASET_RESTRICTED_SYNTAX
+	SASET channel RESTRICTED {ON | OFF}
+CHAN_SASET_SECURE_SYNTAX
+	SASET channel SECURE {ON | OFF}
+CHAN_SASET_SECUREFOUNDER_SYNTAX
+	SASET channel SECUREFOUNDER {ON | OFF}
+CHAN_SASET_SECUREOPS_SYNTAX
+	SASET channel SECUREOPS {ON | OFF}
+CHAN_SASET_SIGNKICK_SYNTAX
+	SASET channel SIGNKICK {ON | OFF}
+CHAN_SASET_TOPICLOCK_SYNTAX
+	SASET channel TOPICLOCK {ON | OFF}
+CHAN_SASET_XOP_SYNTAX
+	SASET channel XOP {ON | OFF}
+
 # SET responses
 CHAN_SET_SYNTAX
 	SET channel option parameters
@@ -4102,6 +4130,8 @@ CHAN_HELP_CMD_REGISTER
 	    REGISTER   Register a channel
 CHAN_HELP_CMD_SET
 	    SET        Set channel options and information
+CHAN_HELP_CMD_SASET
+	    SASET      Forcefully set channel options and information
 CHAN_HELP_CMD_QOP
 	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
@@ -4203,7 +4233,15 @@ CHAN_HELP_DROP
 	Unregisters the named channel.  Can only be used by
 	channel founder.
 
-CHAN_HELP_SET
+CHAN_HELP_SASET_HEAD
+	Syntax: SASET channel option parameters
+	
+	Allows Services Operators to forcefully change settings
+	on channels.
+	
+	Available options:
+
+CHAN_HELP_SET_HEAD
 	Syntax: SET channel option parameters
 	
 	Allows the channel founder to set various channel options
@@ -4211,39 +4249,62 @@ CHAN_HELP_SET
 	
 	Available options:
 	
+CHAN_HELP_CMD_SET_FOUNDER
 	    FOUNDER       Set the founder of a channel
+CHAN_HELP_CMD_SET_SUCCESSOR
 	    SUCCESSOR     Set the successor for a channel
+CHAN_HELP_CMD_SET_DESC
 	    DESC          Set the channel description
+CHAN_HELP_CMD_SET_URL
 	    URL           Associate a URL with the channel
+CHAN_HELP_CMD_SET_EMAIL
 	    EMAIL         Associate an E-mail address with the channel
+CHAN_HELP_CMD_SET_ENTRYMSG
 	    ENTRYMSG      Set a message to be sent to users when they
 	                     enter the channel
+CHAN_HELP_CMD_SET_BANTYPE
 	    BANTYPE       Set how Services make bans on the channel
+CHAN_HELP_CMD_SET_MLOCK
 	    MLOCK         Lock channel modes on or off
+CHAN_HELP_CMD_SET_KEEPTOPIC
 	    KEEPTOPIC     Retain topic when channel is not in use
+CHAN_HELP_CMD_SET_OPNOTICE
 	    OPNOTICE      Send a notice when OP/DEOP commands are used
+CHAN_HELP_CMD_SET_PEACE
 	    PEACE         Regulate the use of critical commands
+CHAN_HELP_CMD_SET_PRIVATE
 	    PRIVATE       Hide channel from LIST command
+CHAN_HELP_CMD_SET_RESTRICTED
 	    RESTRICTED    Restrict access to the channel
+CHAN_HELP_CMD_SET_SECURE
 	    SECURE        Activate %S security features
+CHAN_HELP_CMD_SET_SECUREOPS
 	    SECUREOPS     Stricter control of chanop status
+CHAN_HELP_CMD_SET_SECUREFOUNDER
 	    SECUREFOUNDER Stricter control of channel founder status
+CHAN_HELP_CMD_SET_SIGNKICK
 	    SIGNKICK      Sign kicks that are done with KICK command
+CHAN_HELP_CMD_SET_TOPICLOCK
 	    TOPICLOCK     Topic can only be changed with TOPIC
+CHAN_HELP_CMD_SET_XOP
 	    XOP           Toggle the user privilege system
+CHAN_HELP_CMD_SET_PERSIST
 	    PERSIST       Set the channel as permanent
+CHAN_HELP_CMD_SET_NOEXPIRE
+	    NOEXPIRE      Prevent the channel from expiring
+CHAN_HELP_SET_TAIL
 	
 	Type %R%S HELP SET option for more information on a
 	particular option.
 
 CHAN_HELP_SET_FOUNDER
-	Syntax: SET channel FOUNDER nick
+	Syntax: %s channel FOUNDER nick
 	
 	Changes the founder of a channel.  The new nickname must
 	be a registered one.
 
 CHAN_HELP_SET_SUCCESSOR
-	Syntax: SET channel SUCCESSOR nick
+	Syntax: %s channel SUCCESSOR nick
 	
 	Changes the successor of a channel.  If the founder's
 	nickname expires or is dropped while the channel is still
@@ -4254,13 +4315,13 @@ CHAN_HELP_SET_SUCCESSOR
 	nickname must be a registered one.
 
 CHAN_HELP_SET_DESC
-	Syntax: SET channel DESC description
+	Syntax: %s channel DESC description
 	
 	Sets the description for the channel, which shows up with
 	the LIST and INFO commands.
 
 CHAN_HELP_SET_URL
-	Syntax: SET channel URL [url]
+	Syntax: %s channel URL [url]
 	
 	Associates the given URL with the channel.  This URL will
 	be displayed whenever someone requests information on the
@@ -4268,7 +4329,7 @@ CHAN_HELP_SET_URL
 	deletes any current URL for the channel.
 
 CHAN_HELP_SET_EMAIL
-	Syntax: SET channel EMAIL [address]
+	Syntax: %s channel EMAIL [address]
 	
 	Associates the given E-mail address with the channel.
 	This address will be displayed whenever someone requests
@@ -4277,14 +4338,14 @@ CHAN_HELP_SET_EMAIL
 	the channel.
 
 CHAN_HELP_SET_ENTRYMSG
-	Syntax: SET channel ENTRYMSG [message]
+	Syntax: %s channel ENTRYMSG [message]
 	
 	Sets the message which will be sent via /notice to users
 	when they enter the channel.  If no parameter is given,
 	causes no message to be sent upon entering the channel.
 
 CHAN_HELP_SET_BANTYPE
-	Syntax: SET channel BANTYPE bantype
+	Syntax: %s channel BANTYPE bantype
 	
 	Sets the ban type that will be used by services whenever
 	they need to ban someone from your channel.
@@ -4297,7 +4358,7 @@ CHAN_HELP_SET_BANTYPE
 	3: ban in the form *!*user@*.domain
 
 CHAN_HELP_SET_KEEPTOPIC
-	Syntax: SET channel KEEPTOPIC {ON | OFF}
+	Syntax: %s channel KEEPTOPIC {ON | OFF}
 	
 	Enables or disables the topic retention option for a
 	channel.  When topic retention is set, the topic for the
@@ -4306,7 +4367,7 @@ CHAN_HELP_SET_KEEPTOPIC
 	next time the channel is created.
 
 CHAN_HELP_SET_TOPICLOCK
-	Syntax: SET channel TOPICLOCK {ON | OFF}
+	Syntax: %s channel TOPICLOCK {ON | OFF}
 	
 	Enables or disables the topic lock option for a channel.
 	When topic lock is set, %S will not allow the
@@ -4314,7 +4375,7 @@ CHAN_HELP_SET_TOPICLOCK
 	command.
 
 CHAN_HELP_SET_MLOCK
-	Syntax: SET channel MLOCK modes
+	Syntax: %s channel MLOCK modes
 	
 	Sets the mode-lock parameter for the channel. %S
 	allows you to define certain channel modes to be always
@@ -4348,7 +4409,7 @@ CHAN_HELP_SET_MLOCK
 	        to be either on or off.
 
 CHAN_HELP_SET_PEACE
-	Syntax: SET channel PEACE {ON | OFF}
+	Syntax: %s channel PEACE {ON | OFF}
 	
 	Enables or disables the peace option for a channel.
 	When peace is set, a user won't be able to kick,
@@ -4356,21 +4417,21 @@ CHAN_HELP_SET_PEACE
 	a level superior or equal to his via %S commands.
 
 CHAN_HELP_SET_PRIVATE
-	Syntax: SET channel PRIVATE {ON | OFF}
+	Syntax: %s channel PRIVATE {ON | OFF}
 	
 	Enables or disables the private option for a channel.
 	When private is set, a %R%S LIST will not
 	include the channel in any lists.
 
 CHAN_HELP_SET_RESTRICTED
-	Syntax: SET channel RESTRICTED {ON | OFF}
+	Syntax: %s channel RESTRICTED {ON | OFF}
 	
 	Enables or disables the restricted access option for a
 	channel.  When restricted access is set, users not on the access list will
 	instead be kicked and banned from the channel.
 
 CHAN_HELP_SET_SECURE
-	Syntax: SET channel SECURE {ON | OFF}
+	Syntax: %s channel SECURE {ON | OFF}
 	
 	Enables or disables %S's security features for a
 	channel.  When SECURE is set, only users who have
@@ -4379,14 +4440,14 @@ CHAN_HELP_SET_SECURE
 	as controlled by the access list.
 
 CHAN_HELP_SET_SECUREOPS
-	Syntax: SET channel SECUREOPS {ON | OFF}
+	Syntax: %s channel SECUREOPS {ON | OFF}
 	
 	Enables or disables the secure ops option for a channel.
 	When secure ops is set, users who are not on the userlist
 	will not be allowed chanop status.
 	
 CHAN_HELP_SET_SECUREFOUNDER
-	Syntax: SET channel SECUREFOUNDER {ON | OFF}
+	Syntax: %s channel SECUREFOUNDER {ON | OFF}
 	
 	Enables or disables the secure founder option for a channel.
 	When secure founder is set, only the real founder will be
@@ -4394,7 +4455,7 @@ CHAN_HELP_SET_SECUREFOUNDER
 	successor, and not those who are IDENTIFY'd with %S.
 	
 CHAN_HELP_SET_SIGNKICK
-	Syntax: SET channel SIGNKICK {ON | LEVEL | OFF}
+	Syntax: %s channel SIGNKICK {ON | LEVEL | OFF}
 	
 	Enables or disables signed kicks for a
 	channel.  When SIGNKICK is set, kicks issued with
@@ -4406,7 +4467,7 @@ CHAN_HELP_SET_SIGNKICK
 	kicks signed. See %R%S HELP LEVELS for more information. 
 
 CHAN_HELP_SET_XOP
-	Syntax: SET channel XOP {ON | OFF}
+	Syntax: %s channel XOP {ON | OFF}
 	
 	Enables or disables the xOP lists system for a channel.
 	When XOP is set, you have to use the AOP/SOP/VOP
@@ -4428,7 +4489,7 @@ CHAN_HELP_SET_XOP
 	causes no problem though.
 
 CHAN_HELP_SET_PERSIST
-	Syntax: SET channel PERSIST {ON | OFF}
+	Syntax: %s channel PERSIST {ON | OFF}
 
 	Enables or disables the persistant channel setting.
 	When persistant is set, the service bot will remain
@@ -4451,7 +4512,7 @@ CHAN_HELP_SET_PERSIST
 	set persist on or off.
 
 CHAN_HELP_SET_OPNOTICE
-	Syntax: SET channel OPNOTICE {ON | OFF}
+	Syntax: %s channel OPNOTICE {ON | OFF}
 	
 	Enables or disables the op-notice option for a channel.
 	When op-notice is set, %S will send a notice to the
@@ -5002,13 +5063,6 @@ CHAN_SERVADMIN_HELP_DROP
 	Unregisters the named channel.  Only Services Operators
 	can drop a channel for which they have not identified.
 
-CHAN_SERVADMIN_HELP_SET
-	
-	Services Operators can also set the option NOEXPIRE, with
-	which channels can be prevented from expiring.
-	Additionally, Services Operators can set options for any
-	channel without identifying by password for the channel.
-
 CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 	Syntax: SET channel NOEXPIRE {ON | OFF}
 	
diff --git a/lang/es.l b/lang/es.l
index 3f79f3d06..d4d7d331c 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1099,6 +1099,34 @@ CHAN_DROP_DISABLED
 CHAN_DROPPED
 	El canal %s ha sido botado.
 
+# SASET responses
+CHAN_SASET_SYNTAX
+	SASET channel option parameters
+CHAN_SASET_KEEPTOPIC_SYNTAX
+	SASET channel KEEPTOPIC {ON | OFF}
+CHAN_SASET_OPNOTICE_SYNTAX
+	SASET channel OPNOTICE {ON | OFF}
+CHAN_SASET_PEACE_SYNTAX
+	SASET channel PEACE {ON | OFF}
+CHAN_SASET_PERSIST_SYNTAX
+	SASET channel PERSIST {ON | OFF}
+CHAN_SASET_PRIVATE_SYNTAX
+	SASET channel PRIVATE {ON | OFF}
+CHAN_SASET_RESTRICTED_SYNTAX
+	SASET channel RESTRICTED {ON | OFF}
+CHAN_SASET_SECURE_SYNTAX
+	SASET channel SECURE {ON | OFF}
+CHAN_SASET_SECUREFOUNDER_SYNTAX
+	SASET channel SECUREFOUNDER {ON | OFF}
+CHAN_SASET_SECUREOPS_SYNTAX
+	SASET channel SECUREOPS {ON | OFF}
+CHAN_SASET_SIGNKICK_SYNTAX
+	SASET channel SIGNKICK {ON | OFF}
+CHAN_SASET_TOPICLOCK_SYNTAX
+	SASET channel TOPICLOCK {ON | OFF}
+CHAN_SASET_XOP_SYNTAX
+	SASET channel XOP {ON | OFF}
+
 # SET responses
 CHAN_SET_SYNTAX
 	SET canal opcion parametros
@@ -4225,6 +4253,8 @@ CHAN_HELP_CMD_REGISTER
 	    REGISTER   Registra un canal
 CHAN_HELP_CMD_SET
 	    SET        Setea opciones e informacion de un canal
+CHAN_HELP_CMD_SASET
+	    SASET      Forcefully set channel options and information
 CHAN_HELP_CMD_QOP
 	    QOP        Modify the list of QOP users
 CHAN_HELP_CMD_AOP
@@ -4328,7 +4358,15 @@ CHAN_HELP_DROP