BUILD : 1.7.21 (1425) BUGS : 873 NOTES : We now show config variables in the help.

git-svn-id: svn://svn.anope.org/anope/trunk@1425 31f1291d-b8d6-0310-a050-a5561fc1590b


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

22 files changed, 548 insertions, 486 deletions

diff --git a/Changes b/Changes
index 3e7e6f02a..e5b66cb77 100644
--- a/Changes
+++ b/Changes
@@ -54,6 +54,7 @@ Anope Version  S V N
 08/28 F Updated help on ChanServ AKICK.                                   [#879]
 09/01 F Fixed crashbug in cs_access.                                      [#932]
 09/02 F Fixed bug in enc_none in combination with truncated pass.         [#934]
+09/03 F Fixed variables not correctly shown in help.                      [#873]
 
 Provided by Robin Burchell <w00t@inspircd.org> - 2008
 08/08 F Strict warnings in send.c from comparing address of non-ptr       [ #00]
diff --git a/include/commands.h b/include/commands.h
index 3edbdf9df..ce7625ae8 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -26,6 +26,7 @@ extern void run_cmd(char *service, User *u, Command *list,
 extern void help_cmd(char *service, User *u, Command *list,
 		char *name);
 extern void do_run_cmd(char *service, User * u, Command *c,const char *cmd);
+extern void do_help_limited(char *service, User * u, Command * c);
 extern void do_help_cmd(char *service, User * u, Command *c,const char *cmd);
 extern MDE void mod_help_cmd(char *service, User *u, CommandHash *cmdTable[],const char *cmd);
 extern MDE void mod_run_cmd(char *service, User *u, CommandHash *cmdTable[],const char *cmd);
diff --git a/lang/cat.l b/lang/cat.l
index b2e1ddf57..116ee4921 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -3407,34 +3407,36 @@ NEWS_RANDOM_DELETED_ALL
 	Totes les notνcies al azar esborrades.
 
 NEWS_HELP_LOGON
-	Sintaxis: LOGONNEWS ADD text
-	        LOGONNEWS DEL {numero | ALL}
+	Syntax: LOGONNEWS ADD text
+	        LOGONNEWS DEL {num | ALL}
 	        LOGONNEWS LIST
 	
-	Edita o mostra la llista de notνcies d'entrada. Quant un
-	usuari es connecta a la xarxa, aquest missatges li seran
-	enviats. (De tota manera, no mes de 3 missatges seran enviats
-	per evitar floodejar a l'usuari. Si hi ha mιs de 3 notνcies,
-	els 3 ultims li seran enviades.)
+	Edits or displays the list of logon news messages.  When a
+	user connects to the network, these messages will be sent
+	to them.  (However, no more than %d messages will be
+	sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	LOGONNEWS LIST pot ser utilitzat per qualsevol operador 
-	d'IRC per a llistar les notνcies actuals. ADD o DEL nomθs
-	pot ser utilitzat per administradors de serveis.
+	LOGONNEWS LIST may be used by any IRC operator to list the
+	current news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_OPER
-	Sintaxis: OPERNEWS ADD text
-	          OPERNEWS DEL {numero | ALL}
-	          OPERNEWS LIST
+	Syntax: OPERNEWS ADD text
+	        OPERNEWS DEL {num | ALL}
+	        OPERNEWS LIST
 	
-	Edita o mostra la llista de notνcies. Quant un usuari es
-	transforma en operador (amb la comanda /oper), aquests
-	missatges li seran enviats. (De tota manera, no mes de 3 missatges seran 
-	enviats per evitar floodejar a l'usuari. Si hi ha mιs de 3 notνcies,
-	els 3 ultims li seran enviades.)
+	Edits or displays the list of oper news messages.  When a
+	user opers up (with the /OPER command), these messages will
+	be sent to them.  (However, no more than %d messages will
+	be sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	OPERNEWS LIST pot ser utilitzat per qualsevol operador d'IRC
-	per llistar les notνcies d'operador actuals. ADD i DEL nomθs
-	pot ser utilitzats per administradors de serveis.
+	OPERNEWS LIST may be used by any IRC operator to list the
+	current oper news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_RANDOM
 	Sintaxis: RANDOMNEWS ADD text
@@ -3991,40 +3993,42 @@ NICK_HELP_SASET_LANGUAGE
 	that you can get by typing %R%S HELP SET LANGUAGE.
 
 NICK_HELP_RECOVER
-	Sintaxis: RECOVER nickname [clau]
-	
-	Et permet recuperar el teu nickname si algϊ l'esta
-	utilitzant; Aixς fa el mateix que %S fa automaticament
-	si algϊ prova d'utilitzar un nick amb protecciσ de kill.
-	
-	Quant utilitzes aquesta comanda, %S creara un fals usuari en
-	linea amb el mateix nickname de l'usuari que estas tractant
-	de recuperar. Aixς causa que els serveis IRC desconectin
-	a l'altre usuari. L'usuari fals romandra en linea per
-	un minut per assegurar que l'altre usuari no es reconecti
-	inmediatament; desprιs del minut, pots reclamar el teu
-	nick. Com alternativa, utilitza la comanda RELEASE
-	(%R%S HELP RELEASE) per recuperar el nick mιs aviat.
-	
-	Per utilitzar la comanda RECOVER per un nick, la teva
-	adreηa actual mostrada a /WHOIS ha d'estar a la llista
-	d'accιs d'aquest nick, has d'estar identificat i en el
-	grup d'aquest nick, o has de proveir la clau correcta
-	per aquest nickname.
+	Syntax: RECOVER nickname [password]
+	
+	Allows you to recover your nickname if someone else has
+	taken it; this does the same thing that %S does
+	automatically if someone tries to use a kill-protected
+	nick.
+	
+	When you give this command, %S will bring a fake
+	user online with the same nickname as the user you're
+	trying to recover your nick from.  This causes the IRC
+	servers to disconnect the other user.  This fake user will
+	remain online for %s to ensure that the other
+	user does not immediately reconnect; after that time, you
+	can reclaim your nick.  Alternatively, use the RELEASE
+	command (%R%S HELP RELEASE) to get the nick
+	back sooner.
+	
+	In order to use the RECOVER command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 
 NICK_HELP_RELEASE
-	Sintaxis: RELEASE nickname [clau]
-	
-	Especifica a %S a esborrar qualsevol suspensiσ que tingui el teu nick
-	causada per protecciσ automatica de kill o per ϊs de la comanda
-	RECOVER. Per defecte, la suspensiσ dura un minut;
-	Aquesta comanda la finalitza abans.
-	
-	Per utilitzar la comanda RELEASE per un nick, la teva
-	adreηa actual mostrada a /WHOIS ha d'estar a la llista
-	d'accιs d'aquest nick, has d'estar identificat i en el
-	grup d'aquest nick, o has de proveir la clau correcta
-	per aquest nickname.
+	Syntax: RELEASE nickname [password]
+	
+	Instructs %S to remove any hold on your nickname
+	caused by automatic kill protection or use of the RECOVER
+	command.  This holds lasts for %s;
+	this command gets rid of them sooner.
+	
+	In order to use the RELEASE command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 
 NICK_HELP_GHOST
 	Sintaxis: GHOST nickname [clau]
diff --git a/lang/de.l b/lang/de.l
index 882a7e0f5..d5182d4d7 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -3365,9 +3365,9 @@ NEWS_HELP_LOGON
 	
 	Zeigt oder bearbeitet die Liste der LogonNews.
 	Nach der Verbindung des Users werden diese Nachrichten
-	angezeigt. (Es werden jedoch nur max. 3 angezeigt, um ein
-	Flooding des Users zu verhindern. Wenn mehr als 3 News
-	existieren, werden nur die 3 neuesten angezeigt.)
+	angezeigt. (Es werden jedoch nur max. %d angezeigt, um ein
+	Flooding des Users zu verhindern. Wenn mehr News
+	existieren, werden nur die neuesten angezeigt.)
 	NewsCount can be configured in services.conf.
 	
 	LOGONNEWS LIST kann von jedem IRC Operator benutzt werden
@@ -3383,9 +3383,9 @@ NEWS_HELP_OPER
 	Zeigt oder bearbeitet die Liste der Oper-News.Nachdem 
 	sich ein User die Oper-Flags gesetzt hat (mit dem
 	/OPER Befehl) werden ihm diese Nachrichten angezeigt.
-	(Es werden jedoch nur max. 3 Nachrichten angezeigt, um ein
-	Flooding des Users zu verhindern. Wenn mehr als 3 News
-	existieren, werden nur die 3 neόsten angezeigt.)
+	(Es werden jedoch nur max. %d Nachrichten angezeigt, um ein
+	Flooding des Users zu verhindern. Wenn mehr News
+	existieren, werden nur die neόsten angezeigt.)
 	NewsCount can be configured in services.conf.
 	
 	OPERNEWS LIST kann von jedem IRC Operator benutzt werden
@@ -3996,9 +3996,9 @@ NICK_HELP_RECOVER
 	recovern willst. Die Folge davon ist, dass der User,
 	der deinen Nickname angenommen hatte, vom Server getrennt
 	wird. Der virtuelle User von den Services wird noch
-	1 Minute online bleiben, um sicherzustellen, dass der
+	%s online bleiben, um sicherzustellen, dass der
 	andere User nicht sofort neu connected; Nach dieser
-	Minute wird der Nickname wieder freigegeben und du kannst
+	zeit wird der Nickname wieder freigegeben und du kannst
 	ihn annehmen.
 	
 	Als Alternative gibt es das RELEASE Befehl,
@@ -4017,7 +4017,7 @@ NICK_HELP_RELEASE
 	Durch %S wird die Nickname-Sperre, ausgelφst
 	durch z.B. den automatischen Kill-Schutz oder durch
 	Verwendung des RECOVER Befehls, aufgehoben.
-	Standardmδssig hδlt diese Sperre 1 Minute, dieser
+	Standardmδssig hδlt diese Sperre %s, dieser
 	Befehl setzt den Nickname frόher wieder frei.
 	
 	Als Vorraussetzung fόr die Verwendung des RELEASE 
diff --git a/lang/en_us.l b/lang/en_us.l
index d855640dc..1c5b2cb41 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -3273,7 +3273,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than NewsCount messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3289,7 +3289,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than NewsCount messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3838,8 +3838,8 @@ NICK_HELP_RECOVER
 	user online with the same nickname as the user you're
 	trying to recover your nick from.  This causes the IRC
 	servers to disconnect the other user.  This fake user will
-	remain online for one minute to ensure that the other
-	user does not immediately reconnect; after that minute, you
+	remain online for %s to ensure that the other
+	user does not immediately reconnect; after that time, you
 	can reclaim your nick.  Alternatively, use the RELEASE
 	command (%R%S HELP RELEASE) to get the nick
 	back sooner.
@@ -3855,7 +3855,7 @@ NICK_HELP_RELEASE
 	
 	Instructs %S to remove any hold on your nickname
 	caused by automatic kill protection or use of the RECOVER
-	command.  By default, such holds last for one minute;
+	command.  This holds lasts for %s;
 	this command gets rid of them sooner.
 	
 	In order to use the RELEASE command for a nick, your
diff --git a/lang/es.l b/lang/es.l
index 9248fa605..d28fc73af 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -3381,34 +3381,36 @@ NEWS_RANDOM_DELETED_ALL
 	Todas las noticias al azar borradas.
 
 NEWS_HELP_LOGON
-	Sintaxis: LOGONNEWS ADD texto
-	        LOGONNEWS DEL {numero | ALL}
+	Syntax: LOGONNEWS ADD text
+	        LOGONNEWS DEL {num | ALL}
 	        LOGONNEWS LIST
 	
-	Edita o muestra la lista de noticias de entrada. Cuando un
-	usuario se conecta a la red, estos mensajes les seran
-	enviados. (Como sea, no mas de 3 mensajes seran enviados
-	para evitar floodear al usuario. Si hay mas de 3 noticias,
-	los 3 ultimos les seran enviados.)
+	Edits or displays the list of logon news messages.  When a
+	user connects to the network, these messages will be sent
+	to them.  (However, no more than %d messages will be
+	sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	LOGONNEWS LIST puede ser usado por cualquier operador de
-	IRC para listar las noticias actuales. ADD o DEL solo
-	pueden ser usados por administradores de Servicios.
+	LOGONNEWS LIST may be used by any IRC operator to list the
+	current news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_OPER
-	Sintaxis: OPERNEWS ADD texto
-	          OPERNEWS DEL {numero | ALL}
-	          OPERNEWS LIST
+	Syntax: OPERNEWS ADD text
+	        OPERNEWS DEL {num | ALL}
+	        OPERNEWS LIST
 	
-	Edita o muestra la lista de noticias. Cuando un usuario se
-	transforma en operador (con el comando /oper), estos
-	mensajes les seran enviados. (Como sea, no mas de 3 mensajes
-	seran enviados para evitar floodear al usuario. Si hay mas
-	de 3 noticias, las ultimas 3 seran enviadas.)
+	Edits or displays the list of oper news messages.  When a
+	user opers up (with the /OPER command), these messages will
+	be sent to them.  (However, no more than %d messages will
+	be sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	OPERNEWS LIST puede ser usado por cualquier operador de IRC
-	para listar las noticias de operador actuales. ADD y DEL solo
-	pueden ser usadas por administradores de Servicios.
+	OPERNEWS LIST may be used by any IRC operator to list the
+	current oper news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_RANDOM
 	Sintaxis: RANDOMNEWS ADD texto
@@ -3965,40 +3967,42 @@ NICK_HELP_SASET_LANGUAGE
 	that you can get by typing %R%S HELP SET LANGUAGE.
 
 NICK_HELP_RECOVER
-	Sintaxis: RECOVER nickname [clave]
-	
-	Te permite recuperar tu nickname si alguien mas lo
-	ha tomado; Esto hace lo mismo que %S hace automaticamente
-	si alguien trata de usar un nick con proteccion de kill.
-	
-	Cuando usas este comando, %S traera a un falso usuario en
-	linea con el mismo nickname del usuario que estas tratando
-	de recuperar. Esto causa que los servidores IRC desconecten
-	al otro usuario. El usuario falso permanecera en linea por
-	un minuto para asegurar que el otro usuario no se reconecte
-	inmediatamente; Despues del minuto, puedes reclamar tu
-	nick. Como alternatica, usa el comando RELEASE
-	(%R%S HELP RELEASE) para recuperar el nick antes.
-	
-	Para usar el comando RECOVER para un nick, tu
-	direccion actual mostrada en /WHOIS debe estar en la lista
-	de acceso de ese nick, debes estar identificado y en el
-	grupo de ese nick, o debes proveer la clave correcta
-	para ese nickname.
+	Syntax: RECOVER nickname [password]
+	
+	Allows you to recover your nickname if someone else has
+	taken it; this does the same thing that %S does
+	automatically if someone tries to use a kill-protected
+	nick.
+	
+	When you give this command, %S will bring a fake
+	user online with the same nickname as the user you're
+	trying to recover your nick from.  This causes the IRC
+	servers to disconnect the other user.  This fake user will
+	remain online for %s to ensure that the other
+	user does not immediately reconnect; after that time, you
+	can reclaim your nick.  Alternatively, use the RELEASE
+	command (%R%S HELP RELEASE) to get the nick
+	back sooner.
+	
+	In order to use the RECOVER command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 
 NICK_HELP_RELEASE
-	Sintaxis: RELEASE nickname [clave]
-	
-	Instruye a %S a remover cualquier suspencion que tenga tu nick
-	causada por proteccion automatica de kill o por uso del comando
-	RECOVER. Por defecto, la suspencion dura por un minuto;
-	este comando la termina antes.
-	
-	Para usar el comando RELEASE para un nick, tu
-	direccion actual mostrada en /WHOIS debe estar en la lista
-	de acceso de ese nick, debes estar identificado y en el
-	grupo de ese nick, o debes proveer la clave correcta
-	para ese nickname.
+	Syntax: RELEASE nickname [password]
+	
+	Instructs %S to remove any hold on your nickname
+	caused by automatic kill protection or use of the RECOVER
+	command.  This holds lasts for %s;
+	this command gets rid of them sooner.
+	
+	In order to use the RELEASE command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 
 NICK_HELP_GHOST
 	Sintaxis: GHOST nickname [clave]
diff --git a/lang/fr.l b/lang/fr.l
index 97d17a5c7..b8f74d265 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -3441,7 +3441,7 @@ NEWS_HELP_LOGON
 	
 	Edite ou affiche la liste de messages logon news. Lorsqu'un
 	utilisateur se connecte au rιseau, ces messages leur seront
-	envoyιs. (Cependant, pas plus de NewsCount messages ne seront
+	envoyιs. (Cependant, pas plus de %d messages ne seront
 	envoyιs pour ιviter le flood des utilisateurs. Si il y a
 	plus messages de news, seuls les plus rιcents seront envoyιs.)
 	NewsCount peut κtre configurι en services.conf.
@@ -3457,7 +3457,7 @@ NEWS_HELP_OPER
 	
 	Edite ou affiche la liste des messages oper news. Quand un
 	utilisateur utilise la commande /OPER, ces messages lui seront
-	envoyιs. (Cependant, pas plus de NewsCount messages ne seront 
+	envoyιs. (Cependant, pas plus de %d messages ne seront 
 	envoyιs afin de ne pas flooder l'utilisateur. Si il y a plus 
 	messages news, seuls les plus rιcents seront envoyιs.)
 	NewsCount peut κtre configurι en services.conf.
@@ -4039,9 +4039,9 @@ NICK_HELP_RECOVER
 	utilisateur avec le mκme pseudo que l'utilisateur dont
 	vous essayez de rιcupιrer le pseudo. Cela provoque la dιconnexion
 	par les serveurs IRC de l'autre utilisateur. Ce faux utilisateur
-	restera connectι pendant une minute pour s'assurer que l'autre
-	utilisateur ne se reconnecte pas immιdiatement. Aprθs cette
-	minute, vous pouvez reprendre votre pseudo. Alternativement,
+	restera connectι pendant %s pour s'assurer que l'autre
+	utilisateur ne se reconnecte pas immιdiatement. Aprθs ces
+	temps, vous pouvez reprendre votre pseudo. Alternativement,
 	utilisez la commande RELEASE (%R%S HELP RELEASE) pour
 	reprendre votre pseudo plus tτt.
 	
@@ -4057,8 +4057,7 @@ NICK_HELP_RELEASE
 	Ordonne ΰ %S de supprimer toute tutelle sur votre pseudo
 	provoquιe par la protection de SET KILL ou 
 	l'utilisation de la commande RECOVER. Par dιfaut, les
-	tutelles durent une minute, cette commande les
-	arrκte plus tτt.
+	tutelles durent %s, cette commande les arrκte plus tτt.
 	
 	Pour utiliser la commande RELEASE pour un pseudo, l'adresse
 	telle qu'elle est montrιe dans un /WHOIS doit κtre sur la
diff --git a/lang/gr.l b/lang/gr.l
index 9635c23fe..c9551973d 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -3399,33 +3399,36 @@ NEWS_RANDOM_DELETED_ALL
 	Όλα τα μηνύματα διαγράφηκαν.
 
 NEWS_HELP_LOGON
-	Σύνταξη: LOGONNEWS ADD περιεχόμενο
-	        LOGONNEWS DEL {νούμερο | ALL}
+	Syntax: LOGONNEWS ADD text
+	        LOGONNEWS DEL {num | ALL}
 	        LOGONNEWS LIST
 	
-	Προσθέτεις ή αφαιρείς ή βλέπεις την λίστα των μυνημάτων.
-	Όταν συνδέεται ένας χρήστης στο δίκτυο, αυτά τα μηνύματα τα λαμβάνει
-	(Οχι παραπάνω από τρία μηνύματα, γιατί μπορεί να θεωρηθεί ως flood.
-	Αν είναι παραπάνω από τρια,  τότε μόνο τα τρία πρώτα θα σταλθούν).
-	    
-	LOGONNEWS LIST χρησιμοποιείται μόνο από τους IRC operator για να δούν
-	την λίστα των νέων μηνυμάτων.  ADD και DEL χρησιμοποιείται μόνο από τους
-	επικεφαλείς των υπηρεσιών (services admins).
+	Edits or displays the list of logon news messages.  When a
+	user connects to the network, these messages will be sent
+	to them.  (However, no more than %d messages will be
+	sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
+	
+	LOGONNEWS LIST may be used by any IRC operator to list the
+	current news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_OPER
-	Σύνταξη: OPERNEWS ADD περιεχόμενο
-	        OPERNEWS DEL {νούμερο | ALL}
+	Syntax: OPERNEWS ADD text
+	        OPERNEWS DEL {num | ALL}
 	        OPERNEWS LIST
 	
-	Προσθέτεις ή αφαιρείς ή βλέπεις την λίστα των opers.  Όταν ένας
-	χρήστης κάνει την εντολή oper (δηλαδη /OPER εντολή), αυτά τα μηνύματα
-	θα του σταλθούν.  (παραπάνω από τρια μηνύματα δεν πρέπει να είναι
-	γιατί θεωρείται σαν ενοχλητικό flood.  Αν είναι παραπάνω από τρία
-	μηνύματα, μόνο τα τρια πρώτα θα εμφανιστούν και θα σταλούν.)
-	    
-	OPERNEWS LIST μπορεί να χρησιμοποιηθεί μόνο από IRC operators.
-	Και βέβαια να δεί την λίστα των μυνημάτων.  ADD και DEL μπορεί να χρησιμοποιηθεί
-	από τους επικεφαλής υπηρεσιών.
+	Edits or displays the list of oper news messages.  When a
+	user opers up (with the /OPER command), these messages will
+	be sent to them.  (However, no more than %d messages will
+	be sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
+	
+	OPERNEWS LIST may be used by any IRC operator to list the
+	current oper news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_RANDOM
 	Σύνταξη: RANDOMNEWS ADD περιεχόμενα
@@ -3992,44 +3995,42 @@ NICK_HELP_SASET_LANGUAGE
 	that you can get by typing %R%S HELP SET LANGUAGE.
 
 NICK_HELP_RECOVER
-	Σύνταξη: RECOVER nickname [password]
-	
-	Σας επιτρέπει να πάρετε πίσω το ψευδώνυμό σας αν κάποιος
-	άλλος το χρησιμοποιεί.  Η χρήση της εντολής αυτής, έχει το
-	ίδιο αποτέλεσμα με την αυτόματη αποσύνδεση που κάνει ο
-	%S όταν κάποιος προσπαθήσει να να χρησιμοποιήσει ένα
-	ψευδώνυμο που έχει ενεργοποιημένη την προστασία με
-	αποσύνδεση.
-	
-	Όταν χρησιμοποιείτε αυτή την εντολή, ο %S συνδέει έναν
-	ψεύτικο χρήστη με το ίδιο ψευδώνυμο εκείνου του χρήστη του
-	οποίου το ψευδώνυμο θέλετε να πάρετε πίσω.  Αυτό αναγκάζει	
-	τους IRC servers να αποσυνδέουν εκείνο το χρήστη.  Ο
-	ψεύτικος χρήστης, θα παραμείνει τότε συνδεδεμένος για τρία
-	λεπτά για να βεβαιώσει το ότι ο άλλος χρήστης δε θα
-	επανασυνδεθεί άμεσα. Μετά από τα τρία λεπτά, μπορείτε να
-	ξαναχρησιμοποιήσετε το ψευδώνυμό σας.  Εναλλακτικά,
-	χρησιμοποιήστε την εντολή RELEASE (%R%S HELP RELEASE)
-	για να χρησιμοποιήσετε το ψευδώνυμό σας νωρίτερα.
-	
-	Για να χρησιμοποιήσετε την εντολή RECOVER για ένα
-	ψευδώνυμο, πρέπει η τρέχουσα διεύθυνσή σας όπως εμφανίζεται
-	στο /WHOIS να βρίσκεται στη λίστα πρόσβασης του ψευδωνύμου,
-	ή να έχετε δώσει τον σωστό κωδικό για το ψευδώνυμο.
-	
+	Syntax: RECOVER nickname [password]
+	
+	Allows you to recover your nickname if someone else has
+	taken it; this does the same thing that %S does
+	automatically if someone tries to use a kill-protected
+	nick.
+	
+	When you give this command, %S will bring a fake
+	user online with the same nickname as the user you're
+	trying to recover your nick from.  This causes the IRC
+	servers to disconnect the other user.  This fake user will
+	remain online for %s to ensure that the other
+	user does not immediately reconnect; after that time, you
+	can reclaim your nick.  Alternatively, use the RELEASE
+	command (%R%S HELP RELEASE) to get the nick
+	back sooner.
+	
+	In order to use the RECOVER command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
+
 NICK_HELP_RELEASE
-	Σύνταξη: RELEASE ψευδώνυμο [κωδικός]
-	
-	Απελευθερώνει κάθε κατακράτηση του ψευδωνύμου σας από τον
-	%S εξ' αιτίας αυτόματης αποσύνδεσης ή της χρήσης της
-	εντολής RECOVER.  Προκαθορισμένα, τέτοιες κατακρατήσεις
-	διαρκούν για ένα λεπτό;  Αυτή η εντολή τις απελευθερώνει
-	νωρίτερα.
-	
-	Για να χρησιμοποιήσετε την εντολή RELEASE για ένα
-	ψευδώνυμο, πρέπει η τρέχουσα διεύθυνσή σας όπως εμφανίζεται
-	στο /WHOIS να βρίσκεται στη λίστα πρόσβασης του ψευδωνύμου,
-	ή να έχετε δώσει τον σωστό κωδικό για το ψευδώνυμο.
+	Syntax: RELEASE nickname [password]
+	
+	Instructs %S to remove any hold on your nickname
+	caused by automatic kill protection or use of the RECOVER
+	command.  This holds lasts for %s;
+	this command gets rid of them sooner.
+	
+	In order to use the RELEASE command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 	
 NICK_HELP_GHOST
 	Σύνταξη: GHOST ψευδώνυμο [κωδικός]
diff --git a/lang/hun.l b/lang/hun.l
index f6d385ed0..14a6cabbe 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -3333,35 +3333,36 @@ NEWS_RANDOM_DELETED_ALL
 	Φsszes random news tιtel tφrφlve.
 
 NEWS_HELP_LOGON
-	Syntax: LOGONNEWS ADD szφveg
-	        LOGONNEWS DEL {sorszαm  | ALL}
+	Syntax: LOGONNEWS ADD text
+	        LOGONNEWS DEL {num | ALL}
 	        LOGONNEWS LIST
 	
-	Szerkeszti, vagy kiirja a logon news όzeneteket.Amikor
-	egy felhasznαlσ csatlakozik a hαlσzathoz ezeket az
-	όzeneteket kόldi neki. (Bαrmennyi is van csak hαrom 
-	όzenetet kόld, mindig a hαrom legutolsσt kόldi el.)
-		
-	LOGONNEWS LIST lehetυsιg van hasznαlatαra IRC operαtornak,
-	rιszιre listαzza az aktuαlis news όzeneteket. Az ADD ιs a 
-	DEL  parancsokat csak szervνz adminok hasznαlhatjαk.
-		
+	Edits or displays the list of logon news messages.  When a
+	user connects to the network, these messages will be sent
+	to them.  (However, no more than %d messages will be
+	sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
+	
+	LOGONNEWS LIST may be used by any IRC operator to list the
+	current news messages.  ADD and DEL may only be used by
+	Services admins.
+
 NEWS_HELP_OPER
-	Syntax: OPERNEWS ADD szφveg
-	        OPERNEWS DEL {szαm | ALL}
+	Syntax: OPERNEWS ADD text
+	        OPERNEWS DEL {num | ALL}
 	        OPERNEWS LIST
 	
-	Szerkeszti ιs listαzza az oper news όzeneteket. Amikor 
-	egy oper felhasznαlσ csatlakozik a /OPER paranccal a 
-	hαlσzathoz ezeket az όzeneteket fogaj neki kόldeni.
-	(Bαrmennyi is van csak hαrom όzenetet kόld, hogy elkerόlje
-	a floodot a felhasznαlσ.Hαromnαl tφbb όzenetbόl a hαrom
-	legutσlsσt kόldi el)
-
+	Edits or displays the list of oper news messages.  When a
+	user opers up (with the /OPER command), these messages will
+	be sent to them.  (However, no more than %d messages will
+	be sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	OPERNEWS LIST  IRC operαtorok,hasznαlhatjαk a parancsot
-	rιszόkre listαzza az aktuαlis oper news όzeneteket. Add ιs 
-	Del -t csak szervνz adminok hasznαlhatjαk
+	OPERNEWS LIST may be used by any IRC operator to list the
+	current oper news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_RANDOM
 	Syntax: RANDOMNEWS ADD szφveg
@@ -3912,33 +3913,42 @@ NICK_HELP_SASET_LANGUAGE
 	that you can get by typing %R%S HELP SET LANGUAGE.
 
 NICK_HELP_RECOVER
-	Syntax: RECOVER nicknιv [jelszσ]
-	
-	Amikor hasznαlod ezt a parancsot, akkor a %S fel fog hozni
-	egy αlfelhasznαlσt ugyanazzal a nιvvel, amit vissza
-	akarsz venni a mαsik usertυl. Ezzel egyidυben az IRC 
-	szerver megbontja a mαsik felhasznαlσ kapcsolatαt.
-	A %S αlfelhasznαlσja egy percig online marad, hogy a
-	mαsik felhasznαlσ ne tudjon automatikusa ϊjracsatlakozni;
-	ennek az idυnek a letelte utαn, felveheted a nevedet.
-	Alternatνv megoldαs, a RELEASE parancs hasznαlata
-	(%R%S HELP RELEASE) ezzel hamarabb is visszakaphatod
-	a neved.
-	
-	Abban az esetben, ha hasznαlod a RECOVER parancsot,akkor
-	tudnod kell a pontos jelszσt a nickhez.
+	Syntax: RECOVER nickname [password]
+	
+	Allows you to recover your nickname if someone else has
+	taken it; this does the same thing that %S does
+	automatically if someone tries to use a kill-protected
+	nick.
+	
+	When you give this command, %S will bring a fake
+	user online with the same nickname as the user you're
+	trying to recover your nick from.  This causes the IRC
+	servers to disconnect the other user.  This fake user will
+	remain online for %s to ensure that the other
+	user does not immediately reconnect; after that time, you
+	can reclaim your nick.  Alternatively, use the RELEASE
+	command (%R%S HELP RELEASE) to get the nick
+	back sooner.
+	
+	In order to use the RECOVER command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 
 NICK_HELP_RELEASE
-	Syntax: RELEASE nicknιv [jelszσ]
-	
-	Utasνtja a %S -et, hogy ne tartsa tovαbb az
-	automatikus kill vιdelem vagy a RECOVER
-	parancs hasznαlatαbσl kifolyσlag felvett neved.
-	Alapbeαllνtαs szerint csak egy percig tartja, de
-	ezzel a paranccsal hamarabb αtvehetυ ϊjra a neved.
-	
-	Ha a RELEASE parancsot akarod hasznαlni, tudnod kell a
-	pontos jelszσt a nickhez.
+	Syntax: RELEASE nickname [password]
+	
+	Instructs %S to remove any hold on your nickname
+	caused by automatic kill protection or use of the RECOVER
+	command.  This holds lasts for %s;
+	this command gets rid of them sooner.
+	
+	In order to use the RELEASE command for a nick, your
+	current address as shown in /WHOIS must be on that nick's
+	access list, you must be identified and in the group of
+	that nick, or you must supply the correct password for
+	the nickname.
 
 NICK_HELP_GHOST
 	Syntax: GHOST nickιv [jelszσ]
diff --git a/lang/it.l b/lang/it.l
index 7af9dc49e..6ef9c3816 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -3292,36 +3292,36 @@ NEWS_RANDOM_DELETED_ALL
 	Tutte le Random News sono state eliminate.
 
 NEWS_HELP_LOGON
-	Sintassi: LOGONNEWS ADD testo
-	          LOGONNEWS DEL {numero | ALL}
-	          LOGONNEWS LIST
+	Syntax: LOGONNEWS ADD text
+	        LOGONNEWS DEL {num | ALL}
+	        LOGONNEWS LIST
 	
-	Modifica o visualizza la lista dei messaggi di ingresso.
-	Quando un utente si connette alla rete, gli saranno inviati
-	questi messaggi. (In ogni caso, non saranno inviati piω di
-	tre messaggi per evitare di floodare l'utente. Se ci sono
-	piω di tre messaggi di ingresso, solo i tre piω recenti gli
-	saranno inviati).
+	Edits or displays the list of logon news messages.  When a
+	user connects to the network, these messages will be sent
+	to them.  (However, no more than %d messages will be
+	sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	LOGONNEWS LIST puς essere usato da qualsiasi IrcOp per
-	visualizzare i messaggi correnti. ADD e DEL possono essere
-	utilizzati soltanto dai Services admin.
+	LOGONNEWS LIST may be used by any IRC operator to list the
+	current news messages.  ADD and DEL may only be used by
+	Services admins.
 
 NEWS_HELP_OPER
-	Sintassi: OPERNEWS ADD testo
-	          OPERNEWS DEL {numero | ALL}
-	          OPERNEWS LIST
+	Syntax: OPERNEWS ADD text
+	        OPERNEWS DEL {num | ALL}
+	        OPERNEWS LIST
 	
-	Modifica o visualizza la lista dei messaggi per gli operatori.
-	Quando un utente diventa operatore (con il comando /OPER), gli
-	saranno inviati questi messaggi. (In ogni caso, non saranno
-	inviati piω di tre messaggi per evitare di floodare l'utente.
-	Se ci sono piω di tre messaggi, solo i tre piω recenti gli
-	saranno inviati).
+	Edits or displays the list of oper news messages.  When a
+	user opers up (with the /OPER command), these messages will
+	be sent to them.  (However, no more than %d messages will
+	be sent in order to avoid flooding the user.  If there are
+	more news messages, only the most recent will be sent.)
+	NewsCount can be configured in services.conf.
 	
-	OPERNEWS LIST puς essere usato da qualsiasi IrcOp per
-	visualizzare i messaggi correnti. ADD e DEL possono essere