Fixed the /nickserv help info output to services opers and the reply from /chanserv help info to be correct

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

15 files changed, 32 insertions, 29 deletions

diff --git a/lang/cat.l b/lang/cat.l
index 6bf00a942..c302cc274 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -5171,8 +5171,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Administradors de serveis poden utilitzar el parΰmetre
-	ALL amb qualsevol canal
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Sintΰxi: LIST patrσ [FORBIDDEN] [NOEXPIRE]
diff --git a/lang/de.l b/lang/de.l
index 96e1e7137..1ee45447d 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -5206,8 +5206,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Services Administratoren kφnnen den ALL Parameter bei jedem
-	Channel benutzen.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Syntax: LIST Muster [FORBIDDEN] [NOEXPIRE]
diff --git a/lang/en_us.l b/lang/en_us.l
index caed91e66..e3b3cca88 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -4970,7 +4970,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Services Operators can use the ALL parameter with any channel.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/es.l b/lang/es.l
index 5ce7e330d..87a745d8d 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -5136,8 +5136,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Administradores de Servicios pueden usar el parametro
-	ALL con cualquier canal.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Sintaxis: LIST patron [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/fr.l b/lang/fr.l
index 8ee949413..93f55ba38 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -5192,8 +5192,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Les services operators peuvent utiliser le paramθtre ALL 
-	avec n'importe quel canal.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Syntaxe: LIST modθle
diff --git a/lang/gr.l b/lang/gr.l
index 41a0aa214..fadde8229 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -236,7 +236,7 @@ MAIL_X_INVALID
 MAIL_LATER
 	Δεν μπορεί να σταλεί στη διεύθυνση το μήνυμα για την ώρα; παρακαλώ προσπάθησε λίγο αργότερα.
 MAIL_DELAYED
-	Παρακαλώ περίμενε ^B%d^B δευτερόλεπτα και ξαναπροσπάθησε.
+	Παρακαλώ περίμενε %d δευτερόλεπτα και ξαναπροσπάθησε.
 	
 NO_REASON
 	Χωρίς λόγος
@@ -366,7 +366,7 @@ NICK_GROUP_SAME
 	Είσαι ήδη μέλος της ομάδας του %s.
 NICK_GROUP_TOO_MANY
 	Είναι πάρα πολλά ψευδώνυμα μέσα %s's ομάδα; κράτα μερικά και βγάλε κάποια.
-	Γράψε ^B%R%s HELP GLIST^B και %R%s HELP DROP 
+	Γράψε %R%s HELP GLIST και %R%s HELP DROP 
 	για περισσότερες πληροφορίες.
 NICK_GROUP_JOINED
 	Είσαι τώρα μέσα στην ομάδα του %s.
@@ -5108,8 +5108,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Οι Services Operators μπορούν να χρησιμοποιήσουν την παράμετρο ALL για κάθε
-	κανάλι.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Σύνταξη: LIST pattern [FORBIDDEN] [NOEXPIRE]
diff --git a/lang/hun.l b/lang/hun.l
index dccf91c2d..cf4377d28 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -5043,11 +5043,11 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 	
 	Korlαtozva Szervνz adminnak.
 
-
 CHAN_SERVADMIN_HELP_INFO
 	
-	Szervνz adminok hasznαlhatjαk az ALL paramιtert.
-	
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
+
 CHAN_SERVADMIN_HELP_LIST
 	Syntax: LIST pattern[FORBIDDEN] [SUSPENDED] [NOEXPIRE]
 	
diff --git a/lang/it.l b/lang/it.l
index 7244b6e6b..f9f223ea7 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -5040,8 +5040,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	I Services Operator possono usare il parametro ALL con qualsiasi
-	canale.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Sintassi: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/nl.l b/lang/nl.l
index a35d0ad9e..da027725e 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -5097,8 +5097,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Services Operatorstrators kunnen het ALL parameter gebruiken
-	bij elk kanaal.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Gebruik: LIST trefbeeld [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/pl.l b/lang/pl.l
index 42ebd2bc8..f54378c21 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -6113,7 +6113,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Administratorzy serwisσw zawsze mog± uΏywaζ parametru ALL.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Sk³adnia: LIST wzorzec [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/pt.l b/lang/pt.l
index a36f2fbbe..ff9d9aeba 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -5000,7 +5000,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Administradores de Services podem usar o comando ALL com qualquer canal.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Sintaxe: LIST padrγo [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/ru.l b/lang/ru.l
index f6e9f2d9b..6ca2f058a 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -5106,8 +5106,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	ΐδμθνθρςπΰςξπϋ ρεπβθρξβ μξγσς θροξλόηξβΰςό οΰπΰμεςπ ALL
-	ξςνξρθςελόνξ λώαξγξ κΰνΰλΰ ρεςθ.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Ρθνςΰκρθρ: LIST μΰρκΰ [FORBIDDEN] [SUSPENDED] [NOEXPIRE]
diff --git a/lang/tr.l b/lang/tr.l
index 0cd643567..5735e00b5 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -5074,8 +5074,8 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE
 
 CHAN_SERVADMIN_HELP_INFO
 	
-	Servis adminleri herhangi bir kanal iηin ALL parametresini
-	kullanabilirler.
+	Services Operators with the chanserv/auspex permission can
+	use the ALL parameter with any channel.
 
 CHAN_SERVADMIN_HELP_LIST
 	Kullanύmύ: LIST model [FORBIDDEN] [NOEXPIRE]
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 07d210afa..1322b8736 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -152,7 +152,7 @@ class CommandCSInfo : public Command
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_lang(Config.s_ChanServ, u, CHAN_HELP_INFO);
-		if (u->Account() && u->Account()->IsServicesOper())
+		if (u->Account() && u->Account()->HasPriv("chanserv/auspex"))
 			notice_lang(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_INFO);
 
 		return true;
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 7243a4c44..d40b07506 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -190,10 +190,10 @@ class CommandNSInfo : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
+		notice_help(Config.s_NickServ, u, NICK_HELP_INFO);
 		if (u->Account() && u->Account()->IsServicesOper())
 			notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
-		else
-			notice_help(Config.s_NickServ, u, NICK_HELP_INFO);
+
 		return true;
 	}