BUILD : 1.7.8 (606) BUGS : NOTES : Removed proxy detector code from the core, threads stuff still there. Needs good testing

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


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

13 files changed, 0 insertions, 675 deletions

diff --git a/lang/cat.l b/lang/cat.l
index eae947a61..abceb125d 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2305,8 +2305,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ     : %6d registres, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessions     : %6d registres, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies      : ^B%6d^B registres, ^B%5d^B kB
 OPER_STATS_AKILL_COUNT
 	Numero actual de AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2787,42 +2785,6 @@ OPER_USERLIST_END
 	Fi de la llista d'usuaris.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | patró} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Detecció de Proxy deshabilitada.
-OPER_CACHE_NOT_FOUND
-	%s no trobat al cau.
-OPER_CACHE_REMOVED
-	%s ha estat esborrat del cau.
-OPER_CACHE_HEADER
-	Hostname                                         Estatus
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fi de la llista - %d/%d instàncies mostrades.
-OPER_CACHE_QUEUED
-	Encuat
-OPER_CACHE_PROGRESS
-	En progrès
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	Proxy HTTP
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	You are now a SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -5821,26 +5783,6 @@ OPER_HELP_USERLIST
 	
 	Limitat a administradors de serveis.
 
-OPER_HELP_CACHE
-	Sintàxi: CACHE DEL hostname
-	          CACHE LIST patró [QUEUED | ALL]
-	
-	La comanda CACHE DEL esborra el host especificat del cau.
-	Això nomès esta indicat per a propòsits de debug.
-	
-	La comanda CACHE LIST llista tots els proxies trobats que
-	concordin amb el patró especificat. Si s'especifica l'opció QUEUED,
-	llistara tots els processos encuats o en progres, i si s'especifica
-	l'opció ALL, llistara tots els hostnames a cau.
-	
-	Limitat a administradors de serveis.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/de.l b/lang/de.l
index a2d9672cf..266ee571f 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2297,8 +2297,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ          : %6d Einträge, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Verbindungen      : %6d Einträge, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d records, %5d kB
 OPER_STATS_AKILL_COUNT
 	Aktuelle Anzahl von AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2781,34 +2779,6 @@ OPER_USERLIST_END
 ###########################################################################
 
 # EXCEPTION responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {Hostname | Muster} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy Detektor ist deaktiviert.
-OPER_CACHE_NOT_FOUND
-	%s wurde nicht im Cache gefunden.
-OPER_CACHE_REMOVED
-	%s wurde aus dem Cache gelöscht.
-OPER_CACHE_HEADER
-	Hostname                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Ende der Liste - %d/%d passende Einträge angezeigt.
-OPER_CACHE_QUEUED
-	in der Warteschlange
-OPER_CACHE_PROGRESS
-	in Bearbeitung
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	Du bist jetzt ein Super-Admin.
 OPER_SUPER_ADMIN_OFF
@@ -6024,27 +5994,6 @@ OPER_HELP_USERLIST
 #
 ###########################################################################
 	
-OPER_HELP_CACHE
-	Syntax: CACHE DEL Hostname
-	        CACHE LIST Muster [QUEUED | ALL]
-	
-	Der CACHE DEL Befehl löscht den angegeben Hostnamen aus dem
-	Cache. Dieser Befehl ist ausschließlich für DEBUG Zwecke.
-
-	Der CACHE LIST Befehl listet alle Proxies auf, die dem
-	angegebenen Muster entsprechen. Falls die QUEUED Option
-	mitangegeben wird, werden alle Scans in der Warteschlange und
-	alle Scans die gerade laufen angezeigt. Wenn die ALL Option 
-	mitangegeben wird, werden alle Hostnamen aufgelistet.
-	
-	Beschränkt auf Services Administratoren.
-
-###########################################################################
-#
-# BotServ help messages   ## 19.10.2004 ##
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD Modul-Name
 
diff --git a/lang/en_us.l b/lang/en_us.l
index 75d29ec8a..1772e4d43 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2234,8 +2234,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d records, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessions      : %6d records, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d records, %5d kB
 OPER_STATS_AKILL_COUNT
 	Current number of AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2705,35 +2703,6 @@ OPER_USERLIST_RECORD
 OPER_USERLIST_END
 	End of users list.
 
-# CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | pattern} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy detection is disabled.
-OPER_CACHE_NOT_FOUND
-	%s was not found in the cache.
-OPER_CACHE_REMOVED
-	%s has been removed from the cache.
-OPER_CACHE_HEADER
-	Hostname                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	End of list - %d/%d matches shown.
-OPER_CACHE_QUEUED
-	Queued
-OPER_CACHE_PROGRESS
-	In progress
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	You are now a SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -4975,7 +4944,6 @@ OPER_HELP_ADMIN_CMD
 	    OPERNEWS    Define messages to be shown to users who oper
 	    SESSION     View the list of host sessions
 	    EXCEPTION   Modify the session-limit exception list
-	    CACHE       Lists hostname cache used by the proxy detector
 	    NOOP        Temporarily remove all O:lines of a server 
 	                    remotely
 	    JUPE        "Jupiter" a server
@@ -5580,20 +5548,6 @@ OPER_HELP_USERLIST
 	
 	Limited to Services admins.
 
-OPER_HELP_CACHE
-	Syntax: CACHE DEL hostname
-	        CACHE LIST pattern [QUEUED | ALL]
-	
-	The CACHE DEL command deletes the specified hostname from 
-	the cache. This is meant for debug purpose only.
-
-	The CACHE LIST command lists all found proxies that match the
-	given pattern. If the QUEUED option is given, it will list
-	the queued or in progress scans instead, and if the ALL option 
-	is given, it will list all cached hostnames.
-	
-	Limited to Services admins.
-
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/es.l b/lang/es.l
index 7ca7b44ef..04282ff97 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2276,8 +2276,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ     : %6d records, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sesiones     : %6d records, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies      : ^B%6d^B records, ^B%5d^B kB
 OPER_STATS_AKILL_COUNT
 	Numero actual de AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2759,42 +2757,6 @@ OPER_USERLIST_END
 	Fin de la lista de usuarios.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | patron} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Deteccion de Proxy deshabilitada.
-OPER_CACHE_NOT_FOUND
-	%s no encontrado en el cache.
-OPER_CACHE_REMOVED
-	%s ha sido removido del cache.
-OPER_CACHE_HEADER
-	Hostname                                         Estatus
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fin de la lista - %d/%d instancias mostradas.
-OPER_CACHE_QUEUED
-	Encolado
-OPER_CACHE_PROGRESS
-	En progreso
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	Proxy HTTP
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	Ahora eres un SuperAdmin.
 OPER_SUPER_ADMIN_OFF
@@ -5800,26 +5762,6 @@ OPER_HELP_USERLIST
 	
 	Limitado a administradores de Servicios.
 
-OPER_HELP_CACHE
-	Sintaxis: CACHE DEL hostname
-	          CACHE LIST patron [QUEUED | ALL]
-	
-	El comando CACHE DEL borra el host especificado del cache.
-	Esto esta dispuesto solo para propositos de debug.
-	
-	El comando CACHE LIST lista todos los proxies encontrados que
-	concuerden con el patron dado. Si la opcion QUEUED es dada,
-	listara los procesos encolados o en progreso en vez, y si la
-	opcion ALL es dada, listara todos los hostnames en cache.
-	
-	Limitado a administradores de Servicios.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Sintaxis: MODLOAD NombreArchivo
 
diff --git a/lang/fr.l b/lang/fr.l
index c567bb021..692283d42 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2316,8 +2316,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d enregistrements, %5d ko
 OPER_STATS_SESSIONS_MEM
 	Sessions      : %6d enregistrements, %5d ko
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d enregistrements, %5d ko
 OPER_STATS_AKILL_COUNT
 	Nombre d'AKILLs actuel: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2800,42 +2798,6 @@ OPER_USERLIST_END
 	Fin de la liste des utilisateurs.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | pattern} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	La détection de proxies est désactivée.
-OPER_CACHE_NOT_FOUND
-	%s n'a pas été trouvé dans le cache.
-OPER_CACHE_REMOVED
-	%s a été supprimé du cache.
-OPER_CACHE_HEADER
-	Nom d'hôte                                       Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fin de la liste - %d/%d correspondances affichées.
-OPER_CACHE_QUEUED
-	En attente
-OPER_CACHE_PROGRESS
-	En cours
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	Proxy HTTP
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	Vous êtes maintenant SuperAdmin.
 OPER_SUPER_ADMIN_OFF
@@ -5843,28 +5805,6 @@ OPER_HELP_USERLIST
 	
 	Réservée aux Services admins.
 
-OPER_HELP_CACHE
-	Syntaxe: CACHE DEL nom d'hôte
-	         CACHE LIST modèle [QUEUED | ALL]
-	
-	La commande CACHE DEL supprime du cache le nom d'hôte 
-	spécifié. Cette commande ne devrait être utilisée que
-	pour le déboguage.
-	
-	La commande CACHE LIST liste tous les proxies  
-	correspondants au modèle donné, ou, si l'option QUEUED 
-	est donnée, les scans en attente ou en cours, ou, si
-	l'option ALL est donnée, tous les noms d'hôtes présents
-	dans la cache.
-	
-	Réservée aux administrateurs des services.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/gr.l b/lang/gr.l
index 7c4084cd4..8f26a4605 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2294,8 +2294,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d âÜóåéò, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessions      : %6d âÜóåéò, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d âÜóåéò, %5d kB
 OPER_STATS_AKILL_COUNT
 	Ùò ôþñá õðÜñ÷ïõí AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2776,42 +2774,6 @@ OPER_USERLIST_END
 	ÔÝëïò ëßóôáò ÷ñçóôþí.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | pattern} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Ç Proxy áíß÷íåõóç åßíáé áðåíåñãïðïéçìÝíç.
-OPER_CACHE_NOT_FOUND
-	%s äåí âñÝèçêå óôï cache.
-OPER_CACHE_REMOVED
-	%s äéáãñÜöçêå áðü ôï cache.
-OPER_CACHE_HEADER
-	ÌÜóêá-host                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	ÔÝëïò ëßóôáò - %d/%d âñÝèçêáí.
-OPER_CACHE_QUEUED
-	Queued
-OPER_CACHE_PROGRESS
-	In progress
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	You are now a SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -5713,26 +5675,6 @@ OPER_HELP_USERLIST
 	    
 	Ìüíï ãéá ôïõò Services admins.
 
-OPER_HELP_CACHE
-	Óýíôáîç: CACHE DEL hostname
-	        CACHE LIST åðéëïãÞ [QUEUED | ALL]
-	
-	Ç åíôïëÞ CACHE DEL äéáãñÜöåé ôá óõãêåêñéìÝíá hostname áðü 
-	ôçí cache.
-
-	Ç åíôïëÞ CACHE LIST åìöáíßæåé ôçí ëßóôá ìå üëá ôá proxies ðïõ
-	âñÝèçêáí êáé ôáéñéÜæïõí ìå ôçí åðéëïãÞ ðïõ äþóáôå. Áí äþóåôå QUEUED
-	åðéëïãÞ, èá åìöáíßóåé ëßóôá ìå ôá queued Þ ôá scans, êáé ìå ôçí
-	ALL åðéëïãÞ èá åìöáíßóåé üëá ôá cached hostnames.
-	    
-	Ìüíï ãéá ôïõò Services admins.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/hun.l b/lang/hun.l
index 78b71a15a..1efc6735f 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2260,8 +2260,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ	 : %6d bejegyzés, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Session	 : %6d bejegyzés, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxik	 : %6d bejegyzés, %5d kB
 OPER_STATS_AKILL_COUNT
 	Aktuális AKILLek száma: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2738,34 +2736,6 @@ OPER_USERLIST_END
 	Vége a felhasználó listának.
 
 # CACHE válaszok
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hosztnév | pattern} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy ellenörzés tiltva.
-OPER_CACHE_NOT_FOUND
-	%s nem használt rejtést.
-OPER_CACHE_REMOVED
-	%s törölve lesz rejtés használatáért(proxi).
-OPER_CACHE_HEADER
-	Hosztnév					Státusz
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Vége a listának - %d/%d bejegyzés mutatása.
-OPER_CACHE_QUEUED
-	Várakozik
-OPER_CACHE_PROGRESS
-	Folyamatban
-OPER_CACHE_NORMAL
-	Normál
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	Most már Szuper-Admin vagy
 OPER_SUPER_ADMIN_OFF
@@ -5606,20 +5576,6 @@ OPER_HELP_USERLIST
 	
 	Korlátozva Szervíz adminoknak.
 	
-OPER_HELP_CACHE
-	Syntax: CACHE  DEL hostnév
-	        CACHE  LIST pattern [QUEUED | ALL]
-	
-	The CACHE DEL command deletes the specified hostname from 
-	the cache. This is meant for debug purpose only.
-	
-	The CACHE LIST command lists all found proxies that match the
-	given pattern. If the QUEUED option is given, it will list
-	the queued or in progress scans instead, and if the ALL option 
-	is given, it will list all cached hostnames.
-	
-	Korlátozva Szervíz adminoknak.
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD Fájlnév
 	
diff --git a/lang/it.l b/lang/it.l
index 2336fef93..8477fb1d5 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2301,8 +2301,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ:    %6d records, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessioni:    %6d records, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxy:       %6d records, %5d kB
 OPER_STATS_AKILL_COUNT
 	Numero attuale di AKILL: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2781,41 +2779,6 @@ OPER_USERLIST_END
 	Fine della lista dei nick.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | pattern} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Il riconoscimento dei proxy è disabilitato.
-OPER_CACHE_NOT_FOUND
-	Impossibile trovare %s nella cache.
-OPER_CACHE_REMOVED
-	%s è stato rimosso dalla cache.
-OPER_CACHE_HEADER
-	Hostname                                         Stato
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fine della lista - %d/%d risultati mostrati
-OPER_CACHE_QUEUED
-	In coda
-OPER_CACHE_PROGRESS
-	In corso
-OPER_CACHE_NORMAL
-	Normale
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	Proxy HTTP
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
 OPER_SUPER_ADMIN_ON
 	Ora sei un SuperAdmin.
 OPER_SUPER_ADMIN_OFF
@@ -5865,26 +5828,6 @@ OPER_HELP_USERLIST
 	
 	Limitato ai Services admin.
 
-OPER_HELP_CACHE
-	Sintsasi: CACHE DEL hostname
-	          CACHE LIST pattern [QUEUED | ALL]
-	
-	Il comando CACHE DEL rimuove l'hostname specificato dalla
-	cache. Questo comando va usato solo a scopo di debug.
-	
-	Il comando CACHE LIST mostra tutti i proxy che corrispondono
-	al pattern specificato. Se viene indicata l'opzione QUEUED,
-	mostra invece gli scan in coda e in corso, e se viene indicata
-	l'opzione ALL, mostrerà tutti gli hostname nella cache.
-	
-	Limitato ai Services admin.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/nl.l b/lang/nl.l
index 07fce4733..9b35171c8 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2276,8 +2276,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d records, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessies       : %6d records, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d records, %5d kB
 OPER_STATS_AKILL_COUNT
 	Huidig aantal AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2750,34 +2748,6 @@ OPER_USERLIST_END
 	Einde van gebruikers lijst.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | trefbeeld} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy detectie is uitgeschakeld.
-OPER_CACHE_NOT_FOUND
-	%s is niet gevonden in de cache.
-OPER_CACHE_REMOVED
-	%s is verwijderd uit de cache.
-OPER_CACHE_HEADER
-	Hostname                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Eind lijst - %d/%d overeenkomsten weergegeven.
-OPER_CACHE_QUEUED
-	In de wachtrij
-OPER_CACHE_PROGRESS
-	In behandeling
-OPER_CACHE_NORMAL
-	Normaal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	Je bent nu een SuperAdministrator
 OPER_SUPER_ADMIN_OFF
@@ -5735,28 +5705,6 @@ OPER_HELP_USERLIST
 	
 	Gelimiteerd tot Services admins.
 
-OPER_HELP_CACHE
-	Gebruik: CACHE DEL hostname
-	         CACHE LIST trefbeeld [QUEUED | ALL]
-	
-	Het CACHE DEL commando verwijderd de gegeven hostname uit
-	de cache. Dit commando is alleen bedoeld voor debugging.
-
-	Het CACHE LIST commando geeft alle gevonden proxies weer
-	die overeenkomen met het gegeven trefbeeld. Als de QUEUED
-	optie is meegegeven zullen alleen scans die in de wachtrij
-	staan of op het moment bezig zijn weergegeven worden, en als
-	de ALL optie is gegeven zullen alle gecachde hostnames
-	worden weergegeven.
-	
-	Gelimiteerd tot Services admins.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Gebruik: MODLOAD bestandsnaam
 	
diff --git a/lang/pl.l b/lang/pl.l
index 3c7323b8a..99919058d 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -2470,8 +2470,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d rekordów, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sesji         : %6d rekordów, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxy         : %6d rekordów, %5d kB
 OPER_STATS_AKILL_COUNT
 	Aktualna ilo¶æ AKILLów: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2965,34 +2963,6 @@ OPER_USERLIST_END
 	Koniec listy u¿ytkowników.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {host | wzór} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Detekcja proxy jest wy³±czona.
-OPER_CACHE_NOT_FOUND
-	%s nie znaleziono w cache.
-OPER_CACHE_REMOVED
-	%s usuniêto z cache.
-OPER_CACHE_HEADER
-	Host                                           Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Koniec listy - %d/%d wyników pokazano.
-OPER_CACHE_QUEUED
-	Kolejkowane
-OPER_CACHE_PROGRESS
-	W trakcie
-OPER_CACHE_NORMAL
-	Normalne
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	Jeste¶ teraz SuperAdminem.
 OPER_SUPER_ADMIN_OFF
@@ -6155,20 +6125,6 @@ OPER_HELP_USERLIST
 	
 	Limited to Services admins.
 
-OPER_HELP_CACHE
-	Syntax: CACHE DEL hostname
-	        CACHE LIST pattern [QUEUED | ALL]
-	
-	The CACHE DEL command deletes the specified hostname from 
-	the cache. This is meant for debug purpose only.
-
-	The CACHE LIST command lists all found proxies that match the
-	given pattern. If the QUEUED option is given, it will list
-	the queued or in progress scans instead, and if the ALL option 
-	is given, it will list all cached hostnames.
-	
-	Limited to Services admins.
-
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/pt.l b/lang/pt.l
index fbdb1bfb7..3431c7377 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2246,8 +2246,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d registros, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessões       : %6d registros, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d registros, %5d kB
 OPER_STATS_AKILL_COUNT
 	Número atual de AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2722,34 +2720,6 @@ OPER_USERLIST_END
 	Fim da listagem.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {host | padrão} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Detecção de Proxy está desabilitada.
-OPER_CACHE_NOT_FOUND
-	%s não foi encontrado no cache.
-OPER_CACHE_REMOVED
-	%s foi removido do cache.
-OPER_CACHE_HEADER
-	Hostname                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fim da lista - %d/%d resultados mostrados.
-OPER_CACHE_QUEUED
-	Queued
-OPER_CACHE_PROGRESS
-	Em progresso
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	Você é agora um SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -5645,21 +5615,6 @@ OPER_HELP_USERLIST
 	
 	Limitado aos Administradores dos Services.
 	
-OPER_HELP_CACHE
-	Sintaxe: CACHE DEL host
-	         CACHE LIST padrão [QUEUED | ALL]
-	
-	O comando CACHE DEL apaga do cache o host especificado.
-	Isto é intensionado apenas para propósito de depuração.
-	
-	O comando CACHE LIST lista todas as proxies encontradas
-	que combinam com o padrão fornecido. Se a opção QUEUED
-	for fornecida, serão listados os scans (varreduras) em espera
-	ou em progresso, e se a opção ALL for fornecida, serão
-	listados todos os hosts no cache.
-	
-	Limitado aos Administradores dos Services.
-	
 OPER_HELP_MODLOAD
 	Sintaxe: MODLOAD NomeDoArquivo
 	
diff --git a/lang/ru.l b/lang/ru.l
index 4a37476f3..3e069eb82 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -2272,8 +2272,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ                              : %6d çàïèñåé, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Ñåññèè                                : %6d çàïèñåé, %5d kB
-OPER_STATS_PROXY_MEM
-	Ïðîêñè                                : %6d çàïèñåé, %5d kB
 OPER_STATS_AKILL_COUNT
 	Êîëè÷åñòâî AKILL'îâ                   : %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2746,34 +2744,6 @@ OPER_USERLIST_END
 	Êîíåö ñïèñêà ïîëüçîâàòåëåé.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {èìÿ õîñòà | ñèìâîëüíàÿ ìàñêà} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Äåòåêòîð ïðîêñè îòêëþ÷åí.
-OPER_CACHE_NOT_FOUND
-	%s íå íàéäåí â êýøå.
-OPER_CACHE_REMOVED
-	%s óäàëåí èç êýøà.
-OPER_CACHE_HEADER
-	Èìÿ õîñòà                                         Ñòàòóñ
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Êîíåö ñïèñêà - %d/%d çàïèñåé íàéäåíî.
-OPER_CACHE_QUEUED
-	Î÷åðåäü
-OPER_CACHE_PROGRESS
-	Âûïîëíÿåòñÿ
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP ïðîêñè
 OPER_SUPER_ADMIN_ON
 	Òåïåðü Âû Ñóïåð-Àäìèí
 OPER_SUPER_ADMIN_OFF
@@ -5629,20 +5599,6 @@ OPER_HELP_USERLIST
 	
 	Ýòó êîìàíäó ìîãóò èñïîëüçîâàòü òîëüêî Àäìèíèñòðàòîðû ñåðâèñîâ.
 
-OPER_HELP_CACHE
-	Ñèíòàêñèñ: CACHE DEL õîñò
-	           CACHE LIST ñèìâîëüíàÿ ìàñêà [QUEUED | ALL]
-	
-	Êîìàíäà CACHE DEL óäàëÿåò óêàçàííûé õîñò èç
-	êýøà. Ýòà êîìàíäà ïðåäíàçíà÷åíà òîëüêî äëÿ îòëàäêè.
-
-	Êîìàíäà CACHE LIST ïîêàçûâàåò ñïèñêî âñåõ íàéäåííûõ ïðîêñè, ïîäïàäàþùèõ ïîä
-	óêàçàííóþ ñèìâîëüíóþ ìàñêó. Åñëè óêàçàòü ïàðàìåòð QUEUED, òî áóäåò ïîêàçàíà
-	î÷åðåäü ñêàíîâ, è åñëè óêàçàòü ïàðàìåòð ALL,
-	òî áóäóò ïîêàçàíû âñå êýøèðîâàííûå õîñòû.
-	
-	Ýòó êîìàíäó ìîãóò èñïîëüçîâàòü òîëüêî Àäìèíèñòðàòîðû ñåðâèñîâ.
-
 OPER_HELP_MODLOAD
 	Ñèíòàêñèñ: MODLOAD ÈìÿÔàéëà
 
diff --git a/lang/tr.l b/lang/tr.l
index 676db0e86..d3644287c 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -2299,8 +2299,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ   : %6d kayýt, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Oturumlar  : %6d kayýt, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxyler   : %6d kayit, %5d kB
 OPER_STATS_AKILL_COUNT
 	Þu anki AKILL sayýsý: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2781,42 +2779,6 @@ OPER_USERLIST_END
 	Kullanýcý listesi sonu.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {host | model} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy taramasi devre disi.
-OPER_CACHE_NOT_FOUND
-	%s cache te bulunamadi.
-OPER_CACHE_REMOVED
-	%s cache ten çikarildi.
-OPER_CACHE_HEADER
-	Host                                             Durum
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Liste sonu - %d/%d kayit gösterildi.
-OPER_CACHE_QUEUED
-	Siraya alindi
-OPER_CACHE_PROGRESS
-	Islemde
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	You are now a SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -5662,26 +5624,6 @@ OPER_HELP_USERLIST
 	
 	Servis adminlerinin Kullanýmýyla sýnýrlýdýr.
 
-OPER_HELP_CACHE
-	Kullanimi: CACHE DEL hostadi
-	           CACHE LIST model [QUEUED | ALL]
-	
-	CACHE DEL komutu belirtilen hostadini cache ten siler.
-	sadece hata kontrolü için kullanilir.
-
-	CACHE LIST komutu belirtilen modele uyan tüm proxy leri
-	listeler. Eger QUEUED özelligi belirtilmisse, siradaki veya
-	aktif taramalardaki proxy leri listeler. Eger ALL özelligi
-	belirtilmis ise tüm cache teki hostadlarini listeler.
-	
-	Servis adminlerinin kullanimiyla sinirlidir..
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName