Merge 7d99559a30 into 738f93da28

Import translation work from https://crowdin.com/project/ublock
[mv3] Replace "30-day Phishing Domain List" with "Malicious URL Blocklist"
2026-03-11 09:04:36 +00:00 · 2024-12-10 00:45:42 -05:00 · 2024-12-09 10:52:07 -05:00 · 2024-12-09 10:48:24 -05:00 · 2024-12-09 09:42:46 -05:00 · 2024-12-09 08:38:29 -05:00
11 changed files with 30 additions and 21 deletions
--- a/dist/firefox/updates.json
+++ b/dist/firefox/updates.json
@ -3,9 +3,9 @@
  "uBlock0@raymondhill.net": {
   "updates": [
    {
-     "version": "1.61.3.5",
+     "version": "1.61.3.6",
     "browser_specific_settings": { "gecko": { "strict_min_version": "78.0" } },
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.61.3b5/uBlock0_1.61.3b5.firefox.signed.xpi"
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.61.3b6/uBlock0_1.61.3b6.firefox.signed.xpi"
    }
   ]
  }
--- a/dist/version
+++ b/dist/version
@ -1 +1 @@
-1.61.3.5
+1.61.3.6
--- a/platform/mv3/extension/_locales/ar/messages.json
+++ b/platform/mv3/extension/_locales/ar/messages.json
@ -256,7 +256,7 @@
    "description": "Text informing about what is causing the page to be blocked"
  },
  "strictblockRedirectSentence1": {
-    "message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{url}}",
+    "message": "الصفحة المحظورة تريد إعادة التوجيه إلى موقع آخر. إذا اخترت المتابعة، فسوف تنتقل مباشرة إلى: {{url}}",
    "description": "Text warning about an incoming redirect"
  },
  "strictblockNoParamsPrompt": {
--- a/platform/mv3/extension/_locales/fy/messages.json
+++ b/platform/mv3/extension/_locales/fy/messages.json
@ -232,11 +232,11 @@
    "description": "Label for a checkbox in the options page"
  },
  "enableStrictBlockLabel": {
-    "message": "Strikte blokkearring ynskeakelje",
+    "message": "Strange blokkearring ynskeakelje",
    "description": "Label for a checkbox in the options page"
  },
  "enableStrictBlockLegend": {
-    "message": "Navigaasje nei in potinsjeel net-winske websites sil blokkearre wurde, en jo krije in opsje om troch te gean.",
+    "message": "Navigaasje nei potinsjeel net-winske websites wurdt blokkearre, en jo krije de opsje om troch te gean.",
    "description": "Label for a checkbox in the options page"
  },
  "findListsPlaceholder": {
@ -248,15 +248,15 @@
    "description": "Webpage title for the strict-blocked page"
  },
  "strictblockSentence1": {
-    "message": "uBO Lite hat opkeard dat de folgjende side laden wurd:",
+    "message": "uBO Lite hat it laden fan de folgjende side opkeard:",
    "description": "Sentence used in the strict-blocked page"
  },
  "strictblockReasonSentence1": {
-    "message": "The page was blocked because of a matching filter in {{listname}}.",
+    "message": "De side is blokkearre fanwegen in oerienkommend filter yn {{listname}}.",
    "description": "Text informing about what is causing the page to be blocked"
  },
  "strictblockRedirectSentence1": {
-    "message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{url}}",
+    "message": "De blokkearre side wol jo omliede nei in oare website. As jo trochgean, navigearje jo streekrjocht nei: {{url}}",
    "description": "Text warning about an incoming redirect"
  },
  "strictblockNoParamsPrompt": {
@ -268,7 +268,7 @@
    "description": "A button to go back to the previous webpage"
  },
  "strictblockClose": {
-    "message": "Slút dit finster",
+    "message": "Dit finster slute",
    "description": "A button to close the current tab"
  },
  "strictblockDontWarn": {
--- a/platform/mv3/extension/_locales/nl/messages.json
+++ b/platform/mv3/extension/_locales/nl/messages.json
@ -236,7 +236,7 @@
    "description": "Label for a checkbox in the options page"
  },
  "enableStrictBlockLegend": {
-    "message": "Navigatie naar mogelijk ongewenste websites wordt geblokkeerd, en nu krijgt de mogelijkheid om door te gaan.",
+    "message": "Navigatie naar mogelijk ongewenste websites wordt geblokkeerd, en u krijgt de mogelijkheid om door te gaan.",
    "description": "Label for a checkbox in the options page"
  },
  "findListsPlaceholder": {
--- a/platform/mv3/extension/css/settings.css
+++ b/platform/mv3/extension/css/settings.css
@ -30,8 +30,9 @@ body[data-forbid~="filteringMode"] section[data-pane="settings"] > div:has(> h3[
    display: none;
    }

-#showBlockedCount:has(input[type="checkbox"][disabled]) {
-    opacity: 0.5;
+label:has(input[type="checkbox"][disabled]),
+label:has(input[type="checkbox"][disabled]) + legend {
+    filter: var(--checkbox-disabled-filter);
    }

 #defaultFilteringMode {
--- a/platform/mv3/extension/dashboard.html
+++ b/platform/mv3/extension/dashboard.html
@ -31,8 +31,6 @@
            <p><label id="autoReload" data-i18n="autoReloadLabel"><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>_</label>
            </p>
            <p><label id="showBlockedCount" data-i18n="showBlockedCountLabel"><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>_</label>
-            <p><label id="strictBlockMode" data-i18n="enableStrictBlockLabel"><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>_</label><legend data-i18n="enableStrictBlockLegend"></legend>
-            <p id="developerMode" hidden><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>Developer mode</label>
        </div>

        <div class="firstRun">
@ -90,6 +88,8 @@
                    <div data-i18n="completeFilteringModeDescription"></div>
                </label>
            </div>
+            <p><label id="strictBlockMode" data-i18n="enableStrictBlockLabel"><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>_</label><legend data-i18n="enableStrictBlockLegend"></legend>
+            <p id="developerMode" hidden><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>Developer mode</label>
        </div>

        <div>
--- a/platform/mv3/extension/js/settings.js
+++ b/platform/mv3/extension/js/settings.js
@ -67,7 +67,12 @@ function renderWidgets() {
        }
    }

-    qs$('#strictBlockMode input[type="checkbox"]').checked = cachedRulesetData.strictBlockMode;
+    {
+        const input = qs$('#strictBlockMode input[type="checkbox"]');
+        const canStrictBlock = cachedRulesetData.defaultFilteringMode > 1;
+        input.checked = canStrictBlock && cachedRulesetData.strictBlockMode;
+        dom.attr(input, 'disabled', canStrictBlock ? null : '');
+    }

    {
        dom.prop('#developerMode input[type="checkbox"]', 'checked',
--- a/platform/mv3/make-rulesets.js
+++ b/platform/mv3/make-rulesets.js
@ -1288,11 +1288,11 @@ async function main() {

    // Handpicked rulesets from abroad
    await rulesetFromURLs({
-        id: 'nrd.30day.phishing',
-        name: '30-day Phishing Domain List',
+        id: 'urlhaus.full',
+        name: 'Malicious URL Blocklist',
        enabled: true,
-        urls: [ 'https://raw.githubusercontent.com/xRuffKez/NRD/refs/heads/main/lists/30-day_phishing/domains-only/nrd-phishing-30day.txt' ],
-        homeURL: 'https://github.com/xRuffKez/NRD?tab=readme-ov-file',
+        urls: [ 'https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-domains.txt' ],
+        homeURL: 'https://gitlab.com/malware-filter/urlhaus-filter',
    });

    await rulesetFromURLs({
--- a/src/js/resources/set-constant.js
+++ b/src/js/resources/set-constant.js
@ -61,7 +61,6 @@ export function validateConstantFn(trusted, raw, extraArgs = {}) {
        } else if ( raw.startsWith('{') && raw.endsWith('}') ) {
            try { value = safe.JSON_parse(raw).value; } catch(ex) { return; }
        }
-        return raw;
    } else {
        return;
    }
--- a/src/web_accessible_resources/google-ima.js
+++ b/src/web_accessible_resources/google-ima.js
@ -15,6 +15,7 @@
 * - Corrected typo in `UniversalAdIdInfo.getAdIdValue()` method name
 * - Corrected dispatch of LOAD event when preloading is enabled
 * - Corrected dispatch of CONTENT_PAUSE/RESUME_REQUESTED events
+ * - Added missing `AdsRequest.omidAccessModeRules` property
 * 
 * Related issue:
 * - https://github.com/uBlockOrigin/uBlock-issues/issues/2158
@ -488,6 +489,9 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
  class AdsRenderingSettings {}

  class AdsRequest {
+    constructor() {
+      this.omidAccessModeRules = {};
+    }
    setAdWillAutoPlay() {}
    setAdWillPlayMuted() {}
    setContinuousPlayback() {}
Author	SHA1	Message	Date
Dave Vandyke	d53d6ead13	Merge `7d99559a30` into `738f93da28`	2024-12-10 00:45:42 -05:00
Raymond Hill	738f93da28	Import translation work from https://crowdin.com/project/ublock	2024-12-09 10:52:07 -05:00
Raymond Hill	09554384ef	[mv3] Replace "30-day Phishing Domain List" with "Malicious URL Blocklist" As per team feedback.	2024-12-09 10:48:24 -05:00
Raymond Hill	20a570ebe8	[mv3] Make strict-blocking checkbox dependent on filtering mode Related feedback: https://github.com/uBlockOrigin/uBOL-home/issues/214#issuecomment-2528072997	2024-12-09 09:42:46 -05:00
Raymond Hill	51ef43c0de	Make Firefox dev build auto-update	2024-12-09 08:38:29 -05:00
Raymond Hill	2ccb01973e	Fix regression in `set-constant` scriptlet Regression from `3417fe3d5d`	2024-12-09 08:22:21 -05:00
Raymond Hill	7daa45e49f	Revert "Fix regression in `set-constant`scriptlet" This reverts commit `b7441bb9c0`.	2024-12-09 08:19:43 -05:00
Raymond Hill	fa87e6d830	New revision for dev build	2024-12-09 08:08:43 -05:00
Raymond Hill	b7441bb9c0	Fix regression in `set-constant`scriptlet Regression from https://github.com/gorhill/uBlock/commit/3417fe3d5d	2024-12-09 08:05:47 -05:00
Dave Vandyke	7d99559a30	Add AdRequest.omidAccessModeRules property to google-ima shim Add the missing AdRequest.omidAccessModeRules[1] property, to avoid breaking websites that access it. 1 - https://developers.google.com/interactive-media-ads/docs/sdks/html5/client-side/reference/js/google.ima.AdsRequest#omidAccessModeRules	2023-11-28 13:53:14 +00:00
 @ -1 +1 @@
 .61.3.5
 .61.3.6