Merge pull request gorhill#16 from gorhill/master

Re-sync with uBo master

Author: pes10k

dist/firefox/updates.json

@@ -3,10 +3,10 @@
   "uBlock0@raymondhill.net": {
    "updates": [
     {
-     "version": "1.28.5.13",
+     "version": "1.29.1.0",
      "browser_specific_settings": { "gecko": { "strict_min_version": "55" } },
-     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.28.5b13",
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.28.5b13/uBlock0_1.28.5b13.firefox.signed.xpi"
+     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.29.1b0",
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.29.1b0/uBlock0_1.29.1b0.firefox.signed.xpi"
     }
    ]
   }

dist/version

@@ -1 +1 @@
-1.28.5.13
+1.29.1.0

docs/tests/static-filtering-parser-checklist.txt

@@ -32,6 +32,14 @@ a*
 :: AB
 :: ab # comment
 
+! valid hosts file entries
+0.0.0.0 0.0.0.0.example.com
+0.0.0.0 localhost.example.com
+0.0.0.0 local-host.example.com
+0.0.0.0 local.com
+0.0.0.0 localhost.com
+0.0.0.0 local-host.com
+
 ! valid options
 $script,redirect=noop.js
 *$empty
@@ -68,6 +76,11 @@ $
 ::/ ab
 :: ab$
 
+! ignored hosts file entries
+0.0.0.0 0.0.0.0
+0.0.0.0 local
+0.0.0.0 localhost
+
 ! bad regex
 /(abc|def/$xhr
 

platform/chromium/vapi-background.js

@@ -1599,28 +1599,14 @@ vAPI.cloud = (( ) => {
         }
         bin[dataKey + chunkCount.toString()] = ''; // Sentinel
 
-        let result;
-        let errorStr;
         try {
-            result = await webext.storage.sync.set(bin);
+            await webext.storage.sync.set(bin);
         } catch (reason) {
-            errorStr = reason;
-        }
-
-        // https://github.com/gorhill/uBlock/issues/3006#issuecomment-332597677
-        // - Delete all that was pushed in case of failure.
-        // - It's unknown whether such issue applies only to Firefox:
-        //   until such cases are reported for other browsers, we will
-        //   reset the (now corrupted) content of the cloud storage
-        //   only on Firefox.
-        if ( errorStr !== undefined && vAPI.webextFlavor.soup.has('firefox') ) {
-            chunkCount = 0;
+            return String(reason);
         }
 
         // Remove potentially unused trailing chunks
         deleteChunks(dataKey, chunkCount);
-
-        return errorStr;
     };
 
     const pull = async function(dataKey) {
@@ -1638,7 +1624,7 @@ vAPI.cloud = (( ) => {
         try {
             bin = await webext.storage.sync.get(chunkKeys);
         } catch (reason) {
-            return reason;
+            return String(reason);
         }
 
         // Assemble chunks into a single string.

src/3p-filters.html

@@ -24,10 +24,10 @@
 </div>
 
 <div>
-    <div class="li"><label><span class="input checkbox"><input type="checkbox" id="autoUpdate"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span data-i18n="3pAutoUpdatePrompt1"></span></label></div>
-    <div class="li"><label><span class="input checkbox"><input type="checkbox" id="parseCosmeticFilters"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="3pParseAllABPHideFiltersPrompt1"></span>&nbsp;<span class="fa-icon info" data-i18n-title="3pParseAllABPHideFiltersInfo">question-circle</span></span></label>
+    <div class="li"><label><span class="input checkbox"><input type="checkbox" id="autoUpdate"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span data-i18n="3pAutoUpdatePrompt1"></span></label></div>
+    <div class="li"><label><span class="input checkbox"><input type="checkbox" id="parseCosmeticFilters"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span data-i18n="3pParseAllABPHideFiltersPrompt1"></span>&nbsp;<span class="fa-icon info" data-i18n-title="3pParseAllABPHideFiltersInfo">question-circle</span></span></label>
     </div>
-    <div class="li"><label><span class="input checkbox"><input type="checkbox" id="ignoreGenericCosmeticFilters"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span data-i18n="3pIgnoreGenericCosmeticFilters"></span>&nbsp;<span class="fa-icon info" data-i18n-title="3pIgnoreGenericCosmeticFiltersInfo">question-circle</span></span></label>
+    <div class="li"><label><span class="input checkbox"><input type="checkbox" id="ignoreGenericCosmeticFilters"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span data-i18n="3pIgnoreGenericCosmeticFilters"></span>&nbsp;<span class="fa-icon info" data-i18n-title="3pIgnoreGenericCosmeticFiltersInfo">question-circle</span></span></label>
     </div>
 </div>
 
@@ -45,7 +45,7 @@
         <div class="listEntries"></div>
     </div>
     <div class="li listEntry">
-        <label><span class="input checkbox"><input type="checkbox"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span class="listname forinput"></span> <span class="iconbar"><!--
+        <label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span class="listname forinput"></span> <span class="iconbar"><!--
      --><a class="fa-icon content" href="#" type="text/plain" target="_blank" data-i18n-title="3pViewContent">eye-open</a><!--
      --><a class="fa-icon support" href="#" target="_blank">home</a><!--
      --><span class="fa-icon remove">trash-o</span><!--
@@ -57,7 +57,7 @@
      --><span class="fa-icon status failed" data-i18n-title="3pNetworkError">unlink</span><!--
      --><span class="counts"></span></span></span></label>
     </div>
-    <div class="listEntry toImport"><label><span class="input checkbox"><input type="checkbox" id="importLists"><svg><use href="img/material-design.svg#checkmark" /></svg></span><span><span class="forinput" data-i18n="3pImport"></span> <a class="fa-icon info towiki" href="https://github.com/gorhill/uBlock/wiki/Filter-lists-from-around-the-web" target="_blank">info-circle</a></span></label><!--
+    <div class="listEntry toImport"><label><span class="input checkbox"><input type="checkbox" id="importLists"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span class="forinput" data-i18n="3pImport"></span> <a class="fa-icon info towiki" href="https://github.com/gorhill/uBlock/wiki/Filter-lists-from-around-the-web" target="_blank">info-circle</a></span></label><!--
         --><!--
         --><textarea id="externalLists" dir="ltr" spellcheck="false" placeholder="3pExternalListsHint"></textarea>
     </div>

src/_locales/ar/messages.json

@@ -96,7 +96,7 @@
     "description": "English: or"
   },
   "popupBlockedOnThisPage_v2": {
-    "message": "Blocked on this page",
+    "message": "تم الحظر على هاته الصفحة",
     "description": "For the new mobile-friendly popup design"
   },
   "popupBlockedSinceInstall_v2": {
@@ -180,11 +180,11 @@
     "description": "Tooltip for the no-scripting per-site switch"
   },
   "popupNoPopups_v2": {
-    "message": "Pop-up windows",
+    "message": "نافذة منبثقة",
     "description": "Caption for the no-popups per-site switch"
   },
   "popupNoLargeMedia_v2": {
-    "message": "عناصر كبيرة للوسائط",
+    "message": "وسائط ميديا كبيرة",
     "description": "Caption for the no-large-media per-site switch"
   },
   "popupNoCosmeticFiltering_v2": {
@@ -264,7 +264,7 @@
     "description": "appears in popup"
   },
   "popupVersion": {
-    "message": "Version",
+    "message": "نسخة",
     "description": "Example of use: Version 1.26.4"
   },
   "pickerCreate": {
@@ -468,7 +468,7 @@
     "description": "used as a tooltip for the out-of-date icon beside a list"
   },
   "3pViewContent": {
-    "message": "view content",
+    "message": "نظرة على المحتوى",
     "description": "used as a tooltip for eye icon beside a list"
   },
   "3pLastUpdate": {
@@ -712,7 +712,7 @@
     "description": "Label for the type selector"
   },
   "loggerStaticFilteringHeader": {
-    "message": "فلترة ثابتة",
+    "message": "ترشيح ثابتة",
     "description": "Small header to identify the static filtering section"
   },
   "loggerStaticFilteringSentence": {
@@ -840,15 +840,15 @@
     "description": "English: Contributors"
   },
   "aboutSourceCode": {
-    "message": "Source code",
+    "message": "شيفرة المصدر",
     "description": "Link text to source code repo"
   },
   "aboutTranslations": {
-    "message": "Translations",
+    "message": "الترجمات",
     "description": "Link text to translations repo"
   },
   "aboutFilterLists": {
-    "message": "Filter lists",
+    "message": "القوائم المرشحة",
     "description": "Link text to uBO's own filter lists repo"
   },
   "aboutDependencies": {
@@ -1020,7 +1020,7 @@
     "description": "Label for buttons used to copy something to the clipboard"
   },
   "toggleBlockingProfile": {
-    "message": "Toggle blocking profile",
+    "message": "تبديل صفحة الحظر",
     "description": "Label for keyboard shortcut used to toggle blocking profile"
   },
   "relaxBlockingMode": {
@@ -1032,15 +1032,15 @@
     "description": " In Setting pane, renders as (example): Storage used: 13.2 MB"
   },
   "KB": {
-    "message": "KB",
+    "message": "كيلو بايت",
     "description": "short for 'kilobytes'"
   },
   "MB": {
-    "message": "MB",
+    "message": "ميغا بايت",
     "description": "short for 'megabytes'"
   },
   "GB": {
-    "message": "GB",
+    "message": "جيغا بايت",
     "description": "short for 'gigabytes'"
   },
   "dummy": {

src/_locales/cv/messages.json

@@ -12,7 +12,7 @@
     "description": "English: uBlock₀ — Dashboard"
   },
   "dashboardUnsavedWarning": {
-    "message": "Warning! You have unsaved changes",
+    "message": "Асӑрха! Санӑн упраман улшӑнусем пур",
     "description": "A warning in the dashboard when navigating away from unsaved changes"
   },
   "dashboardUnsavedWarningStay": {
@@ -200,7 +200,7 @@
     "description": "Caption for the no-scripting per-site switch"
   },
   "popupMoreButton_v2": {
-    "message": "More",
+    "message": "Тата",
     "description": "Label to be used to show popup panel sections"
   },
   "popupLessButton_v2": {
@@ -492,7 +492,7 @@
     "description": "English: Import and append"
   },
   "1pExport": {
-    "message": "Export",
+    "message": "Куҫар",
     "description": "English: Export"
   },
   "1pExportFilename": {
@@ -696,7 +696,7 @@
     "description": "Label to identify the type of an entry"
   },
   "loggerEntryDetailsURL": {
-    "message": "URL",
+    "message": "Тӗл",
     "description": "Label to identify the URL of an entry"
   },
   "loggerURLFilteringHeader": {

src/_locales/da/messages.json

@@ -40,7 +40,7 @@
     "description": "appears as tab name in dashboard"
   },
   "whitelistPageName": {
-    "message": "Whitelist",
+    "message": "Betroede websteder",
     "description": "appears as tab name in dashboard"
   },
   "shortcutsPageName": {
@@ -552,7 +552,7 @@
     "description": "English: dynamic rule syntax and full documentation."
   },
   "whitelistPrompt": {
-    "message": "Brugerdefineret liste over værtsnavne hvor uBlock₀ vil være deaktiveret. Kun et værtsnavn pr. linje. Ugyldige værtsnavne ignoreres.",
+    "message": "De betroede webstedsdirektiver dikterer, på hvilke websider uBlock Origin skal deaktiveres. Én post pr. linje. Ugyldige direktiver ignoreres og kommenteres ud.",
     "description": "The name of the trusted sites pane."
   },
   "whitelistImport": {
@@ -564,7 +564,7 @@
     "description": "English: Export"
   },
   "whitelistExportFilename": {
-    "message": "min-ublock-whitelist_{{datetime}}.txt",
+    "message": "mine-ublock-betroede-websteder_{{datetime}}.txt",
     "description": "The default filename to use for import/export purpose"
   },
   "whitelistApply": {

src/_locales/et/messages.json

@@ -40,7 +40,7 @@
     "description": "appears as tab name in dashboard"
   },
   "whitelistPageName": {
-    "message": "Valge loend",
+    "message": "Usaldatud saidid",
     "description": "appears as tab name in dashboard"
   },
   "shortcutsPageName": {
@@ -552,7 +552,7 @@
     "description": "English: dynamic rule syntax and full documentation."
   },
   "whitelistPrompt": {
-    "message": "Valge nimekirja direktiivid määravad, millistel veebilehtedel peaks uBlock Origin keelatud olema. Üks domeen rea kohta. Sobimatuid direktiive vaikselt ignoreeritakse ja kommenteeritakse välja.",
+    "message": "Usaldatud saitide direktiivid määravad, millistel veebilehtedel peaks uBlock Origin keelatud olema. Üks kirje rea kohta. Sobimatuid direktiive vaikselt ignoreeritakse ja kommenteeritakse välja.",
     "description": "The name of the trusted sites pane."
   },
   "whitelistImport": {
@@ -564,7 +564,7 @@
     "description": "English: Export"
   },
   "whitelistExportFilename": {
-    "message": "minu-ublocki-valge-loend_{{datetime}}.txt",
+    "message": "minu-ublocki-usaldatud-saidid_{{datetime}}.txt",
     "description": "The default filename to use for import/export purpose"
   },
   "whitelistApply": {

src/_locales/ms/messages.json

@@ -28,7 +28,7 @@
     "description": "appears as tab name in dashboard"
   },
   "3pPageName": {
-    "message": "Penapis pihak luar",
+    "message": "Senarai penapis",
     "description": "appears as tab name in dashboard"
   },
   "1pPageName": {
@@ -236,7 +236,7 @@
     "description": ""
   },
   "popup3pPassiveRulePrompt": {
-    "message": "css/imej pihak ketiga",
+    "message": "CSS/imej pihak ketiga",
     "description": ""
   },
   "popupInlineScriptRulePrompt": {
@@ -612,31 +612,31 @@
     "description": "Tooltip for the popup panel button in the logger page"
   },
   "loggerInfoTip": {
-    "message": "uBlock Origin wiki: The logger",
+    "message": "uBlock Origin wiki: Catatan",
     "description": "Tooltip for the top-right info label in the logger page"
   },
   "loggerClearTip": {
-    "message": "Clear logger",
+    "message": "Kosongkan catatan",
     "description": "Tooltip for the eraser in the logger page; used to blank the content of the logger"
   },
   "loggerPauseTip": {
-    "message": "Pause logger (discard all incoming data)",
+    "message": "Jedakan catatan (singkirkan semua data masuk)",
     "description": "Tooltip for the pause button in the logger page"
   },
   "loggerUnpauseTip": {
-    "message": "Unpause logger",
+    "message": "Nyahjeda catatan",
     "description": "Tooltip for the play button in the logger page"
   },
   "loggerRowFiltererButtonTip": {
-    "message": "Toggle logger filtering",
+    "message": "Togol penapis catatan",
     "description": "Tooltip for the row filterer button in the logger page"
   },
   "logFilterPrompt": {
-    "message": "filter logger content",
+    "message": "tapis kandungan catatan",
     "description": "Placeholder string for logger output filtering input field"
   },
   "loggerRowFiltererBuiltinTip": {
-    "message": "Logger filtering options",
+    "message": "Pilihan tapisan catatan",
     "description": "Tooltip for the button to bring up logger output filtering options"
   },
   "loggerRowFiltererBuiltinNot": {
@@ -712,31 +712,31 @@
     "description": "Label for the type selector"
   },
   "loggerStaticFilteringHeader": {
-    "message": "Static filter",
+    "message": "Penapis statik",
     "description": "Small header to identify the static filtering section"
   },
   "loggerStaticFilteringSentence": {
     "message": "{{action}} network requests of {{type}} {{br}}which URL address matches {{url}} {{br}}and which originates {{origin}},{{br}}{{importance}} there is a matching exception filter.",
     "description": "Used in the static filtering wizard"
   },
   "loggerStaticFilteringSentencePartBlock": {
-    "message": "Block",
+    "message": "Sekat",
     "description": "Used in the static filtering wizard"
   },
   "loggerStaticFilteringSentencePartAllow": {
-    "message": "Allow",
+    "message": "Benarkan",
     "description": "Used in the static filtering wizard"
   },
   "loggerStaticFilteringSentencePartType": {
-    "message": "type “{{type}}”",
+    "message": "jenis “{{type}}”",
     "description": "Used in the static filtering wizard"
   },
   "loggerStaticFilteringSentencePartAnyType": {
-    "message": "any type",
+    "message": "pelbagai jenis",
     "description": "Used in the static filtering wizard"
   },
   "loggerStaticFilteringSentencePartOrigin": {
-    "message": "from “{{origin}}”",
+    "message": "dari “{{origin}}”",
     "description": "Used in the static filtering wizard"
   },
   "loggerStaticFilteringSentencePartAnyOrigin": {