diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 0e497566a..a3c181608 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 31December2020v2-Alpha +# Version: 01January2020v1-Alpha # Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 924925472..3882bbbd1 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt @@ -1,4 +1,4 @@ -! Version: 31December2020v2-Alpha +! Version: 01January2020v1-Alpha ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uMatrix-regler til รฅ benytte sammen med domeneversjonen) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version) ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 3cd55b55e..30c3fce51 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 311220202 +! Version: 010120201 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts helnordiske filtre for ryddigere nettsider (for Adblock Plus - Mรธter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) ! Expires: 1 day @@ -1135,6 +1135,7 @@ yrkesbil.no#?#*:-abp-has(> .forside_adholder) yrkesbil.no##td:empty yrkesbil.no#?#td:-abp-has(> noscript) yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"]) +manuall.no,manuall.dk##form + div[style^="border-style:solid; "] ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index c14f79c8a..7438ea787 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 311220202 +! Version: 010120201 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 1 day @@ -1142,6 +1142,7 @@ yrkesbil.no#?#*:-abp-has(> .forside_adholder) yrkesbil.no##td:empty yrkesbil.no#?#td:-abp-has(> noscript) yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"]) +manuall.no,manuall.dk##form + div[style^="border-style:solid; "] ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 0f69577c9..c66c7b317 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 31December2020v2 +! Version: 01January2020v1 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 1 day @@ -1187,6 +1187,7 @@ yrkesbil.no##.forside_adholder:upward(1) yrkesbil.no##td:empty yrkesbil.no#?#td:has(> noscript) yrkesbil.no#?#td:has(img[src="gifs/1pix.gif"]) +manuall.*##form + div[style^="border-style:solid; "] ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$frame ||danishfamilysearch.dk/images/xp2^$image diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 61fd19dd6..54fd756c0 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 31December2020v2 +! Version: 01January2020v1 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 1 day @@ -1187,6 +1187,7 @@ yrkesbil.no##.forside_adholder:upward(1) yrkesbil.no##td:empty yrkesbil.no#?#td:-abp-has(> noscript) yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"]) +manuall.*##form + div[style^="border-style:solid; "] ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$frame ||danishfamilysearch.dk/images/xp2^$image diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 10e8dd2b7..f9fafca1c 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 31December2020v2-Alpha +# Version: 01January2020v1-Alpha # Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 1738f9430..4a83da9c6 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -325,6 +325,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"(^|,)manuall.\*(#|,)", + r"\1manuall.no,manuall.dk\2", + line + ) + line = re.sub( "^,", "^$", @@ -2100,6 +2106,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"(^|,)manuall.\*(#|,)", + r"\1manuall.no,manuall.dk\2", + line + ) + line = re.sub( "^,", "^$",