Fork Sync: Update from parent repository

CHANGELOG.md

@@ -1,3 +1,16 @@
+- [Fix regression in `prevent-fetch` scriptlet](https://github.com/gorhill/uBlock/commit/be78200c2f)
+- [Add `prevent-dialog` scriptlet](https://github.com/gorhill/uBlock/commit/fd12d01928)
+- [[firefox] Change minimum required version to 128](https://github.com/gorhill/uBlock/commit/015ddcde29)
+
+----------
+
+# 1.68.0
+
+- [Improve `prevent-fetch` scriptlet](https://github.com/gorhill/uBlock/commit/b46572e938)
+- [Fix regression in `trusted-replace-argument` scriptlet](https://github.com/gorhill/uBlock/commit/2e509d42fc)
+- [Add web-accessible resource for sensors analytics](https://github.com/gorhill/uBlock/commit/cd0f5be12c)
+- [Fix custom prefixes unduly assigning trust to external lists](https://github.com/gorhill/uBlock/commit/b5f74456a4)
+- [Improve `m3u-prune` scriptlet](https://github.com/gorhill/uBlock/commit/53d60ac36c)
 - [Improve `prevent-fetch` scriptlet](https://github.com/gorhill/uBlock/commit/60e15cb6e1)
 - [Fix regex-matching in `JSONPath`](https://github.com/gorhill/uBlock/commit/8491e9c476)
 - [Ignore negated request types when validating `redirect` option](https://github.com/gorhill/uBlock/commit/50e898b847)

Makefile

@@ -117,7 +117,8 @@ publish-edge:
 		ghasset=chromium \
 		datebasedmajor=1 \
 		storeid=odfafepnkmbhccpbejgmiehpchacaeak \
-		productid=$(shell secret-tool lookup token ubo_edge_id)
+		productid=$(shell secret-tool lookup token ubo_edge_id) \
+		notes="See release notes at https://github.com/gorhill/uBlock/releases"
 
 # Usage: make publish-firefox version=?
 publish-firefox:

dist/firefox/updates.json

@@ -3,13 +3,13 @@
     "[email protected]": {
       "updates": [
         {
-          "version": "1.66.5.2",
+          "version": "1.68.1.0",
           "browser_specific_settings": {
             "gecko": {
               "strict_min_version": "92.0"
             }
           },
-          "update_link": "https://github.com/gorhill/uBlock/releases/download/1.66.5b2/uBlock0_1.66.5b2.firefox.signed.xpi"
+          "update_link": "https://github.com/gorhill/uBlock/releases/download/1.68.1b0/uBlock0_1.68.1b0.firefox.signed.xpi"
         }
       ]
     }

dist/version

@@ -1 +1 @@
-1.67.1.1
+1.68.1.0

platform/firefox/manifest.json

@@ -17,10 +17,13 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "[email protected]",
-      "strict_min_version": "92.0"
+      "strict_min_version": "115.0",
+      "data_collection_permissions": {
+        "required": [ "none" ]
+      }
     },
     "gecko_android": {
-      "strict_min_version": "92.0"
+      "strict_min_version": "115.0"
     }
   },
   "commands": {

platform/mv3/edge/patch-ruleset.js

@@ -0,0 +1,38 @@
+/*******************************************************************************
+
+    uBlock Origin - a comprehensive, efficient content blocker
+    Copyright (C) 2025-present Raymond Hill
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see {http://www.gnu.org/licenses/}.
+
+    Home: https://github.com/gorhill/uBlock
+*/
+
+function patchRule(rule, out) {
+    const { condition } = rule;
+    if ( Array.isArray(condition.responseHeaders) ) {
+        if ( condition.regexFilter === undefined ) { return; }
+    }
+    out.push(rule);
+    return rule;
+}
+
+export function patchRuleset(ruleset) {
+    const out = [];
+    for ( const rule of ruleset ) {
+        if ( patchRule(rule, out) ) { continue; }
+        console.log(`\tReject ${JSON.stringify(rule)}`);
+    }
+    return out;
+}

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

@@ -332,7 +332,7 @@
     "description": "Label for the menu entry to delete cosmetic filters"
   },
   "developDropdownLabel": {
-    "message": "Melihat",
+    "message": "Melihat:",
     "description": "A label of a dropdown list"
   },
   "developOptionFilteringModeDetails": {
@@ -348,7 +348,7 @@
     "description": "A section header in a dropdown list"
   },
   "developOptionDynamicRuleset": {
-    "message": "Aturan dinamis ",
+    "message": "Aturan dinamis",
     "description": "An option in a dropdown list"
   },
   "developOptionSessionRuleset": {

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

@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "Un efficiente bloccatore dei contenuti. Blocca annunci, tracker, minatori e altro ancora subito dopo l'installazione.",
+    "message": "Un efficiente bloccatore di contenuti. Blocca annunci, tracker, minatori e altro ancora subito dopo l'installazione.",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {
@@ -184,7 +184,7 @@
     "description": "An entry in the widget used to select the type of issue"
   },
   "supportS6Checkbox1": {
-    "message": "Contrassegna la pagina web come “NSFW”. (<a href=\"https://wikipedia.org/wiki/Not_safe_for_work\">“Not Safe For Work”</a>)",
+    "message": "Contrassegna la pagina web come “NSFW”. (<a href=\"https://wikipedia.org/wiki/Not_safe_for_work\">“non adatta ai minori”</a>)",
     "description": "A checkbox to use for NSFW sites"
   },
   "supportReportSpecificButton": {

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

@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "실험적이고 권한이 적은 콘텐츠 차단기. 광고, 추적기, 채굴기 등을 설치 직후 차단합니다.",
+    "message": "효율적인 콘텐츠 차단기입니다. 설치 직후 광고, 추적기, 채굴기 등을 즉시 차단합니다.",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {
@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "customFiltersPageName": {
-    "message": "Custom filters",
+    "message": "커스텀 필터",
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
@@ -40,7 +40,7 @@
     "description": "Label in the popup panel for the current filtering mode"
   },
   "popupLocalToolsLabel": {
-    "message": "On this website",
+    "message": "이 웹사이트에서는",
     "description": "Label in the popup panel for the local tools section"
   },
   "popupTipReport": {
@@ -88,11 +88,11 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Import / Export",
+    "message": "가져오기 / 내보내기",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {
-    "message": "Paste here specific cosmetic filters to add",
+    "message": "여기에 추가하려는 표면 필터 붙여넣기",
     "description": "Placeholder text which describes the purpose of the textarea widget"
   },
   "aboutChangelog": {
@@ -136,11 +136,11 @@
     "description": "Label of 'Troubleshooting information' section in 'Report a filter issue' page"
   },
   "supportS6P1S1": {
-    "message": "봉사자들이 중복 신고로 인해 부담을 겪지 않도록, 해당 이슈가 이미 신고되지는 않았는지 확인해주시기 바랍니다.",
+    "message": "자원봉사자들이 중복 신고로 인해 부담을 겪지 않도록, 해당 이슈가 이미 신고되지는 않았는지 확인해 주시기 바랍니다.",
     "description": "A paragraph in the filter issue reporter section"
   },
   "supportFindSpecificButton": {
-    "message": "유사한 신고 탐색",
+    "message": "비슷한 신고 내역 찾기",
     "description": "A clickable link in the filter issue reporter section"
   },
   "supportS6URL": {
@@ -172,7 +172,7 @@
     "description": "An entry in the widget used to select the type of issue"
   },
   "supportS6Select1Option5": {
-    "message": "uBO Lite를 켜면 깨집니다",
+    "message": "uBO Lite를 켜면 오작동합니다",
     "description": "An entry in the widget used to select the type of issue"
   },
   "supportS6Select1Option6": {
@@ -264,15 +264,15 @@
     "description": "Short description for a checkbox in the options page"
   },
   "settingsBackupRestoreLabel": {
-    "message": "Backup",
+    "message": "백업",
     "description": "The header text for the back up/restore section"
   },
   "settingsBackupRestoreSummary": {
-    "message": "Back up your custom settings to a file, or restore your custom settings from a file.",
+    "message": "사용자 지정 설정을 파일에 백업하거나 파일에서 사용자 지정 설정을 복원합니다.",
     "description": "A summary description of the back up/restore section."
   },
   "settingsBackupRestoreLegend": {
-    "message": "Restoring will overwrite all your current custom settings.",
+    "message": "복원 시 현재 설정이 모두 덮어씌워집니다.",
     "description": "Important information about the back up/restore section."
   },
   "findListsPlaceholder": {
@@ -324,11 +324,11 @@
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "pickerTipEnter": {
-    "message": "Create a custom filter",
+    "message": "커스텀 필터 생성",
     "description": "Label for the menu entry to create cosmetic filters"
   },
   "unpickerTipEnter": {
-    "message": "Remove a custom filter",
+    "message": "커스텀 필터 삭제",
     "description": "Label for the menu entry to delete cosmetic filters"
   },
   "developDropdownLabel": {
@@ -364,7 +364,7 @@
     "description": "Text for buttons used to revert changes"
   },
   "addButton": {
-    "message": "Add",
+    "message": "추가",
     "description": "Text for buttons used to add content"
   },
   "importAndAppendButton": {
@@ -376,11 +376,11 @@
     "description": "Text for buttons used to export content"
   },
   "backupButton": {
-    "message": "Back up…",
+    "message": "백업…",
     "description": "Text for buttons used to back up content"
   },
   "restoreButton": {
-    "message": "Restore…",
+    "message": "복원…",
     "description": "Text for buttons used to restore content"
   },
   "dnrRulesWarning": {
@@ -392,23 +392,23 @@
     "description": "Short sentence to report the number of currently registered DNR rules"
   },
   "pickerSliderLabel": {
-    "message": "Move the slider to select the best match",
+    "message": "슬라이더를 움직여 가장 적합한 항목을 선택하세요",
     "description": "Label to describe the purpose of the slider"
   },
   "pickerPick": {
-    "message": "Pick",
+    "message": "선택",
     "description": "Text for the button to re-enter element-picking mode"
   },
   "pickerPreview": {
-    "message": "Preview",
+    "message": "미리보기",
     "description": "Text for the button to activate preview mode"
   },
   "pickerCreate": {
-    "message": "Create",
+    "message": "생성",
     "description": "Text for the button to create the filter"
   },
   "unpickerUsage": {
-    "message": "Select a filter below to highlight matching elements in the webpage. Click the trash can to remove a filter.",
+    "message": "아래의 필터를 선택하면 웹페이지의 일치하는 요소가 강조 표시됩니다. 필터를 삭제하려면 휴지통을 클릭합니다.",
     "description": "Summary description on how to use the tool to remove custom filters"
   }
 }

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

@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "Bezatļauju satura aizturētājs. Aiztur reklāmas, izsekotājus, kriptoracējus un daudz ko citu uzreiz pēc uzstādīšanas.",
+    "message": "Iedarbīgs satura aizturētājs. Aiztur reklāmas, izsekotājus, kriptoracējus un vēl uzreiz pēc uzstādīšanas.",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {

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

@@ -228,7 +228,7 @@
     "description": "This describes the 'complete' filtering mode"
   },
   "noFilteringModeDescription": {
-    "message": "Filtreleme yapılmayacak alan alarının listesi",
+    "message": "Filtreleme yapılmayacak web sitelerinin listesi.",
     "description": "A short description for the editable field which lists trusted sites"
   },
   "noFilteringModePlaceholder": {

platform/mv3/extension/css/picker-ui.css

@@ -38,6 +38,7 @@
 #ubol-picker textarea {
     border: 0;
     box-sizing: border-box;
+    font-size: var(--monospace-size);
     min-height: 5em;
     resize: none;
     width: 100%;
@@ -49,7 +50,7 @@
     color: var(--ink-2);
     display: flex;
     flex-direction: column;
-    font-size: small;
+    font-size: var(--monospace-size);
     gap: 0.25em;
 }
 #ubol-picker .resultsetWidgets > span:first-of-type {
@@ -75,7 +76,7 @@
 
 #ubol-picker #candidateFilters {
     font-family: monospace;
-    font-size: small;
+    font-size: var(--monospace-size);
     max-height: min(20em, 30vh);
     min-height: 6em;
     overflow-y: auto;
@@ -111,7 +112,7 @@
     color: var(--ink-2);
     column-gap: 0;
     display: grid;
-    font-size: small;
+    font-size: var(--font-size-smaller);
     grid-template: auto / 1fr 1fr;
     justify-items: stretch;
     user-select: none;

platform/mv3/extension/css/settings.css

@@ -23,13 +23,19 @@ label + legend {
 body[data-forbid~="dashboard"] #dashboard-nav [data-pane="settings"],
 body[data-forbid~="dashboard"] section[data-pane="settings"],
 body[data-forbid~="dashboard"] #dashboard-nav [data-pane="rulesets"],
-body[data-forbid~="dashboard"] section[data-pane="rulesets"] {
+body[data-forbid~="dashboard"] section[data-pane="rulesets"],
+body[data-forbid~="dashboard"] #dashboard-nav [data-pane="filters"],
+body[data-forbid~="dashboard"] section[data-pane="filters"] {
     display: none;
     }
 body[data-forbid~="filteringMode"] section[data-pane="settings"] > div:has(> h3[data-i18n="defaultFilteringModeSectionLabel"]),
 body[data-forbid~="filteringMode"] section[data-pane="settings"] > div:has(> h3[data-i18n="filteringMode0Name"]) {
     display: none;
     }
+body[data-forbid~="picker"] #dashboard-nav [data-pane="filters"],
+body[data-forbid~="picker"] section[data-pane="filters"] {
+    display: none;
+    }
 body[data-forbid~="develop"] #developerMode {
     display: none;
     }

platform/mv3/extension/dashboard.html

@@ -167,7 +167,7 @@ <h3 data-i18n="settingsBackupRestoreLabel">_</h3>
             </div>
             <hr>
             <details><summary data-i18n="supportS5H"></summary>
-            <pre style="user-select: all; -webkit-user-select: all;"></pre>
+            <pre style="user-select:all; -webkit-user-select:all; direction:ltr;"></pre>
             </details>
         </div>
     </section>