diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index a105d567a..84b4be5a7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! Title: 🏔️ Dandelion Sprouts helnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler — Firefox ≥v121,x og Chromium ≥105,x) ! Title 🇬🇧: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance — Firefox ≥v121.x, Chromium ≥105.x) -! (Version|Last[ -]?[Mm]odified): Last modified08282024 +! Version: 280820242 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -3275,7 +3275,7 @@ triplx.dk##.aff-inner-col ! https://github.com/brave/adblock-lists/issues/768 (Remove when Shield Standard Mode adds support for cosmetic filtering in default lists) ||akamai.vgc.no/drfront3^$image ! Generic entries that seem like they'd apply to the internet as a whole (Nordic sites included) that aren't in EasyList or AdGuard Base Filter, but which are in either uBlock Filters Ads, uBlock Filters Unbreak, or uBlock Filters Badware Risks. -! (Version|Last[ -]?[Mm]odified): Version06262024-Extension +! Version: 260620241-Extension ###ad_feature:not(:empty) ###ad_img:not(:empty) ###adContext:not(:empty) @@ -3397,7 +3397,7 @@ triplx.dk##.aff-inner-col ! Generic entries that seem like they'd apply to the internet as a whole (Nordic sites included) that aren't in EasyList or uBlock Filters, but which are in AdGuard Base Filter. ! An equivalent file also exists for AdGuard softwares. -! (Version|Last[ -]?[Mm]odified): Version05212024-Extension +! Version: 210520241-Extension ###ad-fullbanner2-billboard-outer ###ad-topper ###ad_300X250 @@ -3538,7 +3538,7 @@ triplx.dk##.aff-inner-col [Adblock Plus 3.13] ! Title: 🇸🇪 Swedish List for Adblock Plus ! Expires: 6 days (update frequency) -! (Version|Last[ -]?[Mm]odified): Version05232024 +! Version: 230520242 ! Swedish section's homepage: https://github.com/DandelionSprout/Swedish-List-for-Adblock-Plus ! 🇸🇪 Beskrivning: Den här listan fjärnar reklamar och sporing på svenskspråkiga websidor. Den är mycket närt knuten till «Frellwit's Swedish Filters», men har blivit modifiserad för att fjärna uppföringer som stridar emot reglementet för inkludering i Adblock Plus (så som anti-anti-adblocking, cookie-notifikationer, nyhetsbrev, med mer), och öka kompatibiliteten med ABP sin syntax, eftersom Frellwits lista inte tilbjuder offisiell brukerstöd för ABP-brukare. Planen är att synkronisera med listan honoms omkring en gång i månaden, och att vi i ABP-teamet lägger till båda variga och mildertidiga fixer i mällantiden. ! 🇬🇧 Description: This list removes advertising and tracking on Swedish-language websites. It is very closely connected to "Frellwit's Swedish Filters", but has been modified to remove entries that are against the rules for inclusion in Adblock Plus (such as anti-anti-adblocking, cookie notifications, newsletters, etc.), and increase compatibility with ABP's syntax, since Frellwit's list does not offer official user support for ABP users. The plan is to synchronise with his list roughly once a month, and that the ABP team add both permanent and temporary fixes in the meantime. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 8df0ef295..db4401e93 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Title 🇬🇧: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) -! (Version|Last[ -]?[Mm]odified): Last modified08282024 +! Version: 280820242 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index f29896931..a1c097d2d 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -474,73 +474,73 @@ def prepare_abp(lines) -> str: line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)January(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>01\2\3", + r"! Version: \g<2>01\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)February(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>02\2\3", + r"! Version: \g<2>02\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)March(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>03\2\3", + r"! Version: \g<2>03\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)April(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>04\2\3", + r"! Version: \g<2>04\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)May(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>05\2\3", + r"! Version: \g<2>05\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)June(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>06\2\3", + r"! Version: \g<2>06\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)July(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>07\2\3", + r"! Version: \g<2>07\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)August(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>08\2\3", + r"! Version: \g<2>08\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)September(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>09\2\3", + r"! Version: \g<2>09\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)October(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>10\2\3", + r"! Version: \g<2>10\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)November(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>11\2\3", + r"! Version: \g<2>11\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)December(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>12\2\3", + r"! Version: \g<2>12\3\4", line ) @@ -2683,73 +2683,73 @@ def prepare_abp(lines) -> str: line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)January(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>01\2\3", + r"! Version: \g<2>01\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)February(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>02\2\3", + r"! Version: \g<2>02\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)March(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>03\2\3", + r"! Version: \g<2>03\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)April(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>04\2\3", + r"! Version: \g<2>04\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)May(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>05\2\3", + r"! Version: \g<2>05\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)June(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>06\2\3", + r"! Version: \g<2>06\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)July(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>07\2\3", + r"! Version: \g<2>07\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)August(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>08\2\3", + r"! Version: \g<2>08\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)September(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>09\2\3", + r"! Version: \g<2>09\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)October(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>10\2\3", + r"! Version: \g<2>10\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)November(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>11\2\3", + r"! Version: \g<2>11\3\4", line ) line = re.sub( r"! (Version|Last[ -]?[Mm]odified): (.*)December(.*)v(\d\d?)", - r"! (Version|Last[ -]?[Mm]odified): \g<1>12\2\3", + r"! Version: \g<2>12\3\4", line )