BUILD : 1.7.19 (1282) BUGS : 729 NOTES : Changed the "Limited to ..." lines in help replies to automatically appended lines

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


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

20 files changed, 386 insertions, 236 deletions

diff --git a/Changes b/Changes
index d65dce8a0..a2eaed80a 100644
--- a/Changes
+++ b/Changes
@@ -23,6 +23,7 @@ Anope Version  S V N
 08/27 F Protocol for InspIRCd 1.1 now uses SVSHOLD.                       [#683]
 08/28 F Bug when truncating passwords to PASSMAX with enc_none.           [#765]
 08/28 F Bug in PTLink protocol where topic time was not being sent.       [#763]
+08/28 F Automatic displaying of 'Limited to ...' lines in help.           [#729]
 
 Anope Version 1.7.19
 --------------------
diff --git a/Changes.lang b/Changes.lang
index 5690fb71f..57bb7230c 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -3,8 +3,73 @@ Anope Version  S V N
 *** New Strings:
 	NICK_HELP_CONFIRM
 	CHAN_XOP_NOT_AVAILABLE
+	HELP_LIMIT_SERV_OPER
+	HELP_LIMIT_SERV_ADMIN
+	HELP_LIMIT_SERV_ROOT
+	HELP_LIMIT_IRC_OPER
+	HELP_LIMIT_HOST_SETTER
+	HELP_LIMIT_HOST_REMOVER
 
 *** Mod Strings:
+In all of the following strings only the trailing 'Limited to ...' line has been removed:
+	OPER_HELP_EXCEPTION
+	OPER_HELP_SESSION
+	NICK_HELP_SASET
+	NICK_HELP_SASET_DISPLAY
+	NICK_HELP_SASET_PASSWORD
+	NICK_HELP_SASET_URL
+	NICK_HELP_SASET_EMAIL
+	NICK_HELP_SASET_ICQ
+	NICK_HELP_SASET_GREET
+	NICK_HELP_SASET_KILL
+	NICK_HELP_SASET_SECURE
+	NICK_HELP_SASET_PRIVATE
+	NICK_HELP_SASET_HIDE
+	NICK_HELP_SASET_MSG
+	NICK_HELP_SASET_NOEXPIRE
+	NICK_HELP_SASET_AUTOOP
+	NICK_SERVADMIN_HELP_GETPASS
+	NICK_SERVADMIN_HELP_GETEMAIL
+	NICK_SERVADMIN_HELP_FORBID
+	NICK_SERVADMIN_HELP_SUSPEND
+	NICK_SERVADMIN_HELP_UNSUSPEND
+	CHAN_SERVADMIN_HELP_SET_NOEXPIRE
+	CHAN_SERVADMIN_HELP_GETPASS
+	CHAN_SERVADMiN_HELP_FORBID
+	CHAN_SERVADMIN_HELP_SUSPEND
+	CHAN_SERVADMIN_HELP_UNSUSPEND
+	CHAN_SERVADMIN_HELP_STATUS
+	OPER_HELP_MODE
+	OPER_HELP_CLEARMODES
+	OPER_HELP_KICK
+	OPER_HELP_SVSNICK
+	OPER_HELP_AKILL
+	OPER_HELP_SGLINE
+	OPER_HELP_SQLINE
+	OPER_HELP_SZLINE
+	OPER_HELP_SET
+	OPER_HELP_NOOP
+	OPER_HELP_JUPE
+	OPER_HELP_RAW
+	OPER_HELP_UPDATE
+	OPER_HELP_RELOAD
+	OPER_HELP_QUIT
+	OPER_HELP_SHUTDOWN
+	OPER_HELP_RESTART
+	OPER_HELP_KILLCLONES
+	OPER_HELP_CHANLIST
+	OPER_HELP_USERLIST
+	OPER_HELP_MODLOAD
+	OPER_HELP_MODUNLOAD
+	OPER_HELP_MODINFO
+	OPER_HELP_MODLIST
+	BOT_SERVADMIN_HELP_SET_NOBOT
+	BOT_SERVADMIN_HELP_SET_PRIVATE
+	HOST_HELP_SET
+	HOST_HELP_DELALL
+	HOST_HELP_SETALL
+	HOST_HELP_DEL
+	HOST_HELP_LIST
 
 *** Del Strings:
 
diff --git a/lang/cat.l b/lang/cat.l
index 47a8137f2..810e42104 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -309,6 +309,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Aquest nick pertany a un altra persona. Per favor escull un altre nick.
 	(Si aquest es el teu nick, escriu %R%s IDENTIFY clau.)
diff --git a/lang/de.l b/lang/de.l
index 58350a552..9dfafd716 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -331,6 +331,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Dieser Nickname gehört schon jemand anderem. Bitte wähle einen anderen.
 	(Sollte dieser Nickname dir gehören, tippe %R%s IDENTIFY Passwort.)
diff --git a/lang/en_us.l b/lang/en_us.l
index 90e524b25..19742d598 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -295,6 +295,27 @@ CS_LIST_INCORRECT_RANGE
 	To search for channels starting with #, search for the channel
 	name without the #-sign prepended (anope instead of #anope).
 
+# Generic help limited to messages
+HELP_LIMIT_SERV_OPER
+	
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	
+	Limited to Host Removers.
+
+
 ###########################################################################
 #
 # NickServ messages
@@ -3086,8 +3107,6 @@ OPER_HELP_EXCEPTION
 	Note that a connecting client will "use" the first exception
 	their host matches. Large exception lists and widely matching
 	exception masks are likely to degrade services' performance.
-	
-	Limited to Services admins.
 
 OPER_HELP_SESSION
 	Syntax: SESSION LIST threshold
@@ -3106,8 +3125,6 @@ OPER_HELP_SESSION
 	See the EXCEPTION help for more information about session
 	limiting and how to set session limits specific to certain
 	hosts and groups thereof.
-	
-	Limited to Services admins.
 
 OPER_HELP_STAFF
 	Syntax: STAFF
@@ -3684,23 +3701,17 @@ NICK_HELP_SASET
 	Type %R%S HELP SASET option for more information
 	on a specific option. The options will be set on the given
 	nickname. 
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_DISPLAY
 	Syntax: SASET nickname DISPLAY new-display
 	
 	Changes the display used to refer to the nickname group in 
 	Services. The new display MUST be a nick of the group.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_PASSWORD
 	Syntax: SET nickname PASSWORD new-password
 	
 	Changes the password used to identify as the nick's	owner.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_URL
 	Syntax: SASET nickname URL url
@@ -3708,16 +3719,12 @@ NICK_HELP_SASET_URL
 	Associates the given URL with the nickname.  This URL
 	will be displayed whenever someone requests information
 	on the nick with the INFO command.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_EMAIL
 	Syntax: SASET nickname EMAIL address
 	
 	Associates the given E-mail address with the nickname.
 	
-	Limited to Services admins.
-	
 NICK_HELP_SASET_ICQ
 	Syntax: SASET nickname ICQ number
 	
@@ -3725,8 +3732,6 @@ NICK_HELP_SASET_ICQ
 	number will be displayed whenever someone requests 
 	information on the nick with the INFO command.
 	
-	Limited to Services admins.
-	
 NICK_HELP_SASET_GREET
 	Syntax: SASET nickname GREET message
 	
@@ -3734,8 +3739,6 @@ NICK_HELP_SASET_GREET
 	will be displayed when joining a channel that has GREET
 	option enabled, provided that the user has the necessary 
 	access on it.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_KILL
 	Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}
@@ -3752,8 +3755,6 @@ NICK_HELP_SASET_KILL
 	warned first or given a chance to change their nick; please
 	do not use this option unless necessary.  Also, your
 	network's administrators may have disabled this option.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_SECURE
 	Syntax: SASET nickname SECURE {ON | OFF}
@@ -3765,8 +3766,6 @@ NICK_HELP_SASET_SECURE
 	list.  However, if you are on the access list, %S
 	will not auto-kill you regardless of the setting of the
 	KILL option.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_PRIVATE
 	Syntax: SASET nickname PRIVATE {ON | OFF}
@@ -3776,8 +3775,6 @@ NICK_HELP_SASET_PRIVATE
 	nickname lists generated with %S's LIST command.
 	(However, anyone who knows the nickname can still get
 	information on it using the INFO command.)
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_HIDE
 	Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
@@ -3790,24 +3787,18 @@ NICK_HELP_SASET_HIDE
 	The second parameter specifies whether the information should
 	be displayed (OFF) or hidden (ON).
 	
-	Limited to Services admins.
-	
 NICK_HELP_SASET_MSG
 	Syntax: SASET nickname MSG {ON | OFF}
 	
 	Allows you to choose the way Services are communicating with 
 	the given user. With MSG set, Services will use messages,
 	else they'll use notices.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_NOEXPIRE
 	Syntax: SASET nickname NOEXPIRE {ON | OFF}
 	
 	Sets whether the given nickname will expire.  Setting this
 	to ON prevents the nickname from expiring.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_AUTOOP
 	Syntax: SASET nickname AUTOOP {ON | OFF}
@@ -3815,8 +3806,6 @@ NICK_HELP_SASET_AUTOOP
 	Sets whether the given nickname will be opped automatically.
 	Set to ON to allow ChanServ to op you automatically when joining
 	channels.
-	
-	Limited to Services admins.
 
 NICK_HELP_RECOVER
 	Syntax: RECOVER nickname [password]
@@ -4061,8 +4050,6 @@ NICK_SERVADMIN_HELP_GETPASS
 	person who issued the command and the nickname it was used
 	on will be logged and sent out as a WALLOPS/GLOBOPS.
 	
-	Limited to Services admins.
-	
 	This command is unavailable when encryption is enabled.
 
 NICK_SERVADMIN_HELP_GETEMAIL
@@ -4073,8 +4060,6 @@ NICK_SERVADMIN_HELP_GETEMAIL
 	this command is used, a message including the person who issued
 	the command and the email it was used on will be logged.
 
-	Limited to Services admins.
-
 NICK_SERVADMIN_HELP_FORBID
 	Syntax: FORBID nickname [reason]
 	
@@ -4082,23 +4067,17 @@ NICK_SERVADMIN_HELP_FORBID
 	anyone.  May be cancelled by dropping the nick.
 	
 	On certain networks, reason is required.
-	
-	Limited to Services admins.
 
 NICK_SERVADMIN_HELP_SUSPEND
 	Syntax: SUSPEND nickname reason
 
 	SUSPENDs a nickname from being used.
 
-	Limited to Services admins.
-
 NICK_SERVADMIN_HELP_UNSUSPEND
 	Syntax: UNSUSPEND nickname
 
 	UNSUSPENDS a nickname from being used.
 
-	Limited to Services admins.
-
 ###########################################################################
 #
 # ChanServ help messages
@@ -5053,8 +5032,6 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 	
 	Sets whether the given channel will expire.  Setting this
 	to ON prevents the channel from expiring.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_INFO
 	
@@ -5081,8 +5058,6 @@ CHAN_SERVADMIN_HELP_GETPASS
 	whenever this command is used, a message including the
 	person who issued the command and the channel it was used
 	on will be logged and sent out as a WALLOPS/GLOBOPS.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_FORBID
 	Syntax: FORBID channel [reason]
@@ -5091,8 +5066,6 @@ CHAN_SERVADMIN_HELP_FORBID
 	channel.  May be cancelled by dropping the channel.
 	
 	Reason may be required on certain networks.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_SUSPEND
 	Syntax: SUSPEND channel [reason]
@@ -5102,16 +5075,12 @@ CHAN_SERVADMIN_HELP_SUSPEND
 	command to preserve all previous channel data/settings.
 	
 	Reason may be required on certain networks.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_UNSUSPEND
 	Syntax: UNSUSPEND channel
 	
 	Releases a suspended channel. All data and settings
 	are preserved from before the suspension.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_STATUS
 	Syntax: STATUS channel nickname
@@ -5124,8 +5093,6 @@ CHAN_SERVADMIN_HELP_STATUS
 	If an error occurs, the reply will be in the form:
 	
 	    STATUS ERROR error-message
-	
-	Limited to Services admins.
 
 ###########################################################################
 #
@@ -5552,8 +5519,6 @@ OPER_HELP_MODE
 	Allows Services operators to set channel modes for any
 	channel.  Parameters are the same as for the standard /MODE
 	command.
-	
-	Limited to Services operators.
 
 OPER_HELP_UMODE
 	Syntax: UMODE user modes
@@ -5579,8 +5544,6 @@ OPER_HELP_CLEARMODES
 	Clears all binary modes (i,k,l,m,n,p,s,t) and bans from a
 	channel.  If ALL is given, also clears all ops and
 	voices (+o and +v modes) from the channel.
-	
-	Limited to Services operators.
 
 OPER_HELP_KICK
 	Syntax: KICK channel user reason
@@ -5591,15 +5554,11 @@ OPER_HELP_KICK
 	IRCop sending the KICK command prepended; for example:
 	
 	*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))
-	
-	Limited to Services operators.
 
 OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick newnick
 	
 	Forcefully changes a user's nickname from nick to newnick.
-	
-	Limited to Super admins
 
 OPER_HELP_AKILL
 	Syntax: AKILL ADD [+expiry] mask reason
@@ -5646,8 +5605,6 @@ OPER_HELP_AKILL
 	
 	AKILL CLEAR clears all entries of the AKILL list.
 	
-	Limited to Services operators.
-	
 OPER_HELP_SGLINE
 	Syntax: SGLINE ADD [+expiry] mask:reason
 	    SGLINE DEL {mask | entry-num | list}
@@ -5693,8 +5650,6 @@ OPER_HELP_SGLINE
 	it expires, as well as the realname mask and reason.
 	
 	SGLINE CLEAR clears all entries of the SGLINE list.
-	
-	Limited to Services operators.
 
 OPER_HELP_SQLINE
 	Syntax: SQLINE ADD [+expiry] mask reason
@@ -5743,8 +5698,6 @@ OPER_HELP_SQLINE
 	it expires, as well as the mask and reason.
 	
 	SQLINE CLEAR clears all entries of the SQLINE list.
-	
-	Limited to Services operators.
 
 OPER_HELP_SZLINE
 	Syntax: SZLINE ADD [+expiry] mask reason
@@ -5789,8 +5742,6 @@ OPER_HELP_SZLINE
 	it expires, as well as the IP mask and reason.
 	
 	SZLINE CLEAR clears all entries of the SZLINE list.
-	
-	Limited to Services operators.
 
 OPER_HELP_SET
 	Syntax: SET option setting
@@ -5806,8 +5757,6 @@ OPER_HELP_SET
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 
-	Limited to Services admins.
-
 OPER_HELP_SET_READONLY
 	Syntax: SET READONLY {ON | OFF}
 	
@@ -5897,8 +5846,6 @@ OPER_HELP_NOOP
 
 	Note: The server is not checked at all by the
 	Services.
-	
-	Limited to Services admins.
 
 OPER_HELP_JUPE
 	Syntax: JUPE server [reason]
@@ -5911,8 +5858,6 @@ OPER_HELP_JUPE
 	otherwise, the server information field will contain the
 	text "Juped by <nick>", showing the nickname of the
 	person who jupitered the server.
-	
-	Limited to Services admins.
 
 OPER_HELP_RAW
 	Syntax: RAW text
@@ -5922,8 +5867,6 @@ OPER_HELP_RAW
 	range of uses, and can wreak havoc on a network if used
 	improperly.  DO NOT USE THIS COMMAND unless you are
 	absolutely certain you know what you are doing!
-	
-	Limited to Services admins.
 
 OPER_HELP_UPDATE
 	Syntax: UPDATE
@@ -5931,8 +5874,6 @@ OPER_HELP_UPDATE
 	Causes Services to update all database files as soon as you
 	send the command.
 	
-	Limited to Services admins.
-	
 OPER_HELP_RELOAD
 	Syntax: RELOAD
 
@@ -5940,8 +5881,6 @@ OPER_HELP_RELOAD
 	some directives still need the restart of the Services to
 	take effect (such as Services' nicknames, activation of the 
 	session limitation, etc.)
-	
-	Limited to Services admins.
 
 OPER_HELP_QUIT
 	Syntax: QUIT
@@ -5951,23 +5890,17 @@ OPER_HELP_QUIT
 	damage to the in-memory copies of the databases is feared
 	and they should not be saved.  For normal shutdowns, use the
 	SHUTDOWN command.
-	
-	Limited to Services admins.
 
 OPER_HELP_SHUTDOWN
 	Syntax: SHUTDOWN
 	
 	Causes Services to save all databases and then shut down.
-	
-	Limited to Services admins.
 
 OPER_HELP_RESTART
 	Syntax: RESTART
 	
 	Causes Services to save all databases and then restart
 	(i.e. exit and immediately re-run the executable).
-	
-	Limited to Services admins.	
 
 OPER_HELP_KILLCLONES
 	Syntax: KILLCLONES nick
@@ -5979,8 +5912,6 @@ OPER_HELP_KILLCLONES
 	used the command, which host was affected and how many
 	users were killed. It's useful for removing numerous 
 	clones from the network.
-
-	Limited to Services operators.
 	
 OPER_HELP_CHANLIST
 	Syntax: CHANLIST [{pattern | nick} [SECRET]]
@@ -5992,8 +5923,6 @@ OPER_HELP_CHANLIST
 	is given, lists only the channels the user using it is on. If SECRET is
 	specified, lists only channels matching pattern that have the +s or
 	+p mode.
-	
-	Limited to Services admins.
 
 OPER_HELP_USERLIST
 	Syntax: USERLIST [{pattern | channel} [INVISIBLE]]
@@ -6005,39 +5934,29 @@ OPER_HELP_USERLIST
 	the format nick!user@host). If channel is given, lists only users
 	that are on the given channel. If INVISIBLE is specified, only users
 	with the +i flag will be listed.
-	
-	Limited to Services admins.
 
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
-
+	
 	This command loads the module named FileName from the modules
 	directory.
 
-	Limited to Services Roots.
-
 OPER_HELP_MODUNLOAD
 	Syntax: MODUNLOAD FileName
-
+	
 	This command unloads the module named FileName from the modules
 	directory.
 
-	Limited to Services Roots.
-
 OPER_HELP_MODINFO
 	Syntax: MODINFO FileName
-
+	
 	This command lists information about the specified loaded module
 
-	Limited to Services Roots.
-
 OPER_HELP_MODLIST
 	Syntax: MODLIST
-
+	
 	Lists all currently loaded modules.
 
-	Limited to IRC Operators.
-
 
 ###########################################################################
 #
@@ -6374,8 +6293,6 @@ BOT_SERVADMIN_HELP_SET_NOBOT
 	This option makes a channel be unassignable. If a bot 
 	is already assigned to the channel, it is unassigned
 	automatically when you enable the option.
-	
-	Limited to Services admins.
 
 BOT_SERVADMIN_HELP_SET_PRIVATE
 	Syntax: SET bot-nick PRIVATE {ON|OFF}
@@ -6383,8 +6300,6 @@ BOT_SERVADMIN_HELP_SET_PRIVATE
 	This option prevents a bot from being assigned to a
 	channel by users that aren't IRC operators.
 
-	Limited to Services admins.
-
 ###########################################################################
 #
 # HostServ messages
@@ -6506,16 +6421,12 @@ HOST_HELP_SET
 	SET <nick> <ident>@<hostmask> set idents for users as 
 	well as vhosts.
 
-	Limited to Host Setters.
-
 HOST_HELP_DELALL
 	Syntax: DELALL <nick>.
 
 	Deletes the vhost for all nick's in the same group as
 	that of the given nick.
 
-	Limited to Host Removers.
-
 
 HOST_HELP_SETALL
 	Syntax: SETALL <nick> <hostmask>.
@@ -6528,8 +6439,6 @@ HOST_HELP_SETALL
 	* NOTE, this will not update the vhost for any nick's
 	added to the group after this command was used.
 
-	Limited to Host Setters.
-
 HOST_HELP_OFF
 	Syntax: OFF
 
@@ -6543,8 +6452,6 @@ HOST_HELP_DEL
 	Deletes the vhost assigned to the given nick from the
 	database.
 
-	Limited to HostRemovers.
-
 HOST_HELP_LIST
 	Syntax: LIST [<key>|<#X-Y>]
 
@@ -6560,8 +6467,6 @@ HOST_HELP_LIST
 	The list uses the value of NSListMax as a hard limit for the
 	number of items to display to a operator at any 1 time.
 
-	Limited to Services operators.
-
 HOST_HELP_GROUP
 	Syntax: GROUP
 	
diff --git a/lang/es.l b/lang/es.l
index e3020e098..1be942c18 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -314,6 +314,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Este nick pertenece a otra persona. Por favor elige otro nick.
 	(Si este es tu nick, tipea %R%s IDENTIFY clave.)
diff --git a/lang/fr.l b/lang/fr.l
index 89d98e5d5..0bb700261 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -314,6 +314,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Ce nick appartient à quelqu'un d'autre. Veuillez en changer.
 	(Si c'est votre nick, tapez %R%s IDENTIFY motdepasse.)
diff --git a/lang/gr.l b/lang/gr.l
index 708b1bd15..c5965eb9c 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -308,6 +308,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Áõôü ôï øåõäþíõìï áíÞêåé óå êÜðïéïí Üëëïí.  Ðáñáêáëþ äéÜëåîå êÜðïéï Üëëï.
 	(Áí áõôü åßíáé ôï øåõäþíõìü óïõ, ãñÜøå %R%s IDENTIFY ^_êùäéêü^_.)
diff --git a/lang/hun.l b/lang/hun.l
index ae6d7c17d..9e929784d 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -318,6 +318,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Ez a nick már regisztrált.  Kérlek válassz másikat.
 	Ha ez a te nicked, akkor %R%s IDENTIFY jelszó! 
diff --git a/lang/it.l b/lang/it.l
index 9ee73e2cc..465735a3b 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -310,6 +310,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Questo nick appartiene a qualcun altro. Per favore scegline un altro.
 	(Se questo è il tuo nick, digita %R%s IDENTIFY password.)
diff --git a/lang/nl.l b/lang/nl.l
index 2c0f3b7c1..7567d9093 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -312,6 +312,33 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	
+	Gelimiteerd tot Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	
+	Gelimiteerd tot Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	
+	Gelimiteerd tot Services Roots.
+HELP_LIMIT_IRC_OPER
+	
+	Gelimiteerd tot IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	
+	Gelimiteerd tot Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	
+	Gelimiteerd tot Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Deze nick is eigendom van iemand anders.  Kies een andere.
 	(Als dit jouw nick is, type %R%s IDENTIFY wachtwoord.)
@@ -3169,8 +3196,6 @@ OPER_HELP_EXCEPTION
 	met zijn host overeenkomt "gebruiken". Grote uitzonderingen-
 	lijsten en breed overeenkomende uitzondering-masks zullen
 	zeer waarschijnlijk de prestaties van de services verminderen.
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_SESSION
 	Gebruik: SESSION LIST drempel
@@ -3189,8 +3214,6 @@ OPER_HELP_SESSION
 	Bekijk de EXCEPTION help voor meer informatie over sessie
 	limiteringen en hoe sessie limieten in te stellen voor
 	specifieken hosts en groepen daarvan.
-	
-	Gelimiteerd tot Services admins.
 
 ###########################################################################
 #
@@ -3768,23 +3791,17 @@ NICK_HELP_SASET
 	Type %R%S HELP SASET option for more information
 	on a specific option. The options will be set on the given
 	nickname. 
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_DISPLAY
 	Syntax: SASET nickname DISPLAY new-display
 	
 	Changes the display used to refer to the nickname group in 
 	Services. The new display MUST be a nick of the group.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_PASSWORD
 	Syntax: SET nickname PASSWORD new-password
 	
 	Changes the password used to identify as the nick's	owner.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_URL
 	Syntax: SASET nickname URL url
@@ -3792,16 +3809,12 @@ NICK_HELP_SASET_URL
 	Associates the given URL with the nickname.  This URL
 	will be displayed whenever someone requests information
 	on the nick with the INFO command.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_EMAIL
 	Syntax: SASET nickname EMAIL address
 	
 	Associates the given E-mail address with the nickname.
 	
-	Limited to Services admins.
-	
 NICK_HELP_SASET_ICQ
 	Syntax: SASET nickname ICQ number
 	
@@ -3809,8 +3822,6 @@ NICK_HELP_SASET_ICQ
 	number will be displayed whenever someone requests 
 	information on the nick with the INFO command.
 	
-	Limited to Services admins.
-	
 NICK_HELP_SASET_GREET
 	Syntax: SASET nickname GREET message
 	
@@ -3818,8 +3829,6 @@ NICK_HELP_SASET_GREET
 	will be displayed when joining a channel that has GREET
 	option enabled, provided that the user has the necessary 
 	access on it.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_KILL
 	Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}
@@ -3836,8 +3845,6 @@ NICK_HELP_SASET_KILL
 	warned first or given a chance to change their nick; please
 	do not use this option unless necessary.  Also, your
 	network's administrators may have disabled this option.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_SECURE
 	Syntax: SASET nickname SECURE {ON | OFF}
@@ -3849,8 +3856,6 @@ NICK_HELP_SASET_SECURE
 	list.  However, if you are on the access list, %S
 	will not auto-kill you regardless of the setting of the
 	KILL option.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_PRIVATE
 	Syntax: SASET nickname PRIVATE {ON | OFF}
@@ -3860,8 +3865,6 @@ NICK_HELP_SASET_PRIVATE
 	nickname lists generated with %S's LIST command.
 	(However, anyone who knows the nickname can still get
 	information on it using the INFO command.)
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_HIDE
 	Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
@@ -3874,24 +3877,18 @@ NICK_HELP_SASET_HIDE
 	The second parameter specifies whether the information should
 	be displayed (OFF) or hidden (ON).
 	
-	Limited to Services admins.
-	
 NICK_HELP_SASET_MSG
 	Syntax: SASET nickname MSG {ON | OFF}
 	
 	Allows you to choose the way Services are communicating with 
 	the given user. With MSG set, Services will use messages,
 	else they'll use notices.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_NOEXPIRE
 	Syntax: SASET nickname NOEXPIRE {ON | OFF}
 	
 	Sets whether the given nickname will expire.  Setting this
 	to ON prevents the nickname from expiring.
-	
-	Limited to Services admins.
 
 NICK_HELP_SASET_AUTOOP
 	Syntax: SASET nickname AUTOOP {ON | OFF}
@@ -3899,8 +3896,6 @@ NICK_HELP_SASET_AUTOOP
 	Sets whether the given nickname will be opped automatically.
 	Set to ON to allow ChanServ to op you automatically when joining
 	channels.
-	
-	Limited to Services admins.
 
 NICK_HELP_RECOVER
 	Gebruik: RECOVER nick [wachtwoord]
@@ -4102,7 +4097,7 @@ NICK_SERVADMIN_HELP_LIST
 	nicks which, respectively, are FORBIDden, UNCONFIRMED or have the
 	NOEXPIRE flag set will be displayed. If all three options are
 	given, all three types of nicks will be displayed. These options
-	are limited to Services admins.  
+	are Gelimiteerd tot Services admins.  
 	
 	Voorbeelden:
 	
@@ -4148,8 +4143,6 @@ NICK_SERVADMIN_HELP_GETPASS
 	het is gebruikt zal worden gelogd en verstuurd zal worden
 	als WALLOPS/GLOBOPS.
 	
-	Gelimiteerd tot Services admins.
-	
 	Dit commando is onbeschikbaar wanneer encryptie is ingeschakeld.
 
 NICK_SERVADMIN_HELP_GETEMAIL
@@ -4162,8 +4155,6 @@ NICK_SERVADMIN_HELP_GETEMAIL
 	die dit commando uitvoerde samen met de emailhost waarop
 	het werd gebruikt. 
 
-	Gelimiteerd tot Services admins.
-
 NICK_SERVADMIN_HELP_FORBID
 	Gebruik: FORBID nick [reden]
 	
@@ -4172,8 +4163,6 @@ NICK_SERVADMIN_HELP_FORBID
 	door de registratie van de nick ongedaan te maken (DROP).
 	
 	Op sommige netwerken is een reden verplicht.
-	
-	Gelimiteerd tot Services admins.
 
 
 ###########################################################################
@@ -4187,8 +4176,6 @@ NICK_SERVADMIN_HELP_SUSPEND
 
 	Stelt een nick tijdelijk buiten werking. Een nick die buiten werking
 	is gesteld kan niet worden gebruikt: identificatie wordt uitgeschakeld.
-	
-	Gelimited to Services admins.
 
 ###########################################################################
 #
@@ -4201,8 +4188,6 @@ NICK_SERVADMIN_HELP_UNSUSPEND
 
 	UNSUSPENDS a nickname from being used.
 
-	Limited to Services admins.
-
 ###########################################################################
 #
 # ChanServ help messages
@@ -5187,8 +5172,6 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 	
 	Stelt in of het gegeven kanaal zal verlopen. Door deze optie
 	AAN te zetten kun je verhinderen dan het kanaal verloopt.
-	
-	Gelimiteerd tot Services adminstrators.
 
 CHAN_SERVADMIN_HELP_INFO
 	
@@ -5218,8 +5201,6 @@ CHAN_SERVADMIN_HELP_GETPASS
 	Let op: wanneer je dit commando gebruikt zal er een bericht
 	waarin staat wie het commando op welk kanaal heeft gebruikt
 	worden gelogged en verstuurd als WALLOPS/GLOBOPS.
-	
-	Gelimiteerd tot Services adminstrators.
 
 CHAN_SERVADMIN_HELP_FORBID
 	Gebruik: FORBID kanaal [reden]
@@ -5229,8 +5210,6 @@ CHAN_SERVADMIN_HELP_FORBID
 	droppen van het kanaal.
 	
 	Reden kan verplicht zijn op sommige netwerken.
-	
-	Gelimiteerd tot Services adminstrators.
 
 CHAN_SERVADMIN_HELP_SUSPEND
 	Gebruik: SUSPEND kanaal [reden]
@@ -5241,8 +5220,6 @@ CHAN_SERVADMIN_HELP_SUSPEND
 	instellingen te behouden.
 	
 	Op sommige netwerken is een reden verplicht.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_UNSUSPEND
 	Syntax: UNSUSPEND channel
@@ -5252,8 +5229,6 @@ CHAN_SERVADMIN_HELP_UNSUSPEND
 	buitenwerkingstelling.
 	Releases a suspended channel. All data and settings
 	are preserved from before the suspention.
-	
-	Limited to Services admins.
 
 CHAN_SERVADMIN_HELP_STATUS
 	Gebruik: STATUS kanaal nick
@@ -5266,8 +5241,6 @@ CHAN_SERVADMIN_HELP_STATUS
 	Als er een fout optreed zal het antwoord zijn in het formaat:
 	
 	    STATUS ERROR fout-bericht
-	
-	Gelimiteerd tot Services adminstrators.
 
 ###########################################################################
 #
@@ -5719,8 +5692,6 @@ OPER_HELP_MODE
 	Stelt Services operators in staat om de modes van elk willekeurig
 	kanaal in te stellen. De paramenters zijn het zelfde als bij een
 	standaard /MODE commando.
-	
-	Gelimiteerd tot Services operators.
 
 OPER_HELP_UMODE
 	Gebruik: UMODE gebruiker modes
@@ -5747,8 +5718,6 @@ OPER_HELP_CLEARMODES
 	Verwijdert alle binaire modes (i,k,l,m,n,p,s,t) en bans van
 	een kanaal. Als ALL is opgegeven, worden ook alle ops en
 	voices (+o en +v modes) van het kanaal verwijderd.
-	
-	Gelimiteerd tot Services operators.
 
 OPER_HELP_KICK
 	Gebruik: KICK kanaal gebruiker reden
@@ -5760,15 +5729,11 @@ OPER_HELP_KICK
 	Bijvoorbeeld:
 	
 	*** Gebruiker has been kicked off channel #mijn_kanaal by %S (IRCOp (Misbruik))
-	
-	Gelimiteerd tot Services operators.
 
 OPER_HELP_SVSNICK
 	Gebruik: SVSNICK nick nieuwe nick
 
 	Veranderd een gebruiker's nick van nick naar nieuwe nick.	
-	
-	Gelimiteerd tot Services administrators
 
 OPER_HELP_AKILL
 	Gebruik: AKILL ADD [+verlooptijd] mask reden
@@ -5817,8 +5782,6 @@ OPER_HELP_AKILL
 	
 	AKILL CLEAR maakt de AKILL lijst leeg.
 	
-	Gelimiteerd tot Services operators.
-	
 OPER_HELP_SGLINE
 	Gebruik: SGLINE ADD [+verlooptijd] mask reden
 	         SGLINE DEL {mask | entry-nr | lijst}
@@ -5863,8 +5826,6 @@ OPER_HELP_SGLINE
 	en de reden.
 	
 	SGLINE CLEAR maakt de SGLINE lijst leeg.
-	
-	Gelimiteerd tot Services operators.
 
 OPER_HELP_SQLINE
 	Gebruik: SQLINE ADD [+verlooptijd] mask reden
@@ -5913,8 +5874,6 @@ OPER_HELP_SQLINE
 	waarop dit gebeurde, waneer deze verloopt, en de mask en de reden.
 	
 	SQLINE CLEAR maakt de SQLINE lijst leeg.
-	
-	Gelimiteerd tot Services operators.
 
 OPER_HELP_SZLINE
 	Gebruik: SZLINE ADD [+verlooptijd] mask reden
@@ -5960,8 +5919,6 @@ OPER_HELP_SZLINE
 	adres en de reden.
 	
 	SZLINE CLEAR maakt de SZLINE lijst leeg
-	
-	Gelimiteerd tot Services operators.
 
 OPER_HELP_SET
 	Gebruik: SET optie instelling
@@ -5976,8 +5933,6 @@ OPER_HELP_SET
 	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
-	
-	Gelimiteerd tot Services adminstrators.
 
 OPER_HELP_SET_READONLY
 	Gebruik: SET READONLY {ON | OFF}
@@ -6066,8 +6021,6 @@ OPER_HELP_NOOP
 	server weer beschikbaar.
 	
 	Pas op: De server wordt niet gecontroleerd door Services.
-	
-	Gelimiteerd tot Services admintrators.
 
 OPER_HELP_JUPE
 	GEBRUIK: JUPE server [reden]
@@ -6080,8 +6033,6 @@ OPER_HELP_JUPE
 	deze in het server informatie veld geplaatsd, anders zal het
 	informatie veld de text "Juped by <nick>" bevatten, waar
 	<nick> vervangen wordt door de <nick> die de server JUPEt.
-	
-	Gelimiteerd tot Services adminstrators.
 
 OPER_HELP_RAW
 	Gebruik: RAW text
@@ -6091,8 +6042,6 @@ OPER_HELP_RAW
 	kan voor chaos zorgen op een netwerk als het onjuist gebruikt
 	wordt. GEBRUIK DIT COMMANDO NIET tenzij je absoluut zeker
 	bent van wat je doet!
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_UPDATE
 	Gebruik: UPDATE
@@ -6100,8 +6049,6 @@ OPER_HELP_UPDATE
 	Zorgt ervoor dat Services de database bestanden op de harde
 	schijf bijwerken zodra je dit commando vertsuurt.
 	
-	Gelimiteerd tot Services admins.
-	
 OPER_HELP_RELOAD
 	Gebruik: RELOAD
 	
@@ -6109,8 +6056,6 @@ OPER_HELP_RELOAD
 	inladen. Let er wel op dat sommige instellingen nog steeds
 	vereisen dat de Services opnieuw gestart worden (bijvoorbeeld
 	Services' nicknames, activatie van de sessie limiet, etc.)
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_QUIT
 	Gebruik: QUIT
@@ -6120,24 +6065,18 @@ OPER_HELP_QUIT
 	tenzij schade aan de kopieen van de databases in het geheugen
 	wordt gevreesd en ze niet moeten worden opgeslagen. Voor
 	normaal afsluiten moet je het SHUTDOWN commando gebruiken.
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_SHUTDOWN
 	Gebruik: SHUTDOWN
 	
 	Zorgt ervoor dat Services alle databases opslaat en dan
 	afsluit.
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_RESTART
 	Gebruik: RESTART
 	
 	Zorgt ervoor dat Services alle databases opslaat en dan
 	opnieuw opstart.
-	
-	Gelimiteerd tot Services admins.	
 
 OPER_HELP_KILLCLONES
 	Gebruik: KILLCLONES nick
@@ -6150,8 +6089,6 @@ OPER_HELP_KILLCLONES
 	gebuiker se geKILLed zijn. Dit commando is bruikbaar om
 	een groot aantal klonen van het netwerk te verwijderen.
 	
-	Gelimiteerd tot Services operators.
-	
 OPER_HELP_CHANLIST
 	Gebruik: CHANLIST [{trefbeeld | nick} [SECRET]]
 	
@@ -6163,8 +6100,6 @@ OPER_HELP_CHANLIST
 	alleen de kanalen waar de betreffende gebruiker aanwezig is
 	weergegeven. Als SECRET is gegeven worden alleen kanalen
 	die met trefbeeld overeenkomen en +s of +p mode hebben.
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_USERLIST
 	Gebruik: USERLIST [{trefbeeld | kanaal} [INVISIBLE]]
@@ -6178,8 +6113,6 @@ OPER_HELP_USERLIST
 	alleen gebruikers die op het betreffende kanaal zijn
 	weergegeven. Als INVISBLE is gespecifificeerd worden alleen
 	gebruikers met gebruikersmode +i weergegeven.
-	
-	Gelimiteerd tot Services admins.
 
 OPER_HELP_MODLOAD
 	Gebruik: MODLOAD bestandsnaam
@@ -6187,16 +6120,12 @@ OPER_HELP_MODLOAD
 	Dit commando laadt de module genaamd bestandsnaam uit de
 	modules directory.
 
-	Gelimiteerd tot Services Roots.
-
 OPER_HELP_MODUNLOAD
 	Gebruik: MODUNLOAD bestandsnaam
 
 	Dit commando ontlaadt de module genaamd bestandsnaam uit
 	de modules directory.
 
-	Gelimiteerd tot Services Roots.
-
 OPER_HELP_MODINFO
 	Gebruik: MODINFO bestandsnaam
 
@@ -6210,8 +6139,6 @@ OPER_HELP_MODLIST
 
 	Geeft alle momenteel geladen modules weer.
 
-	Gelimiteerd tot IRC Operators.
-
 
 ###########################################################################
 #
@@ -6552,8 +6479,6 @@ BOT_SERVADMIN_HELP_SET_NOBOT
 	Als er al een bot aan het kanaal is toegewezen wordt deze
 	automatisch van het kanaal gehaald wanneer je deze optie
 	aan zet.
-	
-	Gelimiteerd tot Services admins.
 
 BOT_SERVADMIN_HELP_SET_PRIVATE
 	Gebruik: SET bot-nick PRIVATE {ON|OFF}
@@ -6561,8 +6486,6 @@ BOT_SERVADMIN_HELP_SET_PRIVATE
 	Deze optie szorgt ervoor dat een bot niet kan worden
 	toegewezen aan een kanaal door gebruikers die geen
 	IRC operator zijn.
-	
-	Gelimiteerd tot Services admins.
 
 ###########################################################################
 #
@@ -6691,8 +6614,6 @@ HOST_HELP_SET
 	meegegeven heeft. Als de IRCD vIdent's ondersteund kun je
 	ook SET <nick> <ident>@<hostmask> gebruiken om de ident
 	voor een gebruiker aan te passen gelijk met de hostname.
-	
-	Gelimiteerd tot Services operators.
 
 HOST_HELP_DELALL
 	Syntax: DELALL <nick>.
@@ -6700,8 +6621,6 @@ HOST_HELP_DELALL
 	Verwijderd de vhost voor alle nick's in dezelfde groep
 	als de gegeven nick.
 
-	Gelimiteerd tot Host Removers.
-
 
 HOST_HELP_SETALL
 	Gebruik: SETALL <nick> <hostmask>.
@@ -6713,8 +6632,6 @@ HOST_HELP_SETALL
 	
 	* LET OP, dit wijzigt niet de vhost voor elke nick lid
 	wordt van de groep nadat dit commando is gebruikt.
-	
-	Gelimiteerd tot Services operators.
 
 HOST_HELP_OFF
 	Gebruik: OFF
@@ -6729,8 +6646,6 @@ HOST_HELP_DEL
 	
 	Verwijdert de vhost die toegewezen is aan de gegeven nick
 	uit de database.
-	
-	Gelimiteerd tot Services operators.
 
 HOST_HELP_LIST
 	Gebruik: LIST [<nick>|<vhost>]
@@ -6739,8 +6654,6 @@ HOST_HELP_LIST
 	een nick of vhost meegeeft zulleen alleen die nick/vhost
 	worden weergegeven. LET OP: er is momenteel geen flood-
 	bescherming voor grote databases.
-	
-	Gelimiteerd tor Services admins.
 
 HOST_HELP_GROUP
 	Gebruik: GROUP
diff --git a/lang/pl.l b/lang/pl.l
index 5516ac9c9..c882aedce 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -334,6 +334,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Ten nick jest zarejestrowany. Je¶li to Twój nick, 
 	wpisz: %R%s IDENTIFY has³o
diff --git a/lang/pt.l b/lang/pt.l
index 23ddcae08..8bcf6fcb8 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -318,6 +318,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Este nick foi registrado por outra pessoa.  Por favor escolha outro.
 	(Se este for seu nick, digite %R%s IDENTIFY senha.)
diff --git a/lang/ru.l b/lang/ru.l
index 131e773cc..00303b55e 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -314,6 +314,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Ýòîò íèê çàðåãèñòðèðîâàí è èñïîëüçóåòñÿ. Âûáåðèòå, ïîæàëóéñòà, äðóãîé íèê.
 	(Åñëè ýòî Âàø íèê, íàïèøèòå êîìàíäó %R%s IDENTIFY password.)
diff --git a/lang/tr.l b/lang/tr.l
index f4d5bbb96..9005e4688 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -313,6 +313,27 @@ CS_LIST_INCORRECT_RANGE
 ###########################################################################
 
 # Automatic messages
+HELP_LIMIT_SERV_OPER
+	Limited to Services Operators.
+HELP_LIMIT_SERV_ADMIN
+	Limited to Services Administrators.
+HELP_LIMIT_SERV_ROOT
+	Limited to Services Roots.
+HELP_LIMIT_IRC_OPER
+	Limited to IRC Operators.
+HELP_LIMIT_HOST_SETTER
+	Limited to Host Setters.
+HELP_LIMIT_HOST_REMOVER
+	Limited to Host Removers.
+
+
+###########################################################################
+#
+# NickServ messages
+#
+###########################################################################
+
+# Automatic messages
 NICK_IS_REGISTERED
 	Bu nick baþkasýna ait. Lütfen baþka bir tane seçin.
 	(Eðer bu sizin nickiniz ise, %R%s IDENTIFY þifreniz yazýnýz.)
diff --git a/src/commands.c b/src/commands.c
index 4deecb0c1..4460678db 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -127,6 +127,31 @@ void do_run_cmd(char *service, User * u, Command * c, const char *cmd)
 /*************************************************************************/
 
 /**
+ * Output the 'Limited to' line for the given command
+ * @param service Services Client
+ * @param u User Struct
+ * @param c Command Struct
+ * @return void
+ */
+void do_help_limited(char *service, User * u, Command * c)
+{
+    if (c->has_priv == is_services_oper)
+        notice_lang(service, u, HELP_LIMIT_SERV_OPER);
+    else if (c->has_priv == is_services_admin)
+        notice_lang(service, u, HELP_LIMIT_SERV_ADMIN);
+    else if (c->has_priv == is_services_root)
+        notice_lang(service, u, HELP_LIMIT_SERV_ROOT);
+    else if (c->has_priv == is_oper)
+        notice_lang(service, u, HELP_LIMIT_IRC_OPER);
+    else if (c->has_priv == is_host_setter)
+        notice_lang(service, u, HELP_LIMIT_HOST_SETTER);
+    else if (c->has_priv == is_host_remover)
+        notice_lang(service, u, HELP_LIMIT_HOST_REMOVER);
+}
+
+/*************************************************************************/
+
+/**
  * Print a help message for the given command.
  * @param services Services Client
  * @param u User Struct
@@ -202,6 +227,8 @@ void do_help_cmd(char *service, User * u, Command * c, const char *cmd)
     }
     if (has_had_help == 0) {
         notice_lang(service, u, NO_HELP_AVAILABLE, cmd);
+    } else {
+        do_help_limited(service, u, c);
     }
 
     mod_current_module = calling_module;
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 7b1a5f616..a37b58821 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -65,6 +65,7 @@ void myOperServHelp(User * u)
 {
     if (is_services_oper(u)) {
         notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL);
+		notice_lang(s_OperServ, u, HELP_LIMIT_SERV_OPER);
     }
 }
 
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 10b72703a..ca782ce0b 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -59,6 +59,7 @@ void myOperServHelp(User * u)
 {
     if (is_services_root(u)) {
         notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD);
+		notice_lang(s_OperServ, u, HELP_LIMIT_SERV_ROOT);
     }
 }
 
diff --git a/src/send.c b/src/send.c
index 7ef63222f..beb19d077 100644
--- a/src/send.c
+++ b/src/send.c
@@ -187,11 +187,13 @@ void notice_lang(char *source, User * dest, int message, ...)
     char buf[4096];             /* because messages can be really big */
     char *s, *t;
     const char *fmt;
+
     if (!dest || !message) {
         return;
     }
     va_start(args, message);
     fmt = getstring(dest->na, message);
+
     if (!fmt)
         return;
     memset(buf, 0, 4096);
diff --git a/version.log b/version.log
index 98570fc18..a9c57175d 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="19"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1281"
+VERSION_BUILD="1282"
 
 # $Log$
 #
+# BUILD : 1.7.19 (1282)
+# BUGS  : 729
+# NOTES : Changed the "Limited to ..." lines in help replies to automatically appended lines
+#
 # BUILD : 1.7.19 (1281)
 # BUGS  : 
 # NOTES : Reworded some stuffs in Changes