Merge tag '1.14.14' into safari

# Conflicts:
#	.travis.yml
#	README.md
#	dist/README.md
#	src/_locales/fil/messages.json
#	src/about.html

.jshintrc

@@ -4,7 +4,8 @@
 	"eqeqeq": true,
 	"esnext": true,
 	"globals": {
-		"chrome": false,
+		"browser": false,    // global variable in Firefox, Edge
+		"chrome": false,     // global variable in Chromium, Chrome, Opera
 		"Components": false, // global variable in Firefox
 		"safari": false,
 		"self": false,

CONTRIBUTING.md

@@ -1,14 +1,14 @@
 # Submitting issues
 
-Please stop opening invalid issues regarding the "Legacy" label of uBlock Origin on AMO, it's all explained in the [Release notes](https://github.com/gorhill/uBlock/releases).
+From now on, I will be quite less inclined to deal with issues for which little to no investigation to find the **actual cause** of a purported issue was made by the reporter. Positive contributions are those which are reported with efforts to find the actual cause of an issue, or at the very least efforts were made to narrow it as much as possible. This project is a hobby, do not expect "customer support"-style interaction. Requiring people to investigate as much as possible before opening an issue will more than likely avoid burdening the project with [invalid issues](https://github.com/gorhill/uBlock/issues?q=is%3Aissue+is%3Aclosed+label%3Ainvalid) or [issues unrelated](https://github.com/gorhill/uBlock/issues?q=is%3Aissue+is%3Aclosed+label%3Aexternal) to uBO.
 
 For **support/discussions/help**, there is [/r/uBlockOrigin](https://www.reddit.com/r/uBlockOrigin/) on Reddit -- this is where I see the most activity for people helping each other regarding uBlock Origin.
 
 For **filter-related issues**, report on the respective filter list support site, or at [uBlockOrigin/uAssets](https://github.com/uBlockOrigin/uAssets/issues). Use [the logger](https://github.com/gorhill/uBlock/wiki/The-logger) to diagnose/confirm filter-related issues. If something does not work properly with uBO enabled, the **first step** is to rule out filter-related issues.
 
 Ignorance of the above rules is no excuse: **Opening an issue for purpose of support or discussion, or opening a filter-related issue will result in the user being immediately blocked.** Given the [amount of invalid issues being opened](https://github.com/gorhill/uBlock/issues?q=is%3Aissue+label%3Ainvalid+is%3Aclosed), I have no choice but to resort to such a drastic measure. You will still be able to open filter list issues at [uBlockOrigin/uAssets](https://github.com/uBlockOrigin/uAssets/issues).
 
-**The issue tracker is for provable issues only:** You will have to make the case that the issue is really with uBlock Origin and not something else on your side. To make a case means to provide detailed steps so that anybody can reproduce the issue. Be sure to rule out that the issue is not caused by something specific on your side.
+**The issue tracker is for provable issues only:** You will have to make the case that the issue is really with uBlock Origin and not something else on your side. To make a case means to provide detailed steps so that anybody can reproduce the issue. Be sure to rule out that the issue is not caused by something specific on your side. Specifically, _speculated_ performance issues will be marked as invalid and closed if they do not come with **actual profiling data + analysis** supporting the claim.
 
 **Any issue opened without effort to provide the required details for me (or anybody else) to reproduce the problem will be closed as _invalid_.** If you provide more details thereafter for me to reproduce the issue, I will reopen it if I can confirm there is indeed an issue with uBlock Origin. Example of detailed steps:
 

assets/assets.json

@@ -65,6 +65,15 @@
 			"assets/ublock/privacy.txt"
 		]
 	},
+	"ublock-abuse": {
+		"content": "filters",
+		"group": "default",
+		"title": "uBlock filters – Resource abuse",
+		"contentURL": [
+			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt",
+			"assets/ublock/resource-abuse.txt"
+		]
+	},
 	"ublock-unbreak": {
 		"content": "filters",
 		"group": "default",
@@ -74,15 +83,15 @@
 			"assets/ublock/unbreak.txt"
 		]
 	},
-	"abprotector-0": {
+	"aak-continued": {
 		"content": "filters",
 		"group": "ads",
 		"off": true,
-		"title": "uBlock Protector List",
-		"contentURL": "https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt",
-		"supportURL": "https://github.com/jspenguin2017/uBlockProtector/blob/master/CONTRIBUTING.MD",
-		"instructionURL": "https://jspenguin2017.github.io/uBlockProtector/"
-	},
+		"title": "AAK-Cont Filters For uBlock Origin",
+		"contentURL": "https://xuhaiyang1234.gitlab.io/AAK-Cont/dist/aak-cont-list-ubo.txt",
+		"supportURL": "https://gitlab.com/xuhaiyang1234/AAK-Cont/issues",
+		"instructionURL": "https://gitlab.com/xuhaiyang1234/AAK-Cont#installation-instruction"
+		},
 	"awrl-0": {
 		"content": "filters",
 		"group": "ads",
@@ -91,14 +100,14 @@
 		"contentURL": "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
 		"supportURL": "https://forums.lanik.us/"
 	},
-	"reek-0": {
+	"adguard-generic": {
 		"content": "filters",
 		"group": "ads",
 		"off": true,
-		"title": "Anti-Adblock Killer | Reek",
-		"contentURL": "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt",
-		"supportURL": "https://github.com/reek/anti-adblock-killer",
-		"instructionURL": "https://github.com/reek/anti-adblock-killer#instruction"
+		"title": "Adguard Base Filters",
+		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt",
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
+		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#english-filter"
 	},
 	"easylist": {
 		"content": "filters",
@@ -113,13 +122,14 @@
 		],
 		"supportURL": "https://forums.lanik.us/"
 	},
-	"easylist-nocosmetic": {
+	"adguard-spyware": {
 		"content": "filters",
-		"group": "ads",
+		"group": "privacy",
 		"off": true,
-		"title": "EasyList without element hiding rules",
-		"contentURL": "https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt",
-		"supportURL": "https://forums.lanik.us/"
+		"title": "Adguard Spyware Filters",
+		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt",
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
+		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#privacy"
 	},
 	"disconnect-tracking": {
 		"content": "filters",
@@ -177,17 +187,6 @@
 		],
 		"supportURL": "https://www.malwaredomains.com/"
 	},
-	"malware-2": {
-		"content": "filters",
-		"group": "malware",
-		"off": true,
-		"title": "Malware domains (long-lived)",
-		"contentURL": [
-			"https://mirror1.malwaredomains.com/files/immortal_domains.txt",
-			"https://mirror.cedia.org.ec/malwaredomains/immortal_domains.txt"
-		],
-		"supportURL": "https://www.malwaredomains.com/"
-	},
 	"disconnect-malware": {
 		"content": "filters",
 		"group": "malware",
@@ -203,11 +202,20 @@
 		"contentURL": "https://raw.githubusercontent.com/Dawsey21/Lists/master/adblock-list.txt",
 		"supportURL": "http://www.spam404.com/"
 	},
+	"adguard-annoyance": {
+		"content": "filters",
+		"group": "social",
+		"off": true,
+		"title": "Adguard’s Annoyance List",
+		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/14.txt",
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
+		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#annoyances-filter"
+	},
 	"fanboy-thirdparty_social": {
 		"content": "filters",
 		"group": "social",
 		"off": true,
-		"title": "Anti-ThirdpartySocial (see warning inside list)",
+		"title": "Fanboy’s Anti-Thirdparty Social (see warning inside list)",
 		"contentURL": "https://fanboy.co.nz/fanboy-antifacebook.txt",
 		"supportURL": "https://forums.lanik.us/"
 	},
@@ -223,6 +231,14 @@
 		],
 		"supportURL": "https://forums.lanik.us/"
 	},
+	"fanboy-cookiemonster": {
+		"content": "filters",
+		"group": "social",
+		"off": true,
+		"title": "Fanboy’s Cookiemonster List",
+		"contentURL": "https://secure.fanboy.co.nz/fanboy-cookiemonster.txt",
+		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
+	},
 	"fanboy-social": {
 		"content": "filters",
 		"group": "social",
@@ -244,14 +260,6 @@
 		"contentURL": "http://someonewhocares.org/hosts/hosts",
 		"supportURL": "http://someonewhocares.org/hosts/"
 	},
-	"fanboy-ultimate": {
-		"content": "filters",
-		"group": "multipurpose",
-		"off": true,
-		"title": "Fanboy+Easylist-Merged Ultimate List",
-		"contentURL": "https://www.fanboy.co.nz/r/fanboy-ultimate.txt",
-		"supportURL": "https://forums.lanik.us/"
-	},
 	"hphosts": {
 		"content": "filters",
 		"group": "multipurpose",
@@ -316,17 +324,11 @@
 		"content": "filters",
 		"group": "regions",
 		"off": true,
-		"title": "CHN: CJX's EasyList Lite (main focus on Chinese sites)",
+		"title": "CHN: CJX's EasyList Lite",
+		"lang": "zh",
 		"contentURL": "https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt",
-		"supportURL": "https://github.com/cjx82630/cjxlist"
-	},
-	"CHN-2": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "CHN: CJX's Annoyance List",
-		"contentURL": "https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjx-annoyance.txt",
-		"supportURL": "https://github.com/cjx82630/cjxlist"
+		"supportURL": "https://github.com/cjx82630/cjxlist",
+		"instructionURL": "http://abpchina.org/forum/forum.php?mod=viewthread&tid=29667"
 	},
 	"CZE-0": {
 		"content": "filters",
@@ -367,14 +369,6 @@
 		"contentURL": "https://adblock.ee/list.php",
 		"supportURL": "https://adblock.ee/"
 	},
-	"EU-prebake": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "EU: Prebake - Filter Obtrusive Cookie Notices",
-		"contentURL": "https://raw.githubusercontent.com/liamja/Prebake/master/obtrusive.txt",
-		"supportURL": "https://github.com/liamja/Prebake"
-	},
 	"FIN-0": {
 		"content": "filters",
 		"group": "regions",
@@ -465,7 +459,7 @@
 		"off": true,
 		"title": "ITA: ABP X Files",
 		"contentURL": "https://raw.githubusercontent.com/gioxx/xfiles/master/filtri.txt",
-		"supportURL": "http://noads.it/"
+		"supportURL": "https://xfiles.noads.it/"
 	},
 	"JPN-0": {
 		"content": "filters",
@@ -494,14 +488,6 @@
 		"contentURL": "https://raw.githubusercontent.com/yous/YousList/master/youslist.txt",
 		"supportURL": "https://github.com/yous/YousList"
 	},
-	"KOR-2": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "KOR: Fanboy's Korean",
-		"contentURL": "https://www.fanboy.co.nz/fanboy-korean.txt",
-		"supportURL": "https://forums.lanik.us/"
-	},
 	"LTU-0": {
 		"content": "filters",
 		"group": "regions",
@@ -551,26 +537,21 @@
 		"content": "filters",
 		"group": "regions",
 		"off": true,
-		"title": "RUS: RU AdList (Дополнительная региональная подписка)",
+		"title": "RUS: RU AdList",
 		"lang": "be ru uk",
 		"contentURL": "https://easylist-downloads.adblockplus.org/advblock.txt",
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=102"
-	},
-	"RUS-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "RUS: BitBlock List (Дополнительная подписка фильтров)",
-		"contentURL": "https://easylist-downloads.adblockplus.org/bitblock.txt",
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=102"
+		"supportURL": "https://forums.lanik.us/viewforum.php?f=102",
+		"instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512"
 	},
 	"RUS-2": {
 		"content": "filters",
 		"group": "regions",
 		"off": true,
 		"title": "RUS: Adguard Russian Filter",
+		"lang": "be ru uk",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/1.txt",
-		"supportURL": "https://forum.adguard.com/forumdisplay.php?69-%D0%A4%D0%B8%D0%BB%D1%8C%D1%82%D1%80%D1%8B-Adguard"
+		"supportURL": "https://forum.adguard.com/forumdisplay.php?69-%D0%A4%D0%B8%D0%BB%D1%8C%D1%82%D1%80%D1%8B-Adguard",
+		"instructionURL": "https://kb.adguard.com/ru/general/adguard-ad-filters#russian"
 	},
 	"spa-0": {
 		"content": "filters",
@@ -581,6 +562,16 @@
 		"contentURL": "https://easylist-downloads.adblockplus.org/easylistspanish.txt",
 		"supportURL": "https://forums.lanik.us/viewforum.php?f=103"
 	},
+	"spa-1": {
+		"content": "filters",
+		"group": "regions",
+		"off": true,
+		"title": "spa, por: Adguard Spanish/Portuguese",
+		"lang": "es pt",
+		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt",
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
+		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#spanish"
+	},
 	"SVN-0": {
 		"content": "filters",
 		"group": "regions",
@@ -606,15 +597,16 @@
 		"title": "TUR: Adguard Turkish Filter",
 		"lang": "tr",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt",
-		"supportURL": "https://forum.adguard.com/forumdisplay.php?51-Filter-Rules"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
+		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#turkish"
 	},
-	"VIE-0": {
+	"VIE-1": {
 		"content": "filters",
 		"group": "regions",
 		"off": true,
-		"title": "VIE: Fanboy's Vietnamese",
+		"title": "VIE: ABPVN List",
 		"lang": "vi",
-		"contentURL": "https://www.fanboy.co.nz/fanboy-vietnam.txt",
-		"supportURL": "https://forums.lanik.us/"
+		"contentURL": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt",
+		"supportURL": "http://abpvn.com/"
 	}
 }

dist/description/description-fr.txt

@@ -1,14 +1,14 @@
-uBlock₀ est une extension qui bloque les publicités et les pisteurs, légère en empreinte mémoire & en utilisation du processeur, capable pourtant d'utiliser & de traiter des milliers de filtres de plus que la plupart des autres bloqueurs disponibles.
+uBlock₀ est un bloqueur efficace de publicités et de pisteurs; utilisant peu de mémoire vive & de ressources du processeur, il est pourtant capable de charger & d'appliquer des milliers de filtres de plus que d'autres bloqueurs populaires.
 
 Consultez cette page en Anglais pour avoir une vue d'ensemble illustrée de son efficacité : https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 
-Utilisation : Le gros bouton "Power" dans la fenêtre pop-up permet de désactiver/activer en permanence uBlock₀ pour le site Web en cours de consultation. Cela s'applique uniquement au site Web actuel, ce n'est pas un bouton "Power" qui affecte entièrement le fonctionnement de l'extension.
+Utilisation : Le gros bouton "Power" dans la fenêtre pop-up permet de désactiver/activer en permanence uBlock₀ pour le site Web en cours de consultation. Cela s'applique uniquement au site Web actuel, ce n'est pas un bouton "Power" global.
 
 ***
 
-Flexible, uBlock₀ ne prend pas en charge que les filtres de type Adblock, elle peut également lire et créer des filtres depuis des fichiers hosts.
+Flexible, uBlock₀ n'est pas qu'un simple bloqueur de publicités, il peut également lire et créer des filtres depuis des fichiers hosts.
 
-Par défaut, ces listes de filtrage sont chargées et traitées :
+Par défaut, ces listes de filtrage sont chargées et appliquées :
 
 - EasyList (Liste anti-publicités maintenue fréquemment à jour par la communauté)
 - Peter Lowe’s Ad server list (Liste de serveurs publicitaires maintenue à jour par Peter Lowe)
@@ -18,15 +18,15 @@ Par défaut, ces listes de filtrage sont chargées et traitées :
 Davantage de listes sont disponibles si vous souhaitez renforcer le blocage :
 
 - Fanboy’s Enhanced Tracking List (Liste de protection avancée contre le pistage maintenue à jour par Fanboy)
-- Dan Pollock’s hosts file (Fichier Hosts bloquant publicités, domaines malveillants et autres pisteurs, maintenue fréquemment à jour par Dan Pollock)
-- hpHosts’s Ad and tracking servers (Fichier Hosts bloquant des serveurs publicitaires & des serveurs de pistage, maintenue à jour par hpHosts)
+- Dan Pollock’s hosts file (Fichier hosts bloquant publicités, domaines malveillants et autres pisteurs, maintenue fréquemment à jour par Dan Pollock)
+- hpHosts’s Ad and tracking servers (Fichier hosts bloquant des serveurs publicitaires & des serveurs de pistage, maintenue à jour par hpHosts)
 - MVPS HOSTS (Fichier Hosts bloquant publicités, domaines malveillants et autres pisteurs, maintenue à jour par MVPS)
 - Spam404 (Liste de protection contre les spams, maintenue fréquemment à jour par la communauté)
 - Et de nombreuses autres
 
-Bien évidemment, plus vous activez de filtres, plus l'empreinte mémoire augmentera. Pourtant, même après avoir ajouté deux listes supplémentaires crées par Fanboy et le fichier Hosts d'hpHosts, uBlock₀ utilise moins de mémoire vive que tous les autres bloqueurs populaires.
+Bien évidemment, plus vous activez de filtres, plus l'empreinte mémoire augmentera. Pourtant, même après avoir ajouté deux listes supplémentaires crées par Fanboy et le fichier hosts d'hpHosts, uBlock₀ utilise moins de mémoire vive que tous les autres bloqueurs populaires.
 
-Veuillez tout de même prendre en compte que le fait de choisir parmi ces listes supplémentaires peut conduire à quelques incompatibilités sur les sites Web que vous visitez, bien que ces listes soient maintenues à jour par leurs auteurs.
+Veuillez tout de même prendre en compte qu'utiliser certaines listes supplémentaires peut conduire à quelques incompatibilités sur les sites Web que vous visitez - en particulier les fichiers hosts.
 
 ***
 
@@ -35,8 +35,8 @@ Sans les listes prédéfinies de filtres, cette extension (comme d'autres) ne se
 ***
 
 Gratuit.
-Source libre avec une licence publique GPLv3
-Fait par des utilisateurs pour des utilisateurs.
+Source libre sous licence publique GPLv3
+Conçu par des utilisateurs pour des utilisateurs.
 
 Contributeurs sur Github: https://github.com/gorhill/uBlock/graphs/contributors
 Contributeurs sur Crowdin: https://crowdin.net/project/ublock