Issue 2668 - Use new subscription types in options page

subscriptions.xml

 <?xml version="1.0"?>
 
 <!--
   - This file is part of the Adblock Plus web scripts,
   - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
   - published by the Free Software Foundation.
   -
   - Adblock Plus is distributed in the hope that it will be useful,
   - but WITHOUT ANY WARRANTY; without even the implied warranty of
   - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   - GNU General Public License for more details.
   -
   - You should have received a copy of the GNU General Public License
   - along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <subscriptions>
   <subscription title="EasyList"
                 specialization="English"
                 url="https://easylist-downloads.adblockplus.org/easylist.txt"
                 homepage="https://easylist.adblockplus.org/"
                 prefixes="en"
-                author="fanboy, MonztA, Famlam, Khrin"/>
+                author="fanboy, MonztA, Famlam, Khrin"
+                type="ads"/>
   <subscription title="ABPindo+EasyList"
                 specialization="Bahasa Indonesia"
                 url="https://easylist-downloads.adblockplus.org/abpindo+easylist.txt"
                 homepage="http://abpindo.blogspot.com/"
                 prefixes="id"
-                author="heradhis"/>
+                author="heradhis"
+                type="ads"/>
   <subscription title="Bulgarian list+EasyList"
                 specialization="български"
                 url="https://easylist-downloads.adblockplus.org/bulgarian_list+easylist.txt"
                 homepage="http://stanev.org/abp/"
                 prefixes="bg"
-                author="Александър Станев"/>
+                author="Александър Станев"
+                type="ads"/>
   <subscription title="EasyList China+EasyList"
                 specialization="中文"
                 url="https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt"
                 homepage="http://abpchina.org/forum/"
                 prefixes="zh"
-                author="John, Li, Jiefei"/>
+                author="John, Li"
+                type="ads"/>
   <subscription title="EasyList Czech and Slovak+EasyList"
                 specialization="čeština, slovenčina"
                 url="https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt"
                 homepage="http://adblock.sk/"
                 prefixes="cs,sk"
-                author="tomasko126"/>
+                author="tomasko126"
+                type="ads"/>
   <subscription title="EasyList Dutch+EasyList"
                 specialization="Nederlands"
                 url="https://easylist-downloads.adblockplus.org/easylistdutch+easylist.txt"
                 homepage="https://easylist.adblockplus.org/"
                 prefixes="nl"
-                author="Famlam"/>
+                author="Famlam"
+                type="ads"/>
   <subscription title="EasyList Germany+EasyList"
                 specialization="Deutsch"
                 url="https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt"
                 homepage="https://easylist.adblockplus.org/"
                 prefixes="de"
-                author="MonztA, Famlam"/>
+                author="MonztA, Famlam"
+                type="ads"/>
   <subscription title="EasyList Hebrew+EasyList"
                 specialization="עברית"
                 url="https://easylist-downloads.adblockplus.org/israellist+easylist.txt"
                 homepage="https://github.com/AdBlockPlusIsrael/EasyListHebrew"
                 prefixes="he"
-                author="BsT"/>
+                author="BsT"
+                type="ads"/>
   <subscription title="EasyList Italy+EasyList"
                 specialization="italiano"
                 url="https://easylist-downloads.adblockplus.org/easylistitaly+easylist.txt"
                 homepage="https://easylist.adblockplus.org/"
                 prefixes="it"
-                author="Khrin"/>
+                author="Khrin"
+                type="ads"/>
   <subscription title="EasyList Lithuania+EasyList"
                 specialization="lietuvių kalba"
                 url="https://easylist-downloads.adblockplus.org/easylistlithuania+easylist.txt"
                 homepage="http://margevicius.lt/"
                 prefixes="lt"
-                author="Algimantas Margevičius"/>
+                author="Algimantas Margevičius"
+                type="ads"/>
   <subscription title="Latvian List+EasyList"
                 specialization="latviešu valoda"
                 url="https://easylist-downloads.adblockplus.org/latvianlist+easylist.txt"
-                homepage="http://latvian-list.site11.com/"
+                homepage="https://notabug.org/latvian-list/adblock-latvian"
                 prefixes="lv"
-                author="anonymous74100"/>
+                author="anonymous74100"
+                type="ads"/>
   <subscription title="Liste AR+Liste FR+EasyList"
                 specialization="العربية"
                 url="https://easylist-downloads.adblockplus.org/liste_ar+liste_fr+easylist.txt"
                 homepage="https://code.google.com/p/liste-ar-adblock/"
                 prefixes="ar"
-                author="smed79"/>
+                author="smed79"
+                type="ads"/>
   <subscription title="Liste FR+EasyList"
                 specialization="français"
                 url="https://easylist-downloads.adblockplus.org/liste_fr+easylist.txt"
                 homepage="http://adblock-listefr.com/"
                 prefixes="fr"
-                author="Lian, Crits, smed79"/>
+                author="Lian, Crits, smed79"
+                type="ads"/>
   <subscription title="ROList+EasyList"
                 specialization="românesc"
                 url="https://easylist-downloads.adblockplus.org/rolist+easylist.txt"
                 homepage="http://www.zoso.ro/rolist"
                 prefixes="ro"
-                author="MenetZ, Zoso"/>
+                author="MenetZ, Zoso"
+                type="ads"/>
   <subscription title="RuAdList+EasyList"
                 specialization="русский, українська"
                 url="https://easylist-downloads.adblockplus.org/ruadlist+easylist.txt"
-                homepage="https://code.google.com/p/ruadlist/"
+                homepage="https://forums.lanik.us/viewforum.php?f=102"
                 prefixes="ru,uk"
-                author="Lain_13"/>
-  <subscription title="EasyPrivacy"
-                specialization="Disable Tracking"
-                url="https://easylist-downloads.adblockplus.org/easyprivacy.txt"
-                homepage="https://easylist.adblockplus.org/"/>
-  <subscription title="malware"
-                specialization="Disable Malware Websites"
+                author="Lain_13"
+                type="ads"/>
+  <subscription title="Adblock Warning Removal List"
+                specialization="removes anti-adblock warnings and other obtrusive messages"
+                url="https://easylist-downloads.adblockplus.org/antiadblockfilters.txt"
+                homepage="https://easylist.adblockplus.org/"
+                author="authors of recommended filter lists"
+                type="anti-adblock"/>
+  <subscription title="Malware Domains"
+                specialization="malware protection"
                 url="https://easylist-downloads.adblockplus.org/malwaredomains_full.txt"
-                homepage="http://malwaredomains.com/?page_id=2"/>
-  <subscription title="fanboy"
-                specialization="Disable Social media buttons"
+                homepage="http://malwaredomains.com/"
+                author="None"
+                type="malware"/>
+  <subscription title="EasyPrivacy+EasyList"
+                specialization="privacy protection"
+                url="https://easylist-downloads.adblockplus.org/easyprivacy+easylist.txt"
+                homepage="https://easylist.adblockplus.org/"
+                author="fanboy, MonztA, Famlam, Khrin"
+                type="privacy"/>
+  <subscription title="Fanboy&#39;s Social Blocking List"
+                specialization="removes social media integration"
                 url="https://easylist-downloads.adblockplus.org/fanboy-social.txt"
-                homepage="https://easylist.adblockplus.org/"/>

[saroyanm, 2015/11/10 16:47:25]

What is the reason of removing this subscriptions ? Couldn't find reference in
the ticket. Also noticed some URLs are updated I assume it's intentional.

[Thomas Greiner, 2015/11/10 19:54:09]

This subscription is still in there.
It's a rebased version of subscriptions.xml as we're currently shipping it with
the extension (that's why some URLs are different, etc.) but with the addition
of one subscription for each of the new subscription type.

-  <subscription title="facebook annoyances blocker"
-                specialization="Facebook annoyance"
-                url="https://easylist-downloads.adblockplus.org/fb_annoyances_full.txt"
-                homepage="http://facebook.adblockplus.me/"/>
-  <subscription title="Pure Video Experience"
-                specialization="Youtube annoyance"
-                url="https://easylist-downloads.adblockplus.org/yt_annoyances_full.txt"
-                homepage="http://youtube.adblockplus.me/"/>
-  <subscription title="Prebake - Filter Obtrusive Cookie Notices"
-                specialization="Prebake"
-                url="https://raw.githubusercontent.com/liamja/Prebake/master/obtrusive.txt"
-                homepage="http://liamja.github.io/Prebake/"/>
-  <subscription title="Spam404"
-                specialization="Spam404"
-                url="https://spam404bl.com/spam404scamlist.txt"
-                homepage="http://www.spam404.com/"/>
-</subscriptions>
+                homepage="https://easylist.adblockplus.org/"
+                author="fanboy, Famlam, MonztA"
+                type="social"/>
+  </subscriptions>