sync with firefox and cleanup

opera/urlfilter-chn.ini

@@ -182,20 +182,7 @@
 *.zoosnet.*
 */acs86.com/*
 */ad.swf
-*/ad/600-*
-*/ad/content/*
-*/ad2010.*
-*/ad_files/*
-*/ad_news.*
-*/ad_paper_*
-*/ad_show?id*
-*/adcontent.*
-*/adj.php?*
-*/adpic.aspx?*
-*/ADPlay.*
 */adpolestar/*
-*/adservice/*
-*/all_content_ad_*
 */chinaadclient.js
 */chinazhanad/*
 */click_rate.php?*
@@ -203,10 +190,8 @@
 */contads.gif
 */d1.sina.com.cn/*
 */data/ad/*
-*/DisplayAd?*
 */eiv.baidu.com/*
 */get_mood_count.*
-*/GetAdContent.aspx?*
 */GetAdList*
 */GetStats.*
 */guanggao*

opera/urlfilter-esp.ini

@@ -18,7 +18,6 @@
 *.belasmensagens.com.br/posthaus*
 *.bilibio.com.br/fotoBanner/*
 *.blog.br/action/tools/coMesWin*
-*.br/ads/*
 *.br/adx.js
 *.br/afiliados/*
 *.br/banner.aspx?*
@@ -37,7 +36,6 @@
 *.celldorado.com/ads/*
 *.certifica.com/cert/hit.dll?*
 *.chacas.com.ar/comercial/*
-*.cl/ads3/*
 *.cliccabanner.com/*
 *.clickafiliados.*
 *.codigobarras.net/*
@@ -110,7 +108,6 @@
 *.miapuesta.com/s/images/newsletter/eblast/*
 *.miau.pt/platform/banners*
 *.micodigo.com/*
-*.mx/ads/*
 *.ncs.es/banner/*
 *.net-empregos.com/images/Banners/*
 *.net.ar/ads/*
@@ -166,17 +163,12 @@
 */_publicidad/*
 */ad.correioweb.com.br/*
 */ad.jamba.pt/*
-*/ad_lomadee.*
-*/ad_tpl.php?*
-*/adfactor_*
 */ads.adpv.com/*
 */ads.grupozeta.es/*
 */ads.olx.com/*
 */ads.periodistadigital.com/*
 */ads.prisacom.com/*
 */ads.xl.pt/*
-*/ads/contextual*
-*/ads/creatives/*
 */adserver.clix.pt/*
 */adshotbrasil1.*
 */banner300x80.*
@@ -286,7 +278,6 @@ http://maik.ff-bt.net/*
 http://mariosegura.com/images/banners/*
 http://mariosegura.com/multimedia/especiales/*
 http://network.actualtrade.eu/*
-http://nflads.*
 http://noticias.sapo.pt/hit.*
 http://parceria.americanas.*
 http://pmssrv.mercadolibre.com.ve/jm/*

opera/urlfilter-jpn.ini

@@ -48,7 +48,6 @@
 *.japanmetrix.jp/*
 *.joins.com/upload/ad/*
 *.jp/ad.js
-*.jp/ad?cid*
 *.jp/adsv/*
 *.jp/affiliate/*
 *.jp/analyze/*
@@ -109,18 +108,8 @@
 */18ban.jp/ad/*
 */ad.adlantis.jp/*
 */ad.duga.jp/*
-*/ad_bomb/*
-*/ad_parts.*
-*/ad_timer.js
-*/adcast01_*
-*/adContents_*
-*/adgetter.*
-*/AdLantis*
-*/adparts/*
 */ads/techcrunchjapan_*
-*/adSidebar.*
 */adtilecookie.*
-*/advalue_*
 */an.mainichi.jp/*
 */analysis/AccessLog?*
 */analysis1.*
@@ -146,9 +135,7 @@
 */jpn_gtracking.js
 */js/ysad*
 */json/count?*
-*/mini_ads.php?*
 */page_beacon.gif?*
-*/parts/ad/*
 */popIn.js
 */popjs.*
 */ppd.rikitake.com/images/*
@@ -159,7 +146,6 @@
 */seoparts.com/*
 */siofuki.com/new/images/top/top_*
 */tamakuri80x35.jpg
-*/TextAD1.aspx
 */top/head_bnr*
 */top/head_s_bnr*
 */www.siofuki.com/new/images/banner/*

opera/urlfilter-rus.ini

@@ -331,16 +331,11 @@
 *.zorkabiz.ru/*
 */1tizer_*
 */ad2-packet/*
-*/adcheck.*
-*/adfile.ashx?*
-*/adfox.*
 */adriver.*
 */adriver_*
 */adrivercore2.*
-*/adsshow/*
 */adt.fcgi?*
 */adv.fcgi?*
-*/adwolf.*
 */ban-man/*
 */banner_zone/*
 */banners.html?*
@@ -350,12 +345,10 @@
 */bfile_swf_*
 */bodyclick.*
 */counter.lt?*
-*/digest/ads.*
 */esel_b.swf?*
 */esel_s.swf?*
 */get_tizer.*
 */ifolder-ads.*
-*/iframe/?adfox_*
 */image.fcgi?*
 */images/reklama*
 */img/rekl/*
@@ -370,9 +363,7 @@
 */reklama/*
 */reklama240_*
 */reklama_*
-*/richmedia.*
 */rotobanner.*
-*/show.ad?*
 */show_adv.*
 */swf/banners/*
 */teaser.*

opera/urlfilter-swe.ini

@@ -16,8 +16,6 @@
 *.se/annons/*
 *.svd.se/traffic/*
 *.tradera.com/search/google.aspx*
-*/ad_box.cgi?*
-*/ad_box?*
 */ads/bilar/*
 */advertisementMapping.*
 */annons.aspx?*

opera/urlfilter.ini

@@ -1,6 +1,6 @@
 # Fanboy's Adblock list (Opera)
-# Checksum: Kzy39fhDF7DLz45POtQt9w
-# Updated: 3 Jul 2011
+# Checksum: BRYPUOee9Xeosi++3MAkwA
+# Updated: 4 Jul 2011
 # License: http://creativecommons.org/licenses/by/3.0/
 # Email: fanboyadblock@googlegroups.com Project homepage: http://fanboy.co.nz/
 #
@@ -20,6 +20,46 @@ prioritize excludelist=1
 *&ad_type*
 *&adCode=*
 *&adType=*
+*.br/ads/*
+*.cl/ads3/*
+*.mx/ads/*
+*.net.ar/ads/*
+*/ad_lomadee.*
+*/ad_tpl.*
+*/adfactor_*
+*/ads/contextual*
+*/ads/creatives/*
+*/nflads.*
+*/ad-ina.*
+*/adsenze.*
+*/adsetup.*
+*/ad?cid*
+*/ad_bomb/*
+*/ad_parts.*
+*/ad_timer.*
+*/adcast01_*
+*/adcheck.*
+*/adfile.*
+*/adfox.*
+*/adsshow/*
+*/adwolf.*
+*/digest/ads.*
+*/show.ad?*
+*/ifolder-ads.*
+*/richmedia.*
+*/?adfox_*
+*/ad_box.*
+*/ad_box?*
+*/adContents_*
+*/adgetter.*
+*/AdLantis.*
+*/AdLantisLoader.*
+*/adparts/*
+*/adSidebar.*
+*/advalue_*
+*/mini_ads.*
+*/TextAD1.*
+*/parts/ad/*
 *&Advert_Id*
 *&clickTag=http*
 *-120_600_*
@@ -60,7 +100,6 @@ prioritize excludelist=1
 *-advert.swf*
 *-advertise01.*
 *-advertisement.*
-*-advertisment-*
 *-advertisment-bottom.*
 *-advertisment-top.*
 *-affiliates/img_*
@@ -171,7 +210,6 @@ prioritize excludelist=1
 *.adknowledge.com/*
 *.adland.ru/*
 *.adlandpro.*
-*.adlegend.*
 *.adlegend.com/*
 *.adlink.net/*
 *.adman.gr/*
@@ -291,7 +329,6 @@ prioritize excludelist=1
 *.advertstream.com/*
 *.advfn.com/tf_*
 *.advg.jp/*
-*.advg.jp/*
 *.adviva.net/*
 *.advmania.com/*
 *.advolution.*
@@ -328,7 +365,6 @@ prioritize excludelist=1
 *.alimama.*
 *.all4ad.net/*
 *.alleliteads.com/*
-*.allosponsor.*
 *.allosponsor.com/*
 *.allotraffic.*
 *.allotraffic.com/*
@@ -368,7 +404,6 @@ prioritize excludelist=1
 *.at.atwola.com/*
 *.atmalinks.com/*
 *.atrinsic.com/*
-*.atwola.com/addyn/*
 *.atwola.com/html/*
 *.atwola.com/image/*
 *.atwola.com/promoimp/*
@@ -460,7 +495,6 @@ prioritize excludelist=1
 *.burstnet.akadns.net/gifs/*
 *.businessclick.*
 *.buxflow.com/*
-*.buysellads.*
 *.buzznet.com/topscript.js.php?*
 *.c-on-text.com/*
 *.c8.net.ua/*
@@ -563,7 +597,6 @@ prioritize excludelist=1
 *.com/adx/*
 *.com/adz/*
 *.com/Banners/*
-*.com/banners/*
 *.com/carbonads/*
 *.com/doubleclick/*
 *.com/exit.js
@@ -617,7 +650,6 @@ prioritize excludelist=1
 *.cz/affil/*
 *.dailymotion.com/masscast/*
 *.danzabucks.com/banners/*
-*.danzabucks.com/banners/*
 *.dashboardad.net/*
 *.datepersonalsfree.com/images/banner*
 *.dating-adv.com/*
@@ -754,7 +786,6 @@ prioritize excludelist=1
 *.freebunker.com/includes/js/layer.js
 *.freebunker.com/includes/js/pop.js
 *.freelancer.com/img/affiliates/*
-*.freeones.com/assets/ads/*
 *.freepaidsurveyz.*
 *.frostytech.com/banners/*
 *.ft.com/regb/iab?*
@@ -780,7 +811,6 @@ prioritize excludelist=1
 *.gaytube.com/chacha/*
 *.geoaddicted.net/*
 *.gestionpub.*
-*.getiton.com/*
 *.getprice.com.au/searchwidget.*
 *.getvids.de/ad*
 *.ggwcash.*
@@ -875,7 +905,6 @@ prioritize excludelist=1
 *.infra-ad.com/*
 *.innity.com/*
 *.inquirer.net/images/txt_adv.*
-*.inquirer.net/images/txt_adv.gif
 *.insidehw.com/images/banners/*
 *.insightexpress.*
 *.insites.eu/*
@@ -936,7 +965,6 @@ prioritize excludelist=1
 *.latinteencash.com/potd/*
 *.laxtime.com/rotation/*
 *.layerwelt.com/*
-*.lazygirls.info/ad_*
 *.lazygirls.info/click.*
 *.lazyload-ad-*
 *.lbs.km.ru/*
@@ -1377,7 +1405,6 @@ prioritize excludelist=1
 *.swf?BannerId*
 *.swf?iurl*
 *.swf?link*
-*.swf?link1*
 *.swiftco.net/banner/*
 *.sxc.hu/img/banner*
 *.symbiosting.com/LogicBuy/*
@@ -1444,7 +1471,6 @@ prioritize excludelist=1
 *.trafficjunky.net/*
 *.trafficmp.*
 *.trafficrevenue.net/*
-*.trafficsynergy.*
 *.trafficsynergy.com/*
 *.traffictrader.*
 *.trafogon.net/show.php?*
@@ -1552,7 +1578,6 @@ prioritize excludelist=1
 *.yieldads.com/*
 *.yieldbuild.com/*
 *.yieldmanager.*
-*.yieldmanager.edgesuite.net/*
 *.yieldoptimizer.*
 *.yimg.com/ao/adv/*
 *.yimg.jp/bdv/*
@@ -1906,8 +1931,6 @@ prioritize excludelist=1
 */adiframe.*
 */adiframe/*
 */adify_*
-*/adify_box.*
-*/adify_sky.*
 */AdifyAd.*
 */AdifyIDs.*
 */adifyOverlay.*
@@ -1951,7 +1974,9 @@ prioritize excludelist=1
 */admentor/*
 */admigo.ru/*
 */admin/ad_*
-*/admob.js
+*/admob.*
+*/ads_manager.*
+*/left_ads.*
 */admonitor.*
 */adn.ebay.com/*
 */adnetmedia.*
@@ -2044,7 +2069,6 @@ prioritize excludelist=1
 */ads/js/*
 */ads/js_*
 */ads/leaderboard*
-*/ads/leaderboard-*
 */ads/load.*
 */ads/menu_*
 */ads/msnpopup*
@@ -2108,9 +2132,8 @@ prioritize excludelist=1
 */adsbanner.*
 */adsbanner/*
 */adsBannerJS.*
-*/adscript.php?*
+*/adscript.*
 */adscript_*
-*/adscript_*.js
 */adscripts/*
 */adScroll.*
 */adsdaq_*
@@ -2338,7 +2361,6 @@ prioritize excludelist=1
 */BanMan/*
 */banman/*
 */banner-ad*
-*/banner-ad/*
 */banner.asp?*
 */banner.ca?*
 */banner.content.*
@@ -2383,7 +2405,6 @@ prioritize excludelist=1
 */banners/ffadult/*
 */banners/publica*
 */banners/usenext*
-*/bannerserv*
 */bannerserve/*
 */BannerServer*
 */bannerview.php?*
@@ -2419,6 +2440,38 @@ prioritize excludelist=1
 */bnrsrv.ashx?*
 */body_background_ad/*
 */bodyads/*
+*/peel_ads/*
+*/photoad.*
+*/PhotoGallaryAds.*
+*/user_ads/*
+*/ad/600-*
+*/ad/content/*
+*/ad2010.*
+*/ad2con.*
+*/ad2gate.*
+*/ad2gather.*
+*/ad2push.*
+*/ad_files/*
+*/ad_news.*
+*/ad_paper_*
+*/ad_show?*
+*/adphoto.*
+*/adpic.*
+*/adping.*
+*/ADPlay.*
+*/adpolestar/*
+*/adservice/*
+*/adsfile.*
+*/adtaobao.*
+*/all_content_ad_*
+*/blogad.*
+*/blogad02.*
+*/DisplayAd?*
+*/GetAdContent.*
+*/contads.*
+*_right_ads_*
+*_sidebar_ad.*
+*/sliderad3.*
 */boksy.onet.pl/*
 */borax.geo-idm.fr/*
 */bottom-ads.*
@@ -2862,7 +2915,6 @@ prioritize excludelist=1
 */inquirer/ads/*
 */insertAds.*
 */intellitext.*
-*/interia.nuggad.net/*
 */InTextAds.*
 */iplgadshow*
 */iserver/site*
@@ -3021,8 +3073,6 @@ prioritize excludelist=1
 */oascentral/*
 */OASController.*
 */OasDefault/*
-*/oasisi-*.php?*
-*/oasisi-i.php?*
 */oasisi.php?*
 */OasisWebsite/tenwidget/*
 */obeus.com/*
@@ -3567,7 +3617,6 @@ prioritize excludelist=1
 *_adlog.asp?*
 *_AdObjects.*
 *_adRight.*
-*_ads.js
 *_ads/iframe.*
 *_Ads/InHouse*
 *_ads1.asp*
@@ -3672,8 +3721,6 @@ prioritize excludelist=1
 *dbbsrv.com/*
 *dhtmlpop*
 *facebook.com/beacon/*
-*forex-affiliate.*
-*house_ad*
 *images/ads/*
 *innerads*
 *left-ads*
@@ -3683,11 +3730,9 @@ prioritize excludelist=1
 *outster.com/*
 *paypopup*
 *peel/peel*
-*pop_under*
 *popdowncash.*
 *popinads*
 *Popunder*
-*popunder*
 *porn-hitz.com/*
 *pornkings.com/*
 *private.camz.*
@@ -3808,7 +3853,6 @@ http://adcontent.*
 http://addirector.vindicosuite.com/*
 http://adedy.com/*
 http://adf.ly/networks/*
-http://adfile.*
 http://adi.*
 http://adimg.*
 http://adindigo.com/*
@@ -3838,10 +3882,8 @@ http://ads.adone.pl/*
 http://ads.adonion.com/*
 http://ads.adshopping.com/*
 http://ads.advanceweb.com/*
-http://ads.allotraffic.com/*
 http://ads.amateurmatch.com/*
 http://ads.aol.co.uk/*
-http://ads.asp.net/*
 http://ads.autotrader.com/*
 http://ads.avitu.com.s3.amazonaws.com/*
 http://ads.blogherads.*
@@ -3850,10 +3892,8 @@ http://ads.boksy.*
 http://ads.brainient.com/*
 http://ads.brazzers.com/*
 http://ads.buzzcity.net/*
-http://ads.buzzcity.net/*
 http://ads.clicmanager.fr/*
 http://ads.com.com/*
-http://ads.contentabc.com*
 http://ads.contentabc.com/*
 http://ads.dailystar.com*
 http://ads.digitalpoint.com/*
@@ -3881,7 +3921,6 @@ http://ads.jetpackdigital.com/*
 http://ads.jubmedia.com/*
 http://ads.kaktuz.net/*
 http://ads.kicker.de/*
-http://ads.lfstmedia.com/*
 http://ads.livesexsells.com/*
 http://ads.loombo.com/*
 http://ads.lucidmedia.com/*
@@ -3955,7 +3994,6 @@ http://adscendmedia.com/*
 http://adscontent*
 http://adsdot.ph/*
 http://adse-2.liverail.com/*
-http://adsearch.*
 http://adserv*
 http://adsfac.net/*
 http://adsfac.us/*
@@ -4032,7 +4070,6 @@ http://banners.itweb.co.za/*
 http://banners.ixitools.*
 http://banners.partypartners.com/*
 http://banners.passion.com/*
-http://banners.passion.com/piclist?*
 http://banners.passiondollars.*
 http://banners.payserve.*
 http://banners.penthouse.com/*
@@ -4045,7 +4082,6 @@ http://banners.voyeurweb.com/*
 http://banners.webcams.com/*
 http://banners.webmasterplan.*
 http://banners3.*
-http://banners3.spacash.com/*
 http://bans.bride.*
 http://bbp.brazzers.com/*
 http://bc.coupons.com/*
@@ -4211,9 +4247,6 @@ http://newt1.adultadworld.*
 http://npvos.com/images/*
 http://ns4w.org/gsm.js
 http://oas.*
-http://oascentral.chron.com/*
-http://oascentral.hosted.ap.*
-http://oascentral.newsmax.*
 http://oasis.*
 http://odnidoma.com/ban/*
 http://offers-service.cbsinteractive.com/*
@@ -4960,7 +4993,6 @@ http://plug.plugerr.com/*
 *sexsearch.com/*
 *sextracker.*
 http://acces.direction-x.com*
-http://acces.direction-x.com/*
 http://ads.realslutparty.com/*
 http://cache.daredorm.com/zexit/*
 http://click2jump.com/*
@@ -4969,7 +5001,6 @@ http://imagearn.com/img/picBanner.swf
 http://imagearn.com/vibrate.js
 http://kinopokaz.org/*
 http://matrimoniale3x.ro/remote_*
-http://oas.autotrader.co.uk/*
 http://promos.meetlocals.com/*
 http://s.xvideos.com/*
 http://securitymattersmag.com/Scripts/popup.js
@@ -5000,11 +5031,11 @@ http://sweetstudents.com/pop_*
 */AdWorks/*.js
 */anzeige_*.gif
 */getSponsLinks*.js
-*/pagead/ads?client*&ad_type*
 */reklama/*.gif
 */reklame/*.gif
 */reklame/*.jpg
 */servlet/ajrotator*/vh?z*
+*/oasisi-*.php?*
 http://a.*/ADS*
 http://a.giantrealm.com/*.js
 http://ads.hulu.com/published/*.jpg