Merge tag '1.15.4' into safari

# Conflicts: # platform/chromium/manifest.json
el1t · Feb 19, 2018 · c2330cc · c2330cc
2 parents f24f959 + 43eab7a
commit c2330cc
Show file tree

Hide file tree

Showing 26 changed files with 970 additions and 157 deletions.
diff --git a/assets/assets.json b/assets/assets.json
@@ -424,7 +424,7 @@
 		"off": true,
 		"title": "IRN: Adblock-Iran",
 		"lang": "fa",
-		"contentURL": "https://raw.githubusercontent.com/farrokhi/adblock-iran/master/filter.txt",
+		"contentURL": "https://cdn.rawgit.com/farrokhi/adblock-iran/master/filter.txt",
 		"supportURL": "https://github.com/farrokhi/adblock-iran"
 	},
 	"ISL-0": {

diff --git a/dist/description/description-fa.txt b/dist/description/description-fa.txt
@@ -2,11 +2,11 @@
 
 بررسی تصویری از کارایی این محصول: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 
-کاربرد: دکمه ی پاور بزرگ در پنجره برای فعال یا غیر فعال کردن uBlock برای صفحه ی جاری است. فقط برای همین سایت اعمال میشود، دکمه ی پاوری برای تمام سایت ها نیست.
+روش استفاده: دکمۀ قدرت بزرگ در پنجرۀ بالاپَر برای فعال یا غیرفعال کردن دائمی یوبلاک برای وب‌سایت فعلی می‌باشد. این فقط برای همین سایت اعمال میشود، این دکمه ی قدرتی برای تمام سایت ها نیست.
 
 ***
 
-انعطاف پذیری آن بیشتر از "ad blocker" است: همچنین می تواند فیلتر ها را از هاست میزبان، بخواند و بسازد.
+انعطاف پذیری آن بیشتر از "ad blocker" است: این یکی همچنین می تواند فیلتر‌هایی را از فایل‌های هاست‌های میزبان، خوانده و بسازد.
 
 بیرون از جعبه، این لیست فیلترها بارگذاری و اجرا میشوند:
 

diff --git a/dist/description/description-kk.txt b/dist/description/description-kk.txt
@@ -0,0 +1,49 @@
+An efficient blocker: easy on memory and CPU footprint, and yet can load and enforce thousands more filters than other popular blockers out there.
+
+Illustrated overview of its efficiency: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
+
+Usage: The big power button in the popup is to permanently disable/enable uBlock for the current web site. It applies to the current web site only, it is not a global power button.
+
+***
+
+Flexible, it's more than an "ad blocker": it can also read and create filters from hosts files.
+
+Out of the box, these lists of filters are loaded and enforced:
+
+- EasyList
+- Peter Lowe’s Ad server list
+- EasyPrivacy
+- Malware domains
+
+More lists are available for you to select if you wish:
+
+- Fanboy’s Enhanced Tracking List
+- Dan Pollock’s hosts file
+- hpHosts’s Ad and tracking servers
+- MVPS HOSTS
+- Spam404
+- And many others
+
+Of course, the more filters enabled, the higher the memory footprint. Yet, even after adding Fanboy's two extra lists, hpHosts’s Ad and tracking servers, uBlock still has a lower memory footprint than other very popular blockers out there.
+
+Also, be aware that selecting some of these extra lists may lead to higher likelihood of web site breakage -- especially those lists which are normally used as hosts file.
+
+***
+
+Without the preset lists of filters, this extension is nothing. So if ever you really do want to contribute something, think about the people working hard to maintain the filter lists you are using, which were made available to use by all for free.
+
+***
+
+Еркін.
+Open source with public license (GPLv3)
+For users by users.
+
+Contributors @ Github: https://github.com/gorhill/uBlock/graphs/contributors
+Contributors @ Crowdin: https://crowdin.net/project/ublock
+
+***
+
+It's quite an early version, keep this in mind when you review.
+
+Project change log:
+https://github.com/gorhill/uBlock/releases
diff --git a/dist/description/description-no.txt → dist/description/description-nb.txt b/dist/description/description-no.txt → dist/description/description-nb.txt
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.14.24",
+    "version": "1.15.4",
 
     "commands": {
         "launch-element-zapper": {

diff --git a/platform/webext/vapi-webrequest.js b/platform/webext/vapi-webrequest.js
@@ -61,46 +61,41 @@ vAPI.net.registerListeners = function() {
     var wrApi = browser.webRequest;
 
     // legacy Chromium understands only these network request types.
-    var validTypes = {
-        main_frame: true,
-        sub_frame: true,
-        stylesheet: true,
-        script: true,
-        image: true,
-        object: true,
-        xmlhttprequest: true,
-        other: true
-    };
+    var validTypes = new Set([
+        'image',
+        'main_frame',
+        'object',
+        'other',
+        'script',
+        'stylesheet',
+        'sub_frame',
+        'xmlhttprequest',
+    ]);
     // modern Chromium/WebExtensions: more types available.
     if ( wrApi.ResourceType ) {
         for ( let typeKey in wrApi.ResourceType ) {
             if ( wrApi.ResourceType.hasOwnProperty(typeKey) ) {
-                validTypes[wrApi.ResourceType[typeKey]] = true;
+                validTypes.add(wrApi.ResourceType[typeKey]);
             }
         }
     }
 
     var denormalizeTypes = function(aa) {
         if ( aa.length === 0 ) {
-            return Object.keys(validTypes);
+            return Array.from(validTypes);
         }
-        var out = [];
-        var i = aa.length,
-            type,
-            needOther = true;
+        var out = new Set(),
+            i = aa.length;
         while ( i-- ) {
-            type = aa[i];
-            if ( validTypes[type] ) {
-                out.push(type);
+            var type = aa[i];
+            if ( validTypes.has(type) ) {
+                out.add(type);
             }
-            if ( type === 'other' ) {
-                needOther = false;
+            if ( type === 'image' && validTypes.has('imageset') ) {
+                out.add('imageset');
             }
         }
-        if ( needOther ) {
-            out.push('other');
-        }
-        return out;
+        return Array.from(out);
     };
 
     var punycode = self.punycode;
@@ -144,7 +139,7 @@ vAPI.net.registerListeners = function() {
         let urls = this.onBeforeRequest.urls || ['<all_urls>'];
         let types = this.onBeforeRequest.types || undefined;
         if (
-            (validTypes.websocket) &&
+            (validTypes.has('websocket')) &&
             (types === undefined || types.indexOf('websocket') !== -1) &&
             (urls.indexOf('<all_urls>') === -1)
         ) {

diff --git a/src/_locales/bn/messages.json b/src/_locales/bn/messages.json
@@ -512,7 +512,7 @@
     "description": "Pretty name for behind-the-scene network requests"
   },
   "loggerCurrentTab": {
-    "message": "Current tab",
+    "message": "বর্তমান ট্যাব",
     "description": "Appears in the logger's tab selector"
   },
   "logFilterPrompt": {

diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json
@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "Konečně efektivní blokovač, který nezatěžuje CPU a paměť.",
+    "message": "Konečně efektivní blokovač. Nezatěžuje CPU a paměť.",
     "description": "this will be in the chrome web store: must be 132 characters or less"
   },
   "dashboardName": {
@@ -52,7 +52,7 @@
     "description": "Message to be read by screen readers"
   },
   "popupPowerSwitchInfo2": {
-    "message": "Click to enable uBlock₀ for this site.",
+    "message": "Kliknutím povolíte uBlock₀ pro tento web.",
     "description": "Message to be read by screen readers"
   },
   "popupBlockedRequestPrompt": {
@@ -96,47 +96,47 @@
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups1": {
-    "message": "Click to block all popups on this site",
+    "message": "Kliknutím zablokujete všechny popupy pro tento web",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups2": {
-    "message": "Zhbllokoj të gjitha dritaret automatike të faqes",
+    "message": "Kliknutím vypnete blokování všech popupů pro tento web",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoLargeMedia": {
     "message": "Přepnout blokování velkých multimediálních prvků na tomto webu",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia1": {
-    "message": "Click to block large media elements on this site",
+    "message": "Kliknutím zablokujete velké multimediální prvky na tomto webu",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia2": {
-    "message": "Click to no longer block large media elements on this site",
+    "message": "Kliknutím vypnete blokování velkých multimediálních prvků na tomto webu",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoCosmeticFiltering": {
     "message": "Přepnout kosmetické filtrování na tomto webu",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering1": {
-    "message": "Click to disable cosmetic filtering on this site",
+    "message": "Kliknutím zakážete kosmetické filtrování na tomto webu",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering2": {
-    "message": "Click to enable cosmetic filtering on this site",
+    "message": "Kliknutím povolíte kosmetické filtrování na tomto webu",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoRemoteFonts": {
     "message": "Přepnout blokování vzdálených fontů pro tento web",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoRemoteFonts1": {
-    "message": "Click to block remote fonts on this site",
+    "message": "Kliknutím zablokujete externí\/vzdálené fonty na tomto webu",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoRemoteFonts2": {
-    "message": "Click to no longer block remote fonts on this site",
+    "message": "Kliknutím vypnete blokování externích\/vzdálených fontů na tomto webu",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipGlobalRules": {
@@ -512,7 +512,7 @@
     "description": "Pretty name for behind-the-scene network requests"
   },
   "loggerCurrentTab": {
-    "message": "Current tab",
+    "message": "Aktivní list",
     "description": "Appears in the logger's tab selector"
   },
   "logFilterPrompt": {