Merge commit 'trunk' into anopeng

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

13 files changed, 53 insertions, 39 deletions

diff --git a/lang/cat.l b/lang/cat.l
index 2cdc50c11..b2563a946 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2964,7 +2964,7 @@ OPER_CANNOT_RESTART
 
 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick]
+	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -5827,11 +5827,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Sintàxi: MODE canal Modes
diff --git a/lang/de.l b/lang/de.l
index 0cf7931d8..02ed7796c 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2931,7 +2931,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [Zeit] [Nickname]
+	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [Zeit] [Nickname | Hostmaske]
 OPER_IGNORE_VALID_TIME
 	Du musst eine zulässige Zahl als Zeit eingeben.
 OPER_IGNORE_TIME_DONE
@@ -5859,11 +5859,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Syntax: MODE Channel Modi
diff --git a/lang/en_us.l b/lang/en_us.l
index f1ad63638..32b4054df 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2876,7 +2876,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick]
+	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -5539,11 +5539,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted.
-	To make Services permanently (untill next restart) ignore the
-	user, type 0 as time.
+	To make Services permanently ignore the	user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Syntax: MODE channel modes
diff --git a/lang/es.l b/lang/es.l
index c4b57c44a..b25dbbcea 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2938,7 +2938,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE responses
 OPER_IGNORE_SYNTAX
-	Sintaxis: IGNORE {ADD|DEL|LIST|CLEAR} [tiempo] [nick]
+	Sintaxis: IGNORE {ADD|DEL|LIST|CLEAR} [tiempo] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Debes ingresar un numero valido como tiempo.
 OPER_IGNORE_TIME_DONE
@@ -5794,11 +5794,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Sintaxis: MODE canal modos
diff --git a/lang/fr.l b/lang/fr.l
index ad633f20a..f964201ff 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2989,7 +2989,7 @@ OPER_CANNOT_RESTART
 
 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntaxe: IGNORE {ADD|DEL|LIST|CLEAR} [durée] [pseudo]
+	Syntaxe: IGNORE {ADD|DEL|LIST|CLEAR} [durée] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Vous devez entrer une durée valide
 OPER_IGNORE_TIME_DONE
@@ -5882,11 +5882,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Syntaxe: MODE canal modes
diff --git a/lang/gr.l b/lang/gr.l
index 651db9590..7788cff5e 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2967,7 +2967,7 @@ OPER_CANNOT_RESTART
 
 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick]
+	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -5751,11 +5751,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Óýíôáîç: MODE êáíÜëé modes
diff --git a/lang/hun.l b/lang/hun.l
index baa9ccb04..2d108a6a3 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2928,7 +2928,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE válaszok
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [idõ] [nick]
+	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [idõ] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Használj érvényes számot idõnek. 
 	(Adj meg érvényes számot az idõhöz.)
@@ -5664,11 +5664,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 		
 OPER_HELP_MODE
 	Syntax: MODE #szoba módok
diff --git a/lang/it.l b/lang/it.l
index 366c0d715..5f16f57cb 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2890,7 +2890,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE responses
 OPER_IGNORE_SYNTAX
-	Sintassi: IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick]
+	Sintassi: IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Devi inserire un numero valido per indicare il tempo.
 OPER_IGNORE_TIME_DONE
@@ -5701,11 +5701,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Sintassi: MODE canale modi
diff --git a/lang/nl.l b/lang/nl.l
index 540a05414..e3509b104 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2938,7 +2938,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Gebruik: IGNORE {ADD|DEL|LIST|CLEAR} [tijd] [nick]
+	Gebruik: IGNORE {ADD|DEL|LIST|CLEAR} [tijd] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Je moet een geldig nummer als tijd invoeren.
 OPER_IGNORE_TIME_DONE
@@ -5711,11 +5711,13 @@ OPER_HELP_IGNORE
 	Je kan de tijd opgegeven met behulup van units. Geldige units 
 	zijn: s voor seconden, m voor minuten, h voor uren
 	en d voor dagen. Combinaties hiervan zijn niet toegestaan. 
-	Om Services iemand permanent (tot de volgende heropstart) te laten
-	negeren kun je 0 opgeven als tijd.
+	Om Services iemand permanent te laten negeren kun je 0 opgeven als tijd.
 	Als je een mask toevoegd moet deze in volgende format zijn:
 	user@host of nick!user@host, iets anders wordt een nick beschouwd.
 	Wildcards zijn toegestaan.
+	
+	IRC Operators zullen niet genegeerd worden, zelfs al komen
+	ze overeen met een mask uit de lijst.
 
 OPER_HELP_MODE
 	Gebruik: MODE kanaal modes
diff --git a/lang/pl.l b/lang/pl.l
index 3c94eb5f2..a1d58d95c 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -3136,7 +3136,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Sk³adnia: IGNORE {ADD|DEL|LIST|CLEAR} [czas] [nick]
+	Sk³adnia: IGNORE {ADD|DEL|LIST|CLEAR} [czas] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Musisz podaæ prawid³ow± liczbê dla czasu.
 OPER_IGNORE_TIME_DONE
@@ -6152,11 +6152,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Syntax: MODE channel modes
diff --git a/lang/pt.l b/lang/pt.l
index 7e9be3127..98c248097 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2902,7 +2902,7 @@ OPER_CANNOT_RESTART
 
 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Sintaxe: IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick]
+	Sintaxe: IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Você precisa digitar um número válido como tempo.
 OPER_IGNORE_TIME_DONE
@@ -5647,11 +5647,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Sintaxe: MODE canal modos
diff --git a/lang/ru.l b/lang/ru.l
index 6d3eb28cb..002c30737 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -2875,7 +2875,7 @@ OPER_CANNOT_RESTART
 
 # IGNORE respondes
 OPER_IGNORE_SYNTAX
-	Ñèíòàêñòñ: IGNORE {ADD|DEL|LIST|CLEAR} [âðåìÿ] [íèê]
+	Ñèíòàêñòñ: IGNORE {ADD|DEL|LIST|CLEAR} [âðåìÿ] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	Âû äîëæíû ââåñòè ïðàâèëüíîå çíà÷åíèå âðåìåíè.
 OPER_IGNORE_TIME_DONE
@@ -5561,11 +5561,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Ñèíòàêñèñ: MODE #êàíàë ðåæèìû
diff --git a/lang/tr.l b/lang/tr.l
index 51e897b3a..0bf7d3ef5 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -2961,7 +2961,7 @@ OPER_CANNOT_RESTART
 
 # LISTIGNORE responses
 OPER_IGNORE_SYNTAX
-	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick]
+	Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]
 OPER_IGNORE_VALID_TIME
 	You have to enter a valid number as time.
 OPER_IGNORE_TIME_DONE
@@ -5709,11 +5709,12 @@ OPER_HELP_IGNORE
 	Valid units are: s for seconds, m for minutes, 
 	h for hours and d for days. 
 	Combinations of these units are not permitted. To make
-	Services permanently (untill next restart) ignore the user,
-	type 0 as time.
+	Services permanently ignore the user, type 0 as time.
 	When adding a mask, it should be in the format user@host
 	or nick!user@host, everything else will be considered a nick.
 	Wildcards are permitted.
+	
+	Ignores will not be enforced on IRC Operators.
 
 OPER_HELP_MODE
 	Kullanýmý: MODE kanaladý modlar