Merge 7d99559a30 into 6c6ac6c7a7

dist/firefox/updates.json

@@ -3,9 +3,9 @@
   "uBlock0@raymondhill.net": {
    "updates": [
     {
-     "version": "1.61.3.6",
+     "version": "1.61.3.5",
      "browser_specific_settings": { "gecko": { "strict_min_version": "78.0" } },
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.61.3b6/uBlock0_1.61.3b6.firefox.signed.xpi"
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.61.3b5/uBlock0_1.61.3b5.firefox.signed.xpi"
     }
    ]
   }

dist/version

@@ -1 +1 @@
-1.61.3.6
+1.61.3.5

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": "الصفحة المحظورة تريد إعادة التوجيه إلى موقع آخر. إذا اخترت المتابعة، فسوف تنتقل مباشرة إلى: {{url}}",
+    "message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{url}}",
     "description": "Text warning about an incoming redirect"
   },
   "strictblockNoParamsPrompt": {

platform/mv3/extension/_locales/fy/messages.json

@@ -232,11 +232,11 @@
     "description": "Label for a checkbox in the options page"
   },
   "enableStrictBlockLabel": {
-    "message": "Strange blokkearring ynskeakelje",
+    "message": "Strikte blokkearring ynskeakelje",
     "description": "Label for a checkbox in the options page"
   },
   "enableStrictBlockLegend": {
-    "message": "Navigaasje nei potinsjeel net-winske websites wurdt blokkearre, en jo krije de opsje om troch te gean.",
+    "message": "Navigaasje nei in potinsjeel net-winske websites sil blokkearre wurde, en jo krije in 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 it laden fan de folgjende side opkeard:",
+    "message": "uBO Lite hat opkeard dat de folgjende side laden wurd:",
     "description": "Sentence used in the strict-blocked page"
   },
   "strictblockReasonSentence1": {
-    "message": "De side is blokkearre fanwegen in oerienkommend filter yn {{listname}}.",
+    "message": "The page was blocked because of a matching filter in {{listname}}.",
     "description": "Text informing about what is causing the page to be blocked"
   },
   "strictblockRedirectSentence1": {
-    "message": "De blokkearre side wol jo omliede nei in oare website. As jo trochgean, navigearje jo streekrjocht nei: {{url}}",
+    "message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{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": "Dit finster slute",
+    "message": "Slút dit finster",
     "description": "A button to close the current tab"
   },
   "strictblockDontWarn": {

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 u krijgt de mogelijkheid om door te gaan.",
+    "message": "Navigatie naar mogelijk ongewenste websites wordt geblokkeerd, en nu krijgt de mogelijkheid om door te gaan.",
     "description": "Label for a checkbox in the options page"
   },
   "findListsPlaceholder": {

platform/mv3/extension/css/settings.css

@@ -30,9 +30,8 @@ body[data-forbid~="filteringMode"] section[data-pane="settings"] > div:has(> h3[
     display: none;
     }
 
-label:has(input[type="checkbox"][disabled]),
-label:has(input[type="checkbox"][disabled]) + legend {
-    filter: var(--checkbox-disabled-filter);
+#showBlockedCount:has(input[type="checkbox"][disabled]) {
+    opacity: 0.5;
     }
 
 #defaultFilteringMode {

platform/mv3/extension/dashboard.html

@@ -31,6 +31,8 @@
             <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">
@@ -88,8 +90,6 @@
                     <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>

platform/mv3/extension/js/settings.js

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

platform/mv3/make-rulesets.js

@@ -1288,11 +1288,11 @@ async function main() {
 
     // Handpicked rulesets from abroad
     await rulesetFromURLs({
-        id: 'urlhaus.full',
-        name: 'Malicious URL Blocklist',
+        id: 'nrd.30day.phishing',
+        name: '30-day Phishing Domain List',
         enabled: true,
-        urls: [ 'https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-domains.txt' ],
-        homeURL: 'https://gitlab.com/malware-filter/urlhaus-filter',
+        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',
     });
 
     await rulesetFromURLs({

src/js/resources/set-constant.js

@@ -61,6 +61,7 @@ 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;
     }