diff --git a/data/Dependent.json b/data/Dependent.json index 385d7b1e1..4987c701f 100644 --- a/data/Dependent.json +++ b/data/Dependent.json @@ -10,5 +10,17 @@ { "dependentFilterListId": 344, "dependencyFilterListId": 479 + }, + { + "dependentFilterListId": 819, + "dependencyFilterListId": 97 + }, + { + "dependentFilterListId": 852, + "dependencyFilterListId": 97 + }, + { + "dependentFilterListId": 853, + "dependencyFilterListId": 97 } -] \ No newline at end of file +] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 4cd807d0e..445388d8e 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -1219,6 +1219,10 @@ "filterListId": 889, "languageId": 110 }, + { + "filterListId": 891, + "languageId": 13 + }, { "filterListId": 892, "languageId": 110 @@ -1239,10 +1243,18 @@ "filterListId": 898, "languageId": 110 }, + { + "filterListId": 899, + "languageId": 167 + }, { "filterListId": 901, "languageId": 110 }, + { + "filterListId": 902, + "languageId": 112 + }, { "filterListId": 905, "languageId": 163 @@ -1259,6 +1271,22 @@ "filterListId": 909, "languageId": 79 }, + { + "filterListId": 910, + "languageId": 108 + }, + { + "filterListId": 911, + "languageId": 71 + }, + { + "filterListId": 912, + "languageId": 110 + }, + { + "filterListId": 913, + "languageId": 13 + }, { "filterListId": 914, "languageId": 110 @@ -1279,6 +1307,10 @@ "filterListId": 921, "languageId": 110 }, + { + "filterListId": 922, + "languageId": 13 + }, { "filterListId": 924, "languageId": 110 @@ -1311,6 +1343,10 @@ "filterListId": 933, "languageId": 79 }, + { + "filterListId": 934, + "languageId": 71 + }, { "filterListId": 935, "languageId": 79 @@ -1347,10 +1383,26 @@ "filterListId": 954, "languageId": 163 }, + { + "filterListId": 955, + "languageId": 163 + }, + { + "filterListId": 956, + "languageId": 110 + }, { "filterListId": 957, "languageId": 122 }, + { + "filterListId": 959, + "languageId": 167 + }, + { + "filterListId": 960, + "languageId": 110 + }, { "filterListId": 963, "languageId": 110 @@ -1363,10 +1415,22 @@ "filterListId": 965, "languageId": 110 }, + { + "filterListId": 966, + "languageId": 79 + }, { "filterListId": 967, "languageId": 110 }, + { + "filterListId": 968, + "languageId": 163 + }, + { + "filterListId": 969, + "languageId": 110 + }, { "filterListId": 970, "languageId": 163 @@ -1391,6 +1455,10 @@ "filterListId": 980, "languageId": 110 }, + { + "filterListId": 981, + "languageId": 110 + }, { "filterListId": 984, "languageId": 163 @@ -1411,10 +1479,22 @@ "filterListId": 989, "languageId": 110 }, + { + "filterListId": 991, + "languageId": 112 + }, + { + "filterListId": 995, + "languageId": 112 + }, { "filterListId": 996, "languageId": 122 }, + { + "filterListId": 997, + "languageId": 167 + }, { "filterListId": 1002, "languageId": 163 @@ -1435,6 +1515,10 @@ "filterListId": 1010, "languageId": 79 }, + { + "filterListId": 1013, + "languageId": 71 + }, { "filterListId": 1014, "languageId": 110 @@ -1443,6 +1527,18 @@ "filterListId": 1015, "languageId": 122 }, + { + "filterListId": 1016, + "languageId": 13 + }, + { + "filterListId": 1017, + "languageId": 110 + }, + { + "filterListId": 1020, + "languageId": 108 + }, { "filterListId": 1021, "languageId": 163 @@ -1451,6 +1547,10 @@ "filterListId": 1022, "languageId": 110 }, + { + "filterListId": 1023, + "languageId": 79 + }, { "filterListId": 1024, "languageId": 163 @@ -1487,10 +1587,22 @@ "filterListId": 1034, "languageId": 79 }, + { + "filterListId": 1035, + "languageId": 79 + }, { "filterListId": 1038, "languageId": 110 }, + { + "filterListId": 1040, + "languageId": 13 + }, + { + "filterListId": 1041, + "languageId": 79 + }, { "filterListId": 1042, "languageId": 122 @@ -1503,6 +1615,18 @@ "filterListId": 1047, "languageId": 110 }, + { + "filterListId": 1048, + "languageId": 110 + }, + { + "filterListId": 1049, + "languageId": 163 + }, + { + "filterListId": 1053, + "languageId": 13 + }, { "filterListId": 1054, "languageId": 122 @@ -1511,10 +1635,26 @@ "filterListId": 1055, "languageId": 163 }, + { + "filterListId": 1056, + "languageId": 71 + }, + { + "filterListId": 1058, + "languageId": 110 + }, + { + "filterListId": 1060, + "languageId": 108 + }, { "filterListId": 1064, "languageId": 110 }, + { + "filterListId": 1065, + "languageId": 110 + }, { "filterListId": 1067, "languageId": 79 @@ -1523,6 +1663,10 @@ "filterListId": 1069, "languageId": 122 }, + { + "filterListId": 1070, + "languageId": 108 + }, { "filterListId": 1071, "languageId": 83 @@ -1531,10 +1675,18 @@ "filterListId": 1073, "languageId": 122 }, + { + "filterListId": 1080, + "languageId": 110 + }, { "filterListId": 1082, "languageId": 110 }, + { + "filterListId": 1083, + "languageId": 112 + }, { "filterListId": 1086, "languageId": 110 @@ -1575,6 +1727,10 @@ "filterListId": 1099, "languageId": 122 }, + { + "filterListId": 1100, + "languageId": 110 + }, { "filterListId": 1101, "languageId": 110 @@ -1591,6 +1747,10 @@ "filterListId": 1106, "languageId": 141 }, + { + "filterListId": 1118, + "languageId": 110 + }, { "filterListId": 1123, "languageId": 141 @@ -1599,6 +1759,34 @@ "filterListId": 1124, "languageId": 141 }, + { + "filterListId": 1129, + "languageId": 113 + }, + { + "filterListId": 1143, + "languageId": 75 + }, + { + "filterListId": 1143, + "languageId": 105 + }, + { + "filterListId": 1146, + "languageId": 159 + }, + { + "filterListId": 1148, + "languageId": 163 + }, + { + "filterListId": 1149, + "languageId": 87 + }, + { + "filterListId": 1156, + "languageId": 168 + }, { "filterListId": 1160, "languageId": 48 @@ -1611,6 +1799,22 @@ "filterListId": 1164, "languageId": 48 }, + { + "filterListId": 1190, + "languageId": 18 + }, + { + "filterListId": 1191, + "languageId": 18 + }, + { + "filterListId": 1192, + "languageId": 18 + }, + { + "filterListId": 1194, + "languageId": 76 + }, { "filterListId": 1279, "languageId": 11 @@ -1655,4 +1859,4 @@ "filterListId": 1483, "languageId": 141 } -] \ No newline at end of file +] diff --git a/data/Language.json b/data/Language.json index b81367c6f..4b4d7064e 100644 --- a/data/Language.json +++ b/data/Language.json @@ -681,13 +681,13 @@ }, { "id": 71, - "iso6391": "sr", - "iso6392": "srp", - "iso6392B": "srp", - "iso6392T": "srp", - "iso6393": "srp", - "localName": "Српски", - "name": "Serbian" + "iso6391": "sh", + "iso6392": "scr", + "iso6392B": "scr", + "iso6392T": "scr", + "iso6393": "hbs", + "localName": "Srpskohrvatski", + "name": "Serbo-Croatian" }, { "id": 72, @@ -1009,16 +1009,6 @@ "localName": "ᓀᐦᐃᔭᐍᐏᐣ", "name": "Cree" }, - { - "id": 104, - "iso6391": "hr", - "iso6392": "hrv", - "iso6392B": "hrv", - "iso6392T": "hrv", - "iso6393": "hrv", - "localName": "Hrvatski", - "name": "Croatian" - }, { "id": 105, "iso6391": "cs", @@ -1329,16 +1319,6 @@ "localName": "भोजपुरी", "name": "Bihari" }, - { - "id": 136, - "iso6391": "bs", - "iso6392": "bos", - "iso6392B": "bos", - "iso6392T": "bos", - "iso6393": "bos", - "localName": "Bosanski", - "name": "Bosnian" - }, { "id": 137, "iso6391": "fo", @@ -1819,4 +1799,4 @@ "localName": "isiZulu", "name": "Zulu" } -] \ No newline at end of file +] diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx index 0b5fe5633..1ea2652dc 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -26,7 +26,9 @@ import { img25, img26, img27, - img28 + img28, + img29, + img30 } from "./imgs"; interface IProps { @@ -36,7 +38,7 @@ interface IProps { export const SoftwareIcon = (props: IProps) => icons[props.id] ? {icons[props.id].imageTitle} : null; @@ -73,5 +75,7 @@ const icons: { [id: number]: IIcon; } = { 25: { image: img25, imageTitle: "uMatrix" }, 26: { image: img26, imageTitle: "Blokada" }, 27: { image: img27, imageTitle: "hostsmgr" }, - 28: { image: img28, imageTitle: "personalDNSfilter" } + 28: { image: img28, imageTitle: "personalDNSfilter" }, + 29: { image: img27, imageTitle: "Unbound" }, + 30: { image: img28, imageTitle: "BIND" }, }; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/03-AdGuard.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/03-AdGuard.svg new file mode 100644 index 000000000..b9cb8ebd4 --- /dev/null +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/03-AdGuard.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/05-Nano-Adblocker.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/05-Nano-Adblocker.png index fafeee28b..cd2b2a06d 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/05-Nano-Adblocker.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/05-Nano-Adblocker.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/10-Redirector.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/10-Redirector.png index 4f82494e2..33fa33b01 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/10-Redirector.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/10-Redirector.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png index 698665eff..062dcbd76 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.png index ca1a91dca..99c6753a2 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.svg new file mode 100644 index 000000000..3d3bd57f7 --- /dev/null +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.svg @@ -0,0 +1 @@ +NewVortex diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/15-uBlock.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/15-uBlock.svg index 89cb70d56..6488ebb04 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/15-uBlock.svg +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/15-uBlock.svg @@ -15,4 +15,4 @@ style="-inkscape-font-specification:Ubuntu" /> - \ No newline at end of file + diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/16-Internet-Explorer-TPL.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/16-Internet-Explorer-TPL.svg new file mode 100644 index 000000000..69780795f --- /dev/null +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/16-Internet-Explorer-TPL.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/18-FireHOL.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/18-FireHOL.png index d1cdf0739..5db30bb01 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/18-FireHOL.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/18-FireHOL.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png index 493e032c0..bdb2f96a1 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/22-Diversion.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/22-Diversion.png index 52eab56aa..511c8c8cd 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/22-Diversion.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/22-Diversion.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png index cb969fd0f..cfd376114 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png index 197c87bc8..349d5b17e 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.png index e22702d65..8275b2b17 100644 Binary files a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.png and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.svg new file mode 100644 index 000000000..90fd8f734 --- /dev/null +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.svg @@ -0,0 +1,20 @@ + + + +Layer 1 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/29-Unbound.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/29-Unbound.png new file mode 100644 index 000000000..e6100dd8a Binary files /dev/null and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/29-Unbound.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/30-BIND.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/30-BIND.png new file mode 100644 index 000000000..74723afaf Binary files /dev/null and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/30-BIND.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts index deea895cd..c9e038f85 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts @@ -1,6 +1,6 @@ import img1 from "./01-uBlock-Origin.svg"; import img2 from "./02-Adblock-Plus.svg"; -import img3 from "./03-AdGuard.png"; +import img3 from "./03-AdGuard.svg"; import img4 from "./04-DNS66.png"; import img5 from "./05-Nano-Adblocker.png"; import img6 from "./06-AdBlock.png"; @@ -10,9 +10,9 @@ import img10 from "./10-Redirector.png"; import img11 from "./11-Hosts-File-Editor.png"; import img12 from "./12-Gas-Mask.png"; import img13 from "./13-MinerBlock.svg"; -import img14 from "./14-Pi-hole.png"; +import img14 from "./14-Pi-hole.svg"; import img15 from "./15-uBlock.svg"; -import img16 from "./16-Internet-Explorer-TPL.png"; +import img16 from "./16-Internet-Explorer-TPL.svg"; import img17 from "./17-Google-Hit-Hider-by-Domain.png"; import img18 from "./18-FireHOL.png"; import img19 from "./19-Samsung-Knox.png"; @@ -24,7 +24,9 @@ import img24 from "./24-Slimjet.png"; import img25 from "./25-uMatrix.png"; import img26 from "./26-Blokada.png"; import img27 from "./27-hostsmgr.png"; -import img28 from "./28-personalDNSfilter.png"; +import img28 from "./28-personalDNSfilter.svg"; +import img29 from "./29-Unbound.png"; +import img30 from "./30-BIND.png"; export { img1, @@ -53,5 +55,7 @@ export { img25, img26, img27, - img28 + img28, + img29, + img30 };