Merge pull request #559 from DandelionSprout/patch-40

Wednesday afternoon pull

data/FilterList.json

@@ -575,11 +575,13 @@
   {
     "id": 53,
     "description": "Blocks Japanese regional mobile advertisements and trackers.",
-    "homeUrl": "https://gmbk0.tumblr.com/",
-    "licenseId": 5,
-    "name": "gmbk0's AdAway Hosts for Android",
+    "discontinuedDate": "2014-05-07T15:14:00",
+    "homeUrl": "http://gmbk0.tumblr.com/",
+    "licenseId": 20,
+    "name": "gmbkslist (Hosts)",
     "syntaxId": 1,
-    "viewUrl": "https://gmbksfilters.googlecode.com/hg/hosts_adonly.txt"
+    "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/gmbkslist%20(Hosts).txt",
+    "viewUrl": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/gmbkslist%20(Hosts).txt"
   },
   {
     "id": 54,
@@ -8505,5 +8507,51 @@
     "name": "1Hosts Mini (Domains)",
     "syntaxId": 2,
     "viewUrl": "https://1hosts.cf/mini/list.txt"
+  },
+  {
+    "id": 813,
+    "description": "I use an ad blocker not because I hate ads, but because it makes the Internet so much more safe and less annoying. Most advertising is horrible and annoying, but there are exceptions. However, ad blocking lists like EasyList are dedicated to blocking all ads. The only maintained \"Acceptable Ads\" list is by Eyeo, Inc., which basically takes bribes to whitelist ads. I wanted to start an Acceptable Ads list that was of the people, by the people and for the people.",
+    "descriptionSourceUrl": "https://github.com/jwinnie/acceptable-ads#acceptable-ads",
+    "homeUrl": "https://github.com/jwinnie/acceptable-ads",
+    "issuesUrl": "https://github.com/jwinnie/acceptable-ads/issues",
+    "licenseId": 4,
+    "name": "jwinnie Acceptable Ads",
+    "syntaxId": 3,
+    "viewUrl": "https://raw.githubusercontent.com/jwinnie/acceptable-ads/master/filters.txt"
+  },
+  {
+    "id": 814,
+    "description": "Blocks Japanese regional mobile advertisements and trackers.",
+    "discontinuedDate": "2014-05-07T15:14:00",
+    "homeUrl": "http://gmbk0.tumblr.com/",
+    "licenseId": 20,
+    "name": "gmbkslist (ABP)",
+    "syntaxId": 3,
+    "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/gmbkslist.txt",
+    "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/gmbkslist.txt"
+  },
+  {
+    "id": 815,
+    "discontinuedDate": "2012-09-16T00:00:00",
+    "homeUrl": "https://code.google.com/archive/p/adblocking-openfilter-jp/",
+    "licenseId": 5,
+    "name": "Adblocking Open Filter JP",
+    "syntaxId": 3,
+    "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Adblocking%20Open%20Filter%20JP",
+    "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Adblocking%20Open%20Filter%20JP"
+  },
+  {
+    "id": 816,
+    "description": "Do you already have a favourite browser? Are you tired of seeing \"Try out [some browser] now!\" on some websites? Then this is a list is for you!",
+    "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt",
+    "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
+    "emailAddress": "imreeil42@gmail.com",
+    "homeUrl": "https://github.com/DandelionSprout/adfilt",
+    "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
+    "licenseId": 10,
+    "name": "I Don't Want to Download Your Browser",
+    "syntaxId": 4,
+    "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt",
+    "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt"
   }
 ]

data/FilterListLanguage.json

@@ -1082,5 +1082,17 @@
   {
     "filterListId": 809,
     "languageId": 108
+  },
+  {
+    "filterListId": 814,
+    "languageId": 141
+  },
+  {
+    "filterListId": 815,
+    "languageId": 110
+  },
+  {
+    "filterListId": 815,
+    "languageId": 141
   }
 ]

data/FilterListMaintainer.json

@@ -1778,5 +1778,81 @@
 {
   "filterListId": 805,
   "maintainerId": 92
+},
+{
+  "filterListId": 816,
+  "maintainerId": 22
+},
+{
+  "filterListId": 214,
+  "maintainerId": 7
+},
+{
+  "filterListId": 797,
+  "maintainerId": 7
+},
+{
+  "filterListId": 202,
+  "maintainerId": 95
+},
+{
+  "filterListId": 203,
+  "maintainerId": 95
+},
+{
+  "filterListId": 204,
+  "maintainerId": 95
+},
+{
+  "filterListId": 205,
+  "maintainerId": 95
+},
+{
+  "filterListId": 227,
+  "maintainerId": 6
+},
+{
+  "filterListId": 506,
+  "maintainerId": 6
+},
+{
+  "filterListId": 620,
+  "maintainerId": 61
+},
+{
+  "filterListId": 621,
+  "maintainerId": 61
+},
+{
+  "filterListId": 622,
+  "maintainerId": 61
+},
+{
+  "filterListId": 623,
+  "maintainerId": 61
+},
+{
+  "filterListId": 624,
+  "maintainerId": 61
+},
+{
+  "filterListId": 21,
+  "maintainerId": 23
+},
+{
+  "filterListId": 22,
+  "maintainerId": 23
+},
+{
+  "filterListId": 120,
+  "maintainerId": 23
+},
+{
+  "filterListId": 81,
+  "maintainerId": 85
+},
+{
+  "filterListId": 686,
+  "maintainerId": 82
 }
 ]

data/FilterListTag.json

@@ -3774,5 +3774,25 @@
     {
      "filterListId": 812,
      "tagId": 6
+    },
+    {
+     "filterListId": 813,
+     "tagId": 10
+    },
+    {
+     "filterListId": 814,
+     "tagId": 2
+    },
+    {
+     "filterListId": 815,
+     "tagId": 2
+    },
+    {
+     "filterListId": 815,
+     "tagId": 9
+    },
+    {
+     "filterListId": 816,
+     "tagId": 15
     }
   ]

data/Maintainer.json

@@ -491,5 +491,9 @@
   {
     "id": 94,
     "name": "yourduskquibbles"
+  },
+  {
+    "id": 95,
+    "name": "k2japan"
   }
 ]