Polish Character Encoding Fixes

diff --git a/data/conf/charset b/data/conf/charset
index e597bb74ae7be79b2fba641e4a5b34d7bfba5dba..01fd4fcff3f952d4af981a7e6c482542876b9d7f 100644 (file)
--- a/data/conf/charset
+++ b/data/conf/charset
@@ -1,31 +1,73 @@
 [
+       {
+               "tsid": 1048,
+               "onid": 1,
+               "charset": "PL_AUTO",
+               "sid": 4310,
+               "description": "Astra 19.2E TV Trwam"
+       },
+       {
+               "tsid": 1059,
+               "onid": 1,
+               "charset": "PL_AUTO",
+               "sid": 0,
+               "description": "Astra 19.2E TVP"
+       },
+       {
+               "tsid": 1111,
+               "onid": 1,
+               "charset": "PL_AUTO",
+               "sid": 7269,
+               "description": "Astra 19.2E TV Trwam"
+       },
+       {
+               "tsid": 8100,
+               "onid": 156,
+               "charset": "PL_AUTO",
+               "sid": 1500,
+               "description": "Eurobird 9.0E TV Polonia"
+       },
+       {
+               "tsid": 8300,
+               "onid": 156,
+               "charset": "PL_AUTO",
+               "sid": 620,
+               "description": "Eurobird 9.0E TVN International"
+       },
        {
                "tsid": 200,
                "onid": 318,
                "charset": "PL_AUTO",
-               "sid": 13878,
-               "description": "ESP2 NE Polish"
+               "sid": 13834,
+               "description": "Hotbird 13.0 Eutelsat Eurosport PL"
        },
        {
                "tsid": 200,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 13864,
-               "description": "EUROSPORT2 PL"
+               "description": "Hotbird 13.0 Eutelsat Eurosport 2 PL"
        },
        {
                "tsid": 200,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 13865,
-               "description": "Hotbird Eutelsat (Eurosport)"
+               "description": "Hotbird 13.0 Eutelsat Eurosport PL"
+       },
+       {
+               "tsid": 200,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 13878,
+               "description": "Hotbird 13.0 Eutelsat Eurosport 2 NE PL"
        },
        {
                "tsid": 300,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 Animal Planet HD"
+               "description": "Hotbird 13.0 ITI/Nka HD PL"
        },
        {
                "tsid": 400,
@@ -74,28 +116,35 @@
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 13070,
-               "description": "Hotbird 13.0 Cyfra+ ESP HD PL"
+               "description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
+       },
+       {
+               "tsid": 400,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 13080,
+               "description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
        },
        {
                "tsid": 400,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 13081,
-               "description": "EUROSPORT HD"
+               "description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
        },
        {
                "tsid": 400,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 13082,
-               "description": "EUROSPORT HD"
+               "description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
        },
        {
                "tsid": 1000,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 Grupa ITI"
+               "description": "Hotbird 13.0 ITI/Nka TVN"
        },
        {
                "tsid": 1100,
@@ -104,6 +153,27 @@
                "sid": 0,
                "description": "Hotbird 13.0 Cyfra+"
        },
+       {
+               "tsid": 1300,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 0,
+               "description": "Hotbird 13.0 ITI/Nka"
+       },
+       {
+               "tsid": 1400,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 30,
+               "description": "Hotbird 13.0 Nick Junior"
+       },
+       {
+               "tsid": 1400,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 31,
+               "description": "Hotbird 13.0 Nickelodeon HD"
+       },
        {
                "tsid": 1500,
                "onid": 318,
@@ -116,7 +186,7 @@
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 EskaTV, TVN"
+               "description": "Hotbird 13.0 ITI/Nka EskaTV, TVN"
        },
        {
                "tsid": 1800,
@@ -132,6 +202,13 @@
                "sid": 0,
                "description": "Hotbird 13.0 Cyfrowy Polsat"
        },
+       {
+               "tsid": 7700,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 117,
+               "description": "Hotbird 13.0 Hot TV PL"
+       },
        {
                "tsid": 7800,
                "onid": 113,
@@ -150,8 +227,43 @@
                "tsid": 8100,
                "onid": 318,
                "charset": "PL_AUTO",
-               "sid": 0,
-               "description": "Hotbird 13.0 Eutelsat (Universal)"
+               "sid": 14900,
+               "description": "Hotbird 13.0 Eutelsat Sport Klub PL"
+       },
+       {
+               "tsid": 8100,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 14901,
+               "description": "Hotbird 13.0 Eutelsat Universal CE"
+       },
+       {
+               "tsid": 8100,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 14902,
+               "description": "Hotbird 13.0 Eutelsat Sci-Fi CE"
+       },
+       {
+               "tsid": 8100,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 14910,
+               "description": "Hotbird 13.0 Eutelsat Sport Klub PL"
+       },
+       {
+               "tsid": 8100,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 14911,
+               "description": "Hotbird 13.0 Eutelsat Universal CE"
+       },
+       {
+               "tsid": 8100,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 14912,
+               "description": "Hotbird 13.0 Eutelsat Sci-Fi CE"
        },
        {
                "tsid": 11000,
@@ -160,6 +272,20 @@
                "sid": 0,
                "description": "Hotbird 13.0 Cyfra+"
        },
+       {
+               "tsid": 11100,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 4661,
+               "description": "Hotbird 13.0 Eutelsat Wedding TV"
+       },
+       {
+               "tsid": 11200,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 0,
+               "description": "Hotbird 13.0 Polsat Cyfrowy PPV"
+       },
        {
                "tsid": 11400,
                "onid": 318,
@@ -172,7 +298,7 @@
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 BBC HD, ITI"
+               "description": "Hotbird 13.0 ITI/Nka"
        },
        {
                "tsid": 11900,
@@ -182,46 +308,74 @@
                "description": "Hotbird 13.0 Cyfra+"
        },
        {
-               "tsid": 12200,
+               "tsid": 12000,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 Disney Channel Polska, TCM and other"
+               "description": "Hotbird 13.0 Polsat Cyfrowy"
+       },
+       {
+               "tsid": 12200,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 7457,
+               "description": "Hotbird 13.0 Globecast Cartoon Network PL / TCM CE"
+       },
+       {
+               "tsid": 12200,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 7466,
+               "description": "Hotbird 13.0 Globecast Disney Channel PL"
+       },
+       {
+               "tsid": 12200,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 7467,
+               "description": "Hotbird 13.0 Globecast Cartoon Network CE"
+       },
+       {
+               "tsid": 12200,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 7468,
+               "description": "Hotbird 13.0 Globecast TCM CE"
        },
        {
                "tsid": 12800,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 Viacom ... MTV / VH1 Polska"
+               "description": "Hotbird 13.0 Viacom MTV / VH1 Polska"
        },
        {
                "tsid": 13000,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 0,
-               "description": "Hotbird 13.0 BBC Polska, TLC and other"
+               "description": "Hotbird 13.0 Globecast Orange PL"
        },
        {
                "tsid": 13100,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 7322,
-               "description": "TV5 Monde Europe"
+               "description": "Hotbird 13.0 TV5 Monde Europe"
        },
        {
                "tsid": 13100,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 7324,
-               "description": "Hotbird 13.0 Crime and Investigation"
+               "description": "Hotbird 13.0 Crime & Investigation"
        },
        {
                "tsid": 13100,
                "onid": 318,
                "charset": "PL_AUTO",
                "sid": 7325,
-               "description": "Hotbird 13.0 Crime + Investigation"
+               "description": "Hotbird 13.0 Crime & Investigation"
        },
        {
                "tsid": 13200,
@@ -230,6 +384,20 @@
                "sid": 0,
                "description": "Hotbird 13.0 Cyfrowy Polsat"
        },
+       {
+               "tsid": 13400,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 4754,
+               "description": "Hotbird 13.0 TVR"
+       },
+       {
+               "tsid": 15400,
+               "onid": 318,
+               "charset": "PL_AUTO",
+               "sid": 13511,
+               "description": "Hotbird 13.0 Rebel TV"
+       }
        {
                "tsid": 15700,
                "onid": 318,