- LG: added distinction between analog cable and analog antenna channels for legacy binary files (xxMODEL00001.TLL)

- fixed lots of unit tests for LG legacy formats
2026-05-06 14:57:13 +02:00 · 2021-09-05 04:36:56 +02:00
parent 70138d5ac5
commit ef5834fac0
32 changed files with 617 additions and 598 deletions
--- a/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.TLL.out
+++ b/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.TLL.out
--- a/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.csv.in
+++ b/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.csv.in
@@ -1,34 +1,34 @@
-,1,,A-0-2805-0," N-TV",AAT0,
-,2,,A-0-2945-0," S 07",AAT0,
-,3,,A-0-3085-0," S 08",AAT0,
-,4,,A-0-3225-0," ARTE",AAT0,
-,5,,A-0-3365-0,"3 SAT",AAT0,
-,6,,A-0-3505-0,"  ARD",AAT0,
-,7,,A-0-3645-0,"  ZDF",AAT0,
-,8,,A-0-3785-0,"SAT 1",AAT0,
-,9,,A-0-3925-0,"SFB 3",AAT0,
-,10,,A-0-4065-0,"  HSE",AAT0,
-,11,,A-0-4205-0,"  RTL",AAT0,
-,12,,A-0-4345-0,"  QVC",AAT0,
-,13,,A-0-4485-0,"PRO 7",AAT0,
-,14,,A-0-4625-0," KIKA",AAT0,
-,15,,A-0-4765-0," S 12",AAT0,
-,16,,A-0-4905-0,"  VOX",AAT0,
-,17,,A-0-5044-0," S 14",AAT0,
-,18,,A-0-5184-0,"DVIER",AAT0,
-,19,,A-0-5324-0,"  DSF",AAT0,
-,20,,A-0-5465-0," S 17",AAT0,
-,21,,A-0-5605-0,"PHNIX",AAT0,
-,22,,A-0-5745-0," S 19",AAT0,
-,23,,A-0-5885-0," S 20",AAT0,
-,24,,A-0-6065-0,"  N24",AAT0,
-,25,,A-0-6225-0," S 22",AAT0,
-,26,,A-0-6385-0,"TELE5",AAT0,
-,27,,A-0-6705-0,"KABEL",AAT0,
-,28,,A-0-9425-0,"S-RTL",AAT0,
-,29,,A-0-9585-0,"  RTL",AAT0,
-,30,,A-0-9745-0," C 23",AAT0,
-,31,,A-0-14545-0," C 53",AAT0,
+,1,,A-0-2805-0," N-TV",ACT0,
+,2,,A-0-2945-0," S 07",ACT0,
+,3,,A-0-3085-0," S 08",ACT0,
+,4,,A-0-3225-0," ARTE",ACT0,
+,5,,A-0-3365-0,"3 SAT",ACT0,
+,6,,A-0-3505-0,"  ARD",ACT0,
+,7,,A-0-3645-0,"  ZDF",ACT0,
+,8,,A-0-3785-0,"SAT 1",ACT0,
+,9,,A-0-3925-0,"SFB 3",ACT0,
+,10,,A-0-4065-0,"  HSE",ACT0,
+,11,,A-0-4205-0,"  RTL",ACT0,
+,12,,A-0-4345-0,"  QVC",ACT0,
+,13,,A-0-4485-0,"PRO 7",ACT0,
+,14,,A-0-4625-0," KIKA",ACT0,
+,15,,A-0-4765-0," S 12",ACT0,
+,16,,A-0-4905-0,"  VOX",ACT0,
+,17,,A-0-5044-0," S 14",ACT0,
+,18,,A-0-5184-0,"DVIER",ACT0,
+,19,,A-0-5324-0,"  DSF",ACT0,
+,20,,A-0-5465-0," S 17",ACT0,
+,21,,A-0-5605-0,"PHNIX",ACT0,
+,22,,A-0-5745-0," S 19",ACT0,
+,23,,A-0-5885-0," S 20",ACT0,
+,24,,A-0-6065-0,"  N24",ACT0,
+,25,,A-0-6225-0," S 22",ACT0,
+,26,,A-0-6385-0,"TELE5",ACT0,
+,27,,A-0-6705-0,"KABEL",ACT0,
+,28,,A-0-9425-0,"S-RTL",ACT0,
+,29,,A-0-9585-0,"  RTL",ACT0,
+,30,,A-0-9745-0," C 23",ACT0,
+,31,,A-0-14545-0," C 53",ACT0,
 ,1,,C-1-1089-12003-01,"RTL Television",DCT0,
 ,2,,C-1-1089-12020-01,"RTL2",DCT0,
 ,3,,C-1-1089-12040-01,"SUPER RTL",DCT0,
--- a/source/Test.Loader.LG/Binary/LA/TestLA.cs
+++ b/source/Test.Loader.LG/Binary/LA/TestLA.cs
@@ -22,7 +22,7 @@ namespace Test.Loader.LG.Binary
    }

    [TestMethod]
-    public void TestLA7408_Firmware04_20_29()
+    public void TestLA691S_Firmware04_20_29()
    {
      // "DanGmail"
      //this.GenerateTestFiles("LA/xxLA691S-ZA00004");
--- a/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.TLL.out
+++ b/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.TLL.out
--- a/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.csv.in
+++ b/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.csv.in
@@ -1,140 +1,140 @@
-,1,,A-0-2245-0," S 02",AAT0,
+,1,,A-0-2245-0," S 02",ACT0,
+,2,,A-0-2385-0," S 03",ACT0,
+,3,,A-0-2526-0," S 04",ACT0,
+,4,,A-0-2666-0," S 05",ACT0,
+,5,,A-0-2805-0," S 06",ACT0,
+,6,,A-0-2945-0," S 07",ACT0,
+,7,,A-0-3085-0," S 08",ACT0,
+,8,,A-0-3365-0," S 10",ACT0,
+,9,,A-0-3505-0," C 05",ACT0,
+,10,,A-0-3645-0," C 06",ACT0,
+,11,,A-0-3785-0," C 07",ACT0,
+,12,,A-0-3925-0," C 08",ACT0,
+,13,,A-0-4065-0," C 09",ACT0,
+,14,,A-0-4205-0," C 10",ACT0,
+,15,,A-0-4345-0," C 11",ACT0,
+,16,,A-0-4485-0," C 12",ACT0,
+,17,,A-0-4625-0,"EUROS",ACT0,
+,18,,A-0-4765-0," S 12",ACT0,
+,19,,A-0-4905-0," S 13",ACT0,
+,20,,A-0-5045-0," S 14",ACT0,
+,21,,A-0-5185-0," S 15",ACT0,
+,22,,A-0-5325-0," S 16",ACT0,
+,23,,A-0-5465-0," S 17",ACT0,
+,24,,A-0-5605-0," S 18",ACT0,
+,25,,A-0-5745-0," S 19",ACT0,
+,26,,A-0-5885-0," S 20",ACT0,
+,27,,A-0-9585-0," C 22",ACT0,
+,28,,A-0-9745-0," C 23",ACT0,
+,29,,A-0-9905-0," C 24",ACT0,
+,30,,A-0-10065-0," C 25",ACT0,
+,31,,A-0-10225-0," C 26",ACT0,
+,32,,A-0-10385-0," C 27",ACT0,
+,33,,A-0-10545-0," C 28",ACT0,
+,34,,A-0-10705-0," C 29",ACT0,
+,35,,A-0-10865-0," C 30",ACT0,
+,36,,A-0-11025-0," C 31",ACT0,
+,37,,A-0-11185-0," C 32",ACT0,
+,38,,A-0-11345-0," C 33",ACT0,
+,39,,A-0-11505-0," C 34",ACT0,
+,40,,A-0-11665-0," C 35",ACT0,
+,41,,A-0-11825-0," C 36",ACT0,
+,42,,A-0-11985-0," C 37",ACT0,
+,43,,A-0-12145-0," C 38",ACT0,
+,44,,A-0-12305-0," C 39",ACT0,
+,45,,A-0-12465-0," C 40",ACT0,
+,46,,A-0-12625-0," C 41",ACT0,
+,47,,A-0-12785-0," C 42",ACT0,
+,48,,A-0-12945-0," C 43",ACT0,
+,49,,A-0-13105-0," C 44",ACT0,
+,50,,A-0-13265-0," C 45",ACT0,
+,51,,A-0-13425-0," C 46",ACT0,
+,52,,A-0-13585-0," C 47",ACT0,
+,53,,A-0-13745-0," C 48",ACT0,
+,54,,A-0-13905-0," C 49",ACT0,
+,55,,A-0-14065-0," C 50",ACT0,
+,56,,A-0-14225-0," C 51",ACT0,
+,57,,A-0-14385-0," C 52",ACT0,
+,58,,A-0-14545-0," C 53",ACT0,
+,59,,A-0-14705-0," C 54",ACT0,
+,60,,A-0-14865-0," C 55",ACT0,
+,61,,A-0-15025-0," SHOW",ACT0,
+,62,,A-0-15185-0," C 57",ACT0,
+,63,,A-0-15345-0," C 58",ACT0,
+,64,,A-0-15505-0," C 59",ACT0,
+,65,,A-0-15665-0," C 60",ACT0,
+,66,,A-0-15825-0," C 61",ACT0,
+,67,,A-0-15985-0," C 62",ACT0,
+,68,,A-0-16145-0," C 63",ACT0,
+,69,,A-0-16465-0," C 65",ACT0,
 ,1,,A-0-2245-0," S 02",AAT0,
 ,2,,A-0-2385-0," S 03",AAT0,
-,2,,A-0-2385-0," S 03",AAT0,
-,3,,A-0-2526-0," S 04",AAT0,
 ,3,,A-0-2526-0," S 04",AAT0,
 ,4,,A-0-2666-0," S 05",AAT0,
-,4,,A-0-2666-0," S 05",AAT0,
-,5,,A-0-2805-0," S 06",AAT0,
 ,5,,A-0-2805-0," S 06",AAT0,
 ,6,,A-0-2945-0," S 07",AAT0,
-,6,,A-0-2945-0," S 07",AAT0,
-,7,,A-0-3085-0," S 08",AAT0,
 ,7,,A-0-3085-0," S 08",AAT0,
 ,8,,A-0-3365-0," S 10",AAT0,
-,8,,A-0-3365-0," S 10",AAT0,
-,9,,A-0-3505-0," C 05",AAT0,
 ,9,,A-0-3505-0," C 05",AAT0,
 ,10,,A-0-3645-0," C 06",AAT0,
-,10,,A-0-3645-0," C 06",AAT0,
-,11,,A-0-3785-0," C 07",AAT0,
 ,11,,A-0-3785-0," C 07",AAT0,
 ,12,,A-0-3925-0," C 08",AAT0,
-,12,,A-0-3925-0," C 08",AAT0,
-,13,,A-0-4065-0," C 09",AAT0,
 ,13,,A-0-4065-0," C 09",AAT0,
 ,14,,A-0-4205-0," C 10",AAT0,
-,14,,A-0-4205-0," C 10",AAT0,
-,15,,A-0-4345-0," C 11",AAT0,
 ,15,,A-0-4345-0," C 11",AAT0,
 ,16,,A-0-4485-0," C 12",AAT0,
-,16,,A-0-4485-0," C 12",AAT0,
-,17,,A-0-4625-0,"EUROS",AAT0,
 ,17,,A-0-4625-0,"EUROS",AAT0,
 ,18,,A-0-4765-0," S 12",AAT0,
-,18,,A-0-4765-0," S 12",AAT0,
-,19,,A-0-4905-0," S 13",AAT0,
 ,19,,A-0-4905-0," S 13",AAT0,
 ,20,,A-0-5045-0," S 14",AAT0,
-,20,,A-0-5045-0," S 14",AAT0,
-,21,,A-0-5185-0," S 15",AAT0,
 ,21,,A-0-5185-0," S 15",AAT0,
 ,22,,A-0-5325-0," S 16",AAT0,
-,22,,A-0-5325-0," S 16",AAT0,
-,23,,A-0-5465-0," S 17",AAT0,
 ,23,,A-0-5465-0," S 17",AAT0,
 ,24,,A-0-5605-0," S 18",AAT0,
-,24,,A-0-5605-0," S 18",AAT0,
-,25,,A-0-5745-0," S 19",AAT0,
 ,25,,A-0-5745-0," S 19",AAT0,
 ,26,,A-0-5885-0," S 20",AAT0,
-,26,,A-0-5885-0," S 20",AAT0,
-,27,,A-0-9585-0," C 22",AAT0,
 ,27,,A-0-9585-0," C 22",AAT0,
 ,28,,A-0-9745-0," C 23",AAT0,
-,28,,A-0-9745-0," C 23",AAT0,
-,29,,A-0-9905-0," C 24",AAT0,
 ,29,,A-0-9905-0," C 24",AAT0,
 ,30,,A-0-10065-0," C 25",AAT0,
-,30,,A-0-10065-0," C 25",AAT0,
-,31,,A-0-10225-0," C 26",AAT0,
 ,31,,A-0-10225-0," C 26",AAT0,
 ,32,,A-0-10385-0," C 27",AAT0,
-,32,,A-0-10385-0," C 27",AAT0,
-,33,,A-0-10545-0," C 28",AAT0,
 ,33,,A-0-10545-0," C 28",AAT0,
 ,34,,A-0-10705-0," C 29",AAT0,
-,34,,A-0-10705-0," C 29",AAT0,
-,35,,A-0-10865-0," C 30",AAT0,
 ,35,,A-0-10865-0," C 30",AAT0,
 ,36,,A-0-11025-0," C 31",AAT0,
-,36,,A-0-11025-0," C 31",AAT0,
-,37,,A-0-11185-0," C 32",AAT0,
 ,37,,A-0-11185-0," C 32",AAT0,
 ,38,,A-0-11345-0," C 33",AAT0,
-,38,,A-0-11345-0," C 33",AAT0,
-,39,,A-0-11505-0," C 34",AAT0,
 ,39,,A-0-11505-0," C 34",AAT0,
 ,40,,A-0-11665-0," C 35",AAT0,
-,40,,A-0-11665-0," C 35",AAT0,
-,41,,A-0-11825-0," C 36",AAT0,
 ,41,,A-0-11825-0," C 36",AAT0,
 ,42,,A-0-11985-0," C 37",AAT0,
-,42,,A-0-11985-0," C 37",AAT0,
-,43,,A-0-12145-0," C 38",AAT0,
 ,43,,A-0-12145-0," C 38",AAT0,
 ,44,,A-0-12305-0," C 39",AAT0,
-,44,,A-0-12305-0," C 39",AAT0,
-,45,,A-0-12465-0," C 40",AAT0,
 ,45,,A-0-12465-0," C 40",AAT0,
 ,46,,A-0-12625-0," C 41",AAT0,
-,46,,A-0-12625-0," C 41",AAT0,
-,47,,A-0-12785-0," C 42",AAT0,
 ,47,,A-0-12785-0," C 42",AAT0,
 ,48,,A-0-12945-0," C 43",AAT0,
-,48,,A-0-12945-0," C 43",AAT0,
-,49,,A-0-13105-0," C 44",AAT0,
 ,49,,A-0-13105-0," C 44",AAT0,
 ,50,,A-0-13265-0," C 45",AAT0,
-,50,,A-0-13265-0," C 45",AAT0,
-,51,,A-0-13425-0," C 46",AAT0,
 ,51,,A-0-13425-0," C 46",AAT0,
 ,52,,A-0-13585-0," C 47",AAT0,
-,52,,A-0-13585-0," C 47",AAT0,
-,53,,A-0-13745-0," C 48",AAT0,
 ,53,,A-0-13745-0," C 48",AAT0,
 ,54,,A-0-13905-0," C 49",AAT0,
-,54,,A-0-13905-0," C 49",AAT0,
-,55,,A-0-14065-0," C 50",AAT0,
 ,55,,A-0-14065-0," C 50",AAT0,
 ,56,,A-0-14225-0," C 51",AAT0,
-,56,,A-0-14225-0," C 51",AAT0,
-,57,,A-0-14385-0," C 52",AAT0,
 ,57,,A-0-14385-0," C 52",AAT0,
 ,58,,A-0-14545-0," C 53",AAT0,
-,58,,A-0-14545-0," C 53",AAT0,
-,59,,A-0-14705-0," C 54",AAT0,
 ,59,,A-0-14705-0," C 54",AAT0,
 ,60,,A-0-14865-0," C 55",AAT0,
-,60,,A-0-14865-0," C 55",AAT0,
-,61,,A-0-15025-0," SHOW",AAT0,
 ,61,,A-0-15025-0," SHOW",AAT0,
 ,62,,A-0-15185-0," C 57",AAT0,
-,62,,A-0-15185-0," C 57",AAT0,
-,63,,A-0-15345-0," C 58",AAT0,
 ,63,,A-0-15345-0," C 58",AAT0,
 ,64,,A-0-15505-0," C 59",AAT0,
-,64,,A-0-15505-0," C 59",AAT0,
-,65,,A-0-15665-0," C 60",AAT0,
 ,65,,A-0-15665-0," C 60",AAT0,
 ,66,,A-0-15825-0," C 61",AAT0,
-,66,,A-0-15825-0," C 61",AAT0,
-,67,,A-0-15985-0," C 62",AAT0,
 ,67,,A-0-15985-0," C 62",AAT0,
 ,68,,A-0-16145-0," C 63",AAT0,
-,68,,A-0-16145-0," C 63",AAT0,
-,69,,A-0-16465-0," C 65",AAT0,
 ,69,,A-0-16465-0," C 65",AAT0,
 ,1,,C-1-103-10-33,"TVR 1",DCT0,
 ,2,,C-1-103-20-33,"TVR 2",DCT0,
--- a/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.TLL.out
+++ b/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.TLL.out
--- a/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.csv.in
@@ -1,33 +1,33 @@
-,1,,A-0-2806-0," BR 3",AAT0,
-,2,,A-0-2945-0,"   N3",AAT0,
-,3,,A-0-3085-0,"  N24",AAT0,
-,4,,A-0-3225-0,"  VOX",AAT0,
-,5,,A-0-3365-0," S 10",AAT0,
-,6,,A-0-3505-0,"MDR 3",AAT0,
-,7,,A-0-3645-0,"  ARD",AAT0,
-,8,,A-0-3785-0,"  ZDF",AAT0,
-,9,,A-0-3925-0,"PHNIX",AAT0,
-,10,,A-0-4065-0,"SAT 1",AAT0,
-,11,,A-0-4205-0,"PRO 7",AAT0,
-,12,,A-0-4345-0,"  RTL",AAT0,
-,13,,A-0-4485-0,"  HOT",AAT0,
-,14,,A-0-4625-0,"RTL 2",AAT0,
-,15,,A-0-4765-0,"  DSF",AAT0,
-,16,,A-0-4905-0," S 13",AAT0,
-,17,,A-0-5045-0,"DVIER",AAT0,
-,18,,A-0-5185-0," ARTE",AAT0,
-,19,,A-0-5325-0,"KABEL",AAT0,
-,20,,A-0-5465-0," S 17",AAT0,
-,21,,A-0-5605-0,"3 SAT",AAT0,
-,22,,A-0-5745-0," S 19",AAT0,
-,23,,A-0-5885-0," N-TV",AAT0,
-,24,,A-0-6065-0,"S-RTL",AAT0,
-,25,,A-0-6225-0,"TELE5",AAT0,
-,26,,A-0-6385-0," S 23",AAT0,
-,27,,A-0-8305-0,"  QVC",AAT0,
-,28,,A-0-9424-0," KIKA",AAT0,
-,29,,A-0-9584-0," HR 3",AAT0,
-,30,,A-0-9744-0," C 23",AAT0,
+,1,,A-0-2806-0," BR 3",ACT0,
+,2,,A-0-2945-0,"   N3",ACT0,
+,3,,A-0-3085-0,"  N24",ACT0,
+,4,,A-0-3225-0,"  VOX",ACT0,
+,5,,A-0-3365-0," S 10",ACT0,
+,6,,A-0-3505-0,"MDR 3",ACT0,
+,7,,A-0-3645-0,"  ARD",ACT0,
+,8,,A-0-3785-0,"  ZDF",ACT0,
+,9,,A-0-3925-0,"PHNIX",ACT0,
+,10,,A-0-4065-0,"SAT 1",ACT0,
+,11,,A-0-4205-0,"PRO 7",ACT0,
+,12,,A-0-4345-0,"  RTL",ACT0,
+,13,,A-0-4485-0,"  HOT",ACT0,
+,14,,A-0-4625-0,"RTL 2",ACT0,
+,15,,A-0-4765-0,"  DSF",ACT0,
+,16,,A-0-4905-0," S 13",ACT0,
+,17,,A-0-5045-0,"DVIER",ACT0,
+,18,,A-0-5185-0," ARTE",ACT0,
+,19,,A-0-5325-0,"KABEL",ACT0,
+,20,,A-0-5465-0," S 17",ACT0,
+,21,,A-0-5605-0,"3 SAT",ACT0,
+,22,,A-0-5745-0," S 19",ACT0,
+,23,,A-0-5885-0," N-TV",ACT0,
+,24,,A-0-6065-0,"S-RTL",ACT0,
+,25,,A-0-6225-0,"TELE5",ACT0,
+,26,,A-0-6385-0," S 23",ACT0,
+,27,,A-0-8305-0,"  QVC",ACT0,
+,28,,A-0-9424-0," KIKA",ACT0,
+,29,,A-0-9584-0," HR 3",ACT0,
+,30,,A-0-9744-0," C 23",ACT0,
 ,1,,C-61441-10002-50106-01,"Syfy (KD)",DCT0,
 ,2,,C-61441-10002-50703-01,"MTV Dance",DCT0,
 ,3,,C-61441-10002-50704-01,"MTV Brand New",DCT0,
--- a/source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.TLL.out
+++ b/source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.TLL.out
--- a/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.TLL.out
+++ b/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.TLL.out
--- a/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.csv.in
+++ b/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.csv.in
@@ -1,38 +1,38 @@
-,1,,A-0-1185-0," C 02",AAT0,
-,2,,A-0-1705-0," C 04",AAT0,
-,3,,A-0-2225-0," S 02",AAT0,
-,4,,A-0-2385-0," S 03",AAT0,
-,5,,A-0-2545-0," S 04",AAT0,
-,6,,A-0-2705-0," S 05",AAT0,
-,7,,A-0-2865-0," S 06",AAT0,
-,8,,A-0-3025-0," S 08",AAT0,
-,9,,A-0-3185-0," S 09",AAT0,
-,10,,A-0-3505-0," C 06",AAT0,
-,11,,A-0-3665-0," C 07",AAT0,
-,12,,A-0-3985-0," C 09",AAT0,
-,13,,A-0-4145-0," C 10",AAT0,
-,14,,A-0-4465-0," C 12",AAT0,
-,15,,A-0-4625-0," S 11",AAT0,
-,16,,A-0-4785-0," S 12",AAT0,
-,17,,A-0-9905-0," C 24",AAT0,
-,18,,A-0-10225-0," C 26",AAT0,
-,19,,A-0-10545-0," C 28",AAT0,
-,20,,A-0-10865-0," C 30",AAT0,
-,21,,A-0-11825-0," C 36",AAT0,
-,22,,A-0-11985-0," C 37",AAT0,
-,23,,A-0-12305-0," C 39",AAT0,
-,24,,A-0-12625-0," C 41",AAT0,
-,25,,A-0-12945-0," C 43",AAT0,
-,26,,A-0-13265-0," C 45",AAT0,
-,27,,A-0-14065-0," C 50",AAT0,
-,28,,A-0-14385-0," C 52",AAT0,
-,29,,A-0-14705-0," C 54",AAT0,
-,30,,A-0-15025-0," C 56",AAT0,
-,31,,A-0-15345-0," C 58",AAT0,
-,32,,A-0-15825-0," C 61",AAT0,
-,33,,A-0-16145-0," C 63",AAT0,
-,34,,A-0-16465-0," C 65",AAT0,
-,35,,A-0-16785-0," C 67",AAT0,
+,1,,A-0-1185-0," C 02",ACT0,
+,2,,A-0-1705-0," C 04",ACT0,
+,3,,A-0-2225-0," S 02",ACT0,
+,4,,A-0-2385-0," S 03",ACT0,
+,5,,A-0-2545-0," S 04",ACT0,
+,6,,A-0-2705-0," S 05",ACT0,
+,7,,A-0-2865-0," S 06",ACT0,
+,8,,A-0-3025-0," S 08",ACT0,
+,9,,A-0-3185-0," S 09",ACT0,
+,10,,A-0-3505-0," C 06",ACT0,
+,11,,A-0-3665-0," C 07",ACT0,
+,12,,A-0-3985-0," C 09",ACT0,
+,13,,A-0-4145-0," C 10",ACT0,
+,14,,A-0-4465-0," C 12",ACT0,
+,15,,A-0-4625-0," S 11",ACT0,
+,16,,A-0-4785-0," S 12",ACT0,
+,17,,A-0-9905-0," C 24",ACT0,
+,18,,A-0-10225-0," C 26",ACT0,
+,19,,A-0-10545-0," C 28",ACT0,
+,20,,A-0-10865-0," C 30",ACT0,
+,21,,A-0-11825-0," C 36",ACT0,
+,22,,A-0-11985-0," C 37",ACT0,
+,23,,A-0-12305-0," C 39",ACT0,
+,24,,A-0-12625-0," C 41",ACT0,
+,25,,A-0-12945-0," C 43",ACT0,
+,26,,A-0-13265-0," C 45",ACT0,
+,27,,A-0-14065-0," C 50",ACT0,
+,28,,A-0-14385-0," C 52",ACT0,
+,29,,A-0-14705-0," C 54",ACT0,
+,30,,A-0-15025-0," C 56",ACT0,
+,31,,A-0-15345-0," C 58",ACT0,
+,32,,A-0-15825-0," C 61",ACT0,
+,33,,A-0-16145-0," C 63",ACT0,
+,34,,A-0-16465-0," C 65",ACT0,
+,35,,A-0-16785-0," C 67",ACT0,
 ,1,,C-3-1-1-19,"Первый",DCT0,
 ,2,,C-3-1-2-19,"РТР",DCT0,
 ,3,,C-3-1-3-19,"ТВ Центр",DCT0,
--- a/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.TLL.out
+++ b/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.TLL.out
--- a/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.csv.in
@@ -1,37 +1,37 @@
-,1,,A-0-2805-0,"   N3",AAT0,
-,2,,A-0-2946-0,"RTL 2",AAT0,
-,3,,A-0-3085-0," S 08",AAT0,
-,4,,A-0-3225-0," N-TV",AAT0,
-,5,,A-0-3365-0,"  VOX",AAT0,
-,6,,A-0-3505-0,"  ZDF",AAT0,
-,7,,A-0-3646-0," HR 3",AAT0,
-,8,,A-0-3785-0,"  ARD",AAT0,
-,9,,A-0-3925-0," KIKA",AAT0,
-,10,,A-0-4065-0,"SAT 1",AAT0,
-,11,,A-0-4205-0,"  RTL",AAT0,
-,12,,A-0-4345-0," C 11",AAT0,
-,13,,A-0-4485-0,"3 SAT",AAT0,
-,14,,A-0-4626-0," S 11",AAT0,
-,15,,A-0-4765-0,"  DSF",AAT0,
-,16,,A-0-4905-0," S 13",AAT0,
-,17,,A-0-5045-0," S 14",AAT0,
-,18,,A-0-5186-0," S 15",AAT0,
-,19,,A-0-5325-0,"WDR 3",AAT0,
-,20,,A-0-5465-0," ARTE",AAT0,
-,21,,A-0-5605-0,"KABEL",AAT0,
-,22,,A-0-5745-0," S 19",AAT0,
-,23,,A-0-5885-0,"MDR 3",AAT0,
-,24,,A-0-6065-0,"S-RTL",AAT0,
-,25,,A-0-6225-0,"TELE5",AAT0,
-,26,,A-0-6385-0,"DVIER",AAT0,
-,27,,A-0-6544-0," S 24",AAT0,
-,28,,A-0-6705-0,"PHNIX",AAT0,
-,29,,A-0-9425-0," C 21",AAT0,
-,30,,A-0-9585-0,"SWR 3",AAT0,
-,31,,A-0-9746-0," BR 3",AAT0,
-,32,,A-0-9905-0," DMAX",AAT0,
-,33,,A-0-10065-0,"  HOT",AAT0,
-,34,,A-0-10245-0,"  RTL",AAT0,
+,1,,A-0-2805-0,"   N3",ACT0,
+,2,,A-0-2946-0,"RTL 2",ACT0,
+,3,,A-0-3085-0," S 08",ACT0,
+,4,,A-0-3225-0," N-TV",ACT0,
+,5,,A-0-3365-0,"  VOX",ACT0,
+,6,,A-0-3505-0,"  ZDF",ACT0,
+,7,,A-0-3646-0," HR 3",ACT0,
+,8,,A-0-3785-0,"  ARD",ACT0,
+,9,,A-0-3925-0," KIKA",ACT0,
+,10,,A-0-4065-0,"SAT 1",ACT0,
+,11,,A-0-4205-0,"  RTL",ACT0,
+,12,,A-0-4345-0," C 11",ACT0,
+,13,,A-0-4485-0,"3 SAT",ACT0,
+,14,,A-0-4626-0," S 11",ACT0,
+,15,,A-0-4765-0,"  DSF",ACT0,
+,16,,A-0-4905-0," S 13",ACT0,
+,17,,A-0-5045-0," S 14",ACT0,
+,18,,A-0-5186-0," S 15",ACT0,
+,19,,A-0-5325-0,"WDR 3",ACT0,
+,20,,A-0-5465-0," ARTE",ACT0,
+,21,,A-0-5605-0,"KABEL",ACT0,
+,22,,A-0-5745-0," S 19",ACT0,
+,23,,A-0-5885-0,"MDR 3",ACT0,
+,24,,A-0-6065-0,"S-RTL",ACT0,
+,25,,A-0-6225-0,"TELE5",ACT0,
+,26,,A-0-6385-0,"DVIER",ACT0,
+,27,,A-0-6544-0," S 24",ACT0,
+,28,,A-0-6705-0,"PHNIX",ACT0,
+,29,,A-0-9425-0," C 21",ACT0,
+,30,,A-0-9585-0,"SWR 3",ACT0,
+,31,,A-0-9746-0," BR 3",ACT0,
+,32,,A-0-9905-0," DMAX",ACT0,
+,33,,A-0-10065-0,"  HOT",ACT0,
+,34,,A-0-10245-0,"  RTL",ACT0,
 ,1,,C-41985-1051-11100-45,"Das Erste HD",DCT0,1
 ,2,,C-102-1079-11110-42,"ZDF HD",DCT0,1
 ,3,,C-9999-161-12101-48,"RTL Television",DCT0,1
--- a/source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.csv.in
@@ -1,40 +1,40 @@
-,1,,A-0-2805-0,"RTL 2",AAT0,
-,2,,A-0-2946-0," S 07",AAT0,
-,3,,A-0-3085-0,"SAT 1",AAT0,
-,4,,A-0-3225-0,"  N24",AAT0,
-,5,,A-0-3365-0,"  QVC",AAT0,
-,6,,A-0-3505-0,"  ARD",AAT0,
-,7,,A-0-3645-0,"  ZDF",AAT0,
-,8,,A-0-3785-0,"SWR 3",AAT0,
-,9,,A-0-3925-0," C 08",AAT0,
-,10,,A-0-4065-0," ARTE",AAT0,
-,11,,A-0-4205-0," C 10",AAT0,
-,12,,A-0-4345-0,"PHNIX",AAT0,
-,13,,A-0-4485-0," C 12",AAT0,
-,14,,A-0-4625-0," N-TV",AAT0,
-,15,,A-0-4765-0," VIVA",AAT0,
-,16,,A-0-4905-0," S 13",AAT0,
-,17,,A-0-5045-0," S 14",AAT0,
-,18,,A-0-5185-0," S 15",AAT0,
-,19,,A-0-5325-0," S 16",AAT0,
-,20,,A-0-5465-0,"  DSF",AAT0,
-,21,,A-0-5605-0," BR 3",AAT0,
-,22,,A-0-5745-0,"  HSE",AAT0,
-,23,,A-0-5885-0,"DVIER",AAT0,
-,24,,A-0-6065-0," S 21",AAT0,
-,25,,A-0-6225-0," S 22",AAT0,
-,26,,A-0-6385-0," S 23",AAT0,
-,27,,A-0-6545-0," HR 3",AAT0,
-,28,,A-0-6705-0," S 25",AAT0,
-,29,,A-0-9425-0,"WDR 3",AAT0,
-,30,,A-0-9585-0," C 22",AAT0,
-,31,,A-0-9745-0,"  NDR",AAT0,
-,32,,A-0-9905-0," C 24",AAT0,
-,33,,A-0-10065-0," C 25",AAT0,
-,34,,A-0-10225-0," C 26",AAT0,
-,35,,A-0-10385-0," C 27",AAT0,
-,36,,A-0-10545-0,"3 SAT",AAT0,
-,37,,A-0-10705-0," C 29",AAT0,
+,1,,A-0-2805-0,"RTL 2",ACT0,
+,2,,A-0-2946-0," S 07",ACT0,
+,3,,A-0-3085-0,"SAT 1",ACT0,
+,4,,A-0-3225-0,"  N24",ACT0,
+,5,,A-0-3365-0,"  QVC",ACT0,
+,6,,A-0-3505-0,"  ARD",ACT0,
+,7,,A-0-3645-0,"  ZDF",ACT0,
+,8,,A-0-3785-0,"SWR 3",ACT0,
+,9,,A-0-3925-0," C 08",ACT0,
+,10,,A-0-4065-0," ARTE",ACT0,
+,11,,A-0-4205-0," C 10",ACT0,
+,12,,A-0-4345-0,"PHNIX",ACT0,
+,13,,A-0-4485-0," C 12",ACT0,
+,14,,A-0-4625-0," N-TV",ACT0,
+,15,,A-0-4765-0," VIVA",ACT0,
+,16,,A-0-4905-0," S 13",ACT0,
+,17,,A-0-5045-0," S 14",ACT0,
+,18,,A-0-5185-0," S 15",ACT0,
+,19,,A-0-5325-0," S 16",ACT0,
+,20,,A-0-5465-0,"  DSF",ACT0,
+,21,,A-0-5605-0," BR 3",ACT0,
+,22,,A-0-5745-0,"  HSE",ACT0,
+,23,,A-0-5885-0,"DVIER",ACT0,
+,24,,A-0-6065-0," S 21",ACT0,
+,25,,A-0-6225-0," S 22",ACT0,
+,26,,A-0-6385-0," S 23",ACT0,
+,27,,A-0-6545-0," HR 3",ACT0,
+,28,,A-0-6705-0," S 25",ACT0,
+,29,,A-0-9425-0,"WDR 3",ACT0,
+,30,,A-0-9585-0," C 22",ACT0,
+,31,,A-0-9745-0,"  NDR",ACT0,
+,32,,A-0-9905-0," C 24",ACT0,
+,33,,A-0-10065-0," C 25",ACT0,
+,34,,A-0-10225-0," C 26",ACT0,
+,35,,A-0-10385-0," C 27",ACT0,
+,36,,A-0-10545-0,"3 SAT",ACT0,
+,37,,A-0-10705-0," C 29",ACT0,
 ,1,,C-40984-1089-12003-05,"RTL Television",DCT0,
 ,2,,C-40984-1089-12020-05,"RTL 2",DCT0,
 ,3,,C-40984-1089-12040-05,"Super RTL",DCT0,
--- a/source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.csv.in
@@ -1,33 +1,33 @@
-,1,,A-0-2805-0," S 06",AAT0,
-,2,,A-0-2945-0,"  RTL",AAT0,
-,3,,A-0-3085-0,"SAT 1",AAT0,
-,4,,A-0-3225-0,"  QVC",AAT0,
-,5,,A-0-3365-0,"NED 2",AAT0,
-,6,,A-0-3505-0,"  ARD",AAT0,
-,7,,A-0-3645-0,"  ZDF",AAT0,
-,8,,A-0-3785-0,"WDR 3",AAT0,
-,9,,A-0-3925-0,"  VOX",AAT0,
-,10,,A-0-4065-0," KIKA",AAT0,
-,11,,A-0-4205-0,"3 SAT",AAT0,
-,12,,A-0-4345-0,"PHNIX",AAT0,
-,13,,A-0-4485-0," N-TV",AAT0,
-,14,,A-0-4625-0," S 11",AAT0,
-,15,,A-0-4765-0," S 12",AAT0,
-,16,,A-0-4905-0,"EUROS",AAT0,
-,17,,A-0-5045-0," S 14",AAT0,
-,18,,A-0-5185-0,"S-RTL",AAT0,
-,19,,A-0-5325-0,"KABEL",AAT0,
-,20,,A-0-5465-0,"  N24",AAT0,
-,21,,A-0-5605-0," S 18",AAT0,
-,22,,A-0-5745-0,"RTL 2",AAT0,
-,23,,A-0-5885-0," ARTE",AAT0,
-,24,,A-0-6065-0," BR 3",AAT0,
-,25,,A-0-6225-0,"TELE5",AAT0,
-,26,,A-0-6385-0,"  DSF",AAT0,
-,27,,A-0-6545-0," S 24",AAT0,
-,28,,A-0-6705-0,"DVIER",AAT0,
-,29,,A-0-9425-0,"  NDR",AAT0,
-,30,,A-0-9585-0,"  HSE",AAT0,
+,1,,A-0-2805-0," S 06",ACT0,
+,2,,A-0-2945-0,"  RTL",ACT0,
+,3,,A-0-3085-0,"SAT 1",ACT0,
+,4,,A-0-3225-0,"  QVC",ACT0,
+,5,,A-0-3365-0,"NED 2",ACT0,
+,6,,A-0-3505-0,"  ARD",ACT0,
+,7,,A-0-3645-0,"  ZDF",ACT0,
+,8,,A-0-3785-0,"WDR 3",ACT0,
+,9,,A-0-3925-0,"  VOX",ACT0,
+,10,,A-0-4065-0," KIKA",ACT0,
+,11,,A-0-4205-0,"3 SAT",ACT0,
+,12,,A-0-4345-0,"PHNIX",ACT0,
+,13,,A-0-4485-0," N-TV",ACT0,
+,14,,A-0-4625-0," S 11",ACT0,
+,15,,A-0-4765-0," S 12",ACT0,
+,16,,A-0-4905-0,"EUROS",ACT0,
+,17,,A-0-5045-0," S 14",ACT0,
+,18,,A-0-5185-0,"S-RTL",ACT0,
+,19,,A-0-5325-0,"KABEL",ACT0,
+,20,,A-0-5465-0,"  N24",ACT0,
+,21,,A-0-5605-0," S 18",ACT0,
+,22,,A-0-5745-0,"RTL 2",ACT0,
+,23,,A-0-5885-0," ARTE",ACT0,
+,24,,A-0-6065-0," BR 3",ACT0,
+,25,,A-0-6225-0,"TELE5",ACT0,
+,26,,A-0-6385-0,"  DSF",ACT0,
+,27,,A-0-6545-0," S 24",ACT0,
+,28,,A-0-6705-0,"DVIER",ACT0,
+,29,,A-0-9425-0,"  NDR",ACT0,
+,30,,A-0-9585-0,"  HSE",ACT0,
 ,1,,C-41985-1051-11100-31,"Das Erste HD",DCT0,
 ,2,,C-102-1079-11110-33,"ZDF HD",DCT0,
 ,3,,C-9999-331-33101-20,"RTL HD",DCT0,
--- a/source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.csv.in
@@ -1,40 +1,40 @@
-,1,,A-0-1800-0," S 45",AAT0,
-,2,,A-0-2665-0," S 05",AAT0,
-,3,,A-0-2805-0," S 06",AAT0,
-,4,,A-0-2945-0," S 07",AAT0,
-,5,,A-0-3085-0," S 08",AAT0,
-,6,,A-0-3225-0," S 09",AAT0,
-,7,,A-0-3505-0," C 05",AAT0,
-,8,,A-0-3785-0," C 07",AAT0,
-,9,,A-0-3925-0," C 08",AAT0,
-,10,,A-0-4205-0," C 10",AAT0,
-,11,,A-0-4625-0," S 11",AAT0,
-,12,,A-0-5325-0," S 16",AAT0,
-,13,,A-0-5465-0," S 17",AAT0,
-,14,,A-0-5745-0," S 19",AAT0,
-,15,,A-0-5885-0," S 20",AAT0,
-,16,,A-0-6705-0," S 25",AAT0,
-,17,,A-0-6865-0," S 26",AAT0,
-,18,,A-0-7345-0," S 29",AAT0,
-,19,,A-0-7505-0," S 30",AAT0,
-,20,,A-0-7825-0," S 32",AAT0,
-,21,,A-0-7985-0," S 33",AAT0,
-,22,,A-0-8145-0," S 34",AAT0,
-,23,,A-0-8305-0," S 35",AAT0,
-,24,,A-0-9585-0," C 22",AAT0,
-,25,,A-0-10065-0," C 25",AAT0,
-,26,,A-0-10225-0," C 26",AAT0,
-,27,,A-0-10545-0," C 28",AAT0,
-,28,,A-0-11025-0," C 31",AAT0,
-,29,,A-0-11505-0," C 34",AAT0,
-,30,,A-0-12305-0," C 39",AAT0,
-,31,,A-0-12785-0," C 42",AAT0,
-,32,,A-0-12945-0," C 43",AAT0,
-,33,,A-0-13265-0," C 45",AAT0,
-,34,,A-0-13585-0," C 47",AAT0,
-,35,,A-0-13905-0," C 49",AAT0,
-,36,,A-0-14065-0," C 50",AAT0,
-,37,,A-0-15020-0," C 56",AAT0,
+,1,,A-0-1800-0," S 45",ACT0,
+,2,,A-0-2665-0," S 05",ACT0,
+,3,,A-0-2805-0," S 06",ACT0,
+,4,,A-0-2945-0," S 07",ACT0,
+,5,,A-0-3085-0," S 08",ACT0,
+,6,,A-0-3225-0," S 09",ACT0,
+,7,,A-0-3505-0," C 05",ACT0,
+,8,,A-0-3785-0," C 07",ACT0,
+,9,,A-0-3925-0," C 08",ACT0,
+,10,,A-0-4205-0," C 10",ACT0,
+,11,,A-0-4625-0," S 11",ACT0,
+,12,,A-0-5325-0," S 16",ACT0,
+,13,,A-0-5465-0," S 17",ACT0,
+,14,,A-0-5745-0," S 19",ACT0,
+,15,,A-0-5885-0," S 20",ACT0,
+,16,,A-0-6705-0," S 25",ACT0,
+,17,,A-0-6865-0," S 26",ACT0,
+,18,,A-0-7345-0," S 29",ACT0,
+,19,,A-0-7505-0," S 30",ACT0,
+,20,,A-0-7825-0," S 32",ACT0,
+,21,,A-0-7985-0," S 33",ACT0,
+,22,,A-0-8145-0," S 34",ACT0,
+,23,,A-0-8305-0," S 35",ACT0,
+,24,,A-0-9585-0," C 22",ACT0,
+,25,,A-0-10065-0," C 25",ACT0,
+,26,,A-0-10225-0," C 26",ACT0,
+,27,,A-0-10545-0," C 28",ACT0,
+,28,,A-0-11025-0," C 31",ACT0,
+,29,,A-0-11505-0," C 34",ACT0,
+,30,,A-0-12305-0," C 39",ACT0,
+,31,,A-0-12785-0," C 42",ACT0,
+,32,,A-0-12945-0," C 43",ACT0,
+,33,,A-0-13265-0," C 45",ACT0,
+,34,,A-0-13585-0," C 47",ACT0,
+,35,,A-0-13905-0," C 49",ACT0,
+,36,,A-0-14065-0," C 50",ACT0,
+,37,,A-0-15020-0," C 56",ACT0,
 ,36,,C-54-64-1400-81,"Aljazeera",DCT0,
 ,37,,C-54-64-928-81,"BNT World",DCT0,
 ,38,,C-54-64-922-81,"Cubavisión Internacional",DCT0,
--- a/source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.csv.in
+++ b/source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.csv.in
@@ -1,41 +1,41 @@
-,1,,A-0-3645-0," C 06",AAT0,
-,2,,A-0-3785-0,"ORF 1",AAT0,
-,3,,A-0-3925-0," C 08",AAT0,
-,4,,A-0-4065-0," C 09",AAT0,
-,5,,A-0-4205-0," C 10",AAT0,
-,6,,A-0-4345-0,"ORF 2",AAT0,
-,7,,A-0-4765-0,"  VOX",AAT0,
-,8,,A-0-4905-0,"RAI 1",AAT0,
-,9,,A-0-5045-0," S 14",AAT0,
-,10,,A-0-5185-0," KIKA",AAT0,
-,11,,A-0-5325-0," N-TV",AAT0,
-,12,,A-0-5465-0," S 17",AAT0,
-,13,,A-0-5605-0," TV 5",AAT0,
-,14,,A-0-5745-0,"MDR 3",AAT0,
-,15,,A-0-5885-0," S 20",AAT0,
-,16,,A-0-9425-0," ARTE",AAT0,
-,17,,A-0-9585-0,"  ZDF",AAT0,
-,18,,A-0-9745-0," C 23",AAT0,
-,19,,A-0-10065-0,"  HSE",AAT0,
-,20,,A-0-10225-0,"  ARD",AAT0,
-,21,,A-0-10385-0," C 27",AAT0,
-,22,,A-0-10545-0," C 28",AAT0,
-,23,,A-0-10705-0,"TRT-1",AAT0,
-,24,,A-0-10865-0," C 30",AAT0,
-,25,,A-0-11025-0,"SWR 3",AAT0,
-,26,,A-0-12465-0," C 40",AAT0,
-,27,,A-0-12785-0,"KABEL",AAT0,
-,28,,A-0-13105-0," C 44",AAT0,
-,29,,A-0-13745-0,"  RTL",AAT0,
-,30,,A-0-14065-0,"3 SAT",AAT0,
-,31,,A-0-14385-0,"RTL 2",AAT0,
-,32,,A-0-14705-0," BR 3",AAT0,
-,33,,A-0-14865-0,"  QVC",AAT0,
-,34,,A-0-15025-0,"PRO 7",AAT0,
-,35,,A-0-15185-0," C 57",AAT0,
-,36,,A-0-15345-0," C 58",AAT0,
-,37,,A-0-15665-0,"  DSF",AAT0,
-,38,,A-0-15985-0," C 62",AAT0,
+,1,,A-0-3645-0," C 06",ACT0,
+,2,,A-0-3785-0,"ORF 1",ACT0,
+,3,,A-0-3925-0," C 08",ACT0,
+,4,,A-0-4065-0," C 09",ACT0,
+,5,,A-0-4205-0," C 10",ACT0,
+,6,,A-0-4345-0,"ORF 2",ACT0,
+,7,,A-0-4765-0,"  VOX",ACT0,
+,8,,A-0-4905-0,"RAI 1",ACT0,
+,9,,A-0-5045-0," S 14",ACT0,
+,10,,A-0-5185-0," KIKA",ACT0,
+,11,,A-0-5325-0," N-TV",ACT0,
+,12,,A-0-5465-0," S 17",ACT0,
+,13,,A-0-5605-0," TV 5",ACT0,
+,14,,A-0-5745-0,"MDR 3",ACT0,
+,15,,A-0-5885-0," S 20",ACT0,
+,16,,A-0-9425-0," ARTE",ACT0,
+,17,,A-0-9585-0,"  ZDF",ACT0,
+,18,,A-0-9745-0," C 23",ACT0,
+,19,,A-0-10065-0,"  HSE",ACT0,
+,20,,A-0-10225-0,"  ARD",ACT0,
+,21,,A-0-10385-0," C 27",ACT0,
+,22,,A-0-10545-0," C 28",ACT0,
+,23,,A-0-10705-0,"TRT-1",ACT0,
+,24,,A-0-10865-0," C 30",ACT0,
+,25,,A-0-11025-0,"SWR 3",ACT0,
+,26,,A-0-12465-0," C 40",ACT0,
+,27,,A-0-12785-0,"KABEL",ACT0,
+,28,,A-0-13105-0," C 44",ACT0,
+,29,,A-0-13745-0,"  RTL",ACT0,
+,30,,A-0-14065-0,"3 SAT",ACT0,
+,31,,A-0-14385-0,"RTL 2",ACT0,
+,32,,A-0-14705-0," BR 3",ACT0,
+,33,,A-0-14865-0,"  QVC",ACT0,
+,34,,A-0-15025-0,"PRO 7",ACT0,
+,35,,A-0-15185-0," C 57",ACT0,
+,36,,A-0-15345-0," C 58",ACT0,
+,37,,A-0-15665-0,"  DSF",ACT0,
+,38,,A-0-15985-0," C 62",ACT0,
 ,101,,C-1537-1-1001-04,"ORF eins",DCT0,
 ,102,,C-1537-1-1002-04,"ORF 2 Wien",DCT0,
 ,103,,C-1537-3-3008-06,"ATV",DCT0,
--- a/source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.csv.in
@@ -1,40 +1,40 @@
-,1,,A-0-2806-0,"  VOX",AAT0,
-,2,,A-0-2946-0," VIVA",AAT0,
-,3,,A-0-3085-0,"  DSF",AAT0,
-,4,,A-0-3225-0," BR 3",AAT0,
-,5,,A-0-3365-0,"ORF 1",AAT0,
-,6,,A-0-3505-0,"  ARD",AAT0,
-,7,,A-0-3645-0,"  ZDF",AAT0,
-,8,,A-0-3785-0,"SWR 3",AAT0,
-,9,,A-0-3925-0," C 08",AAT0,
-,10,,A-0-4065-0,"  RTL",AAT0,
-,11,,A-0-4205-0,"SAT 1",AAT0,
-,12,,A-0-4345-0,"PRO 7",AAT0,
-,13,,A-0-4485-0,"KABEL",AAT0,
-,14,,A-0-4625-0," S 11",AAT0,
-,15,,A-0-4765-0,"S-RTL",AAT0,
-,16,,A-0-4905-0,"RTL 2",AAT0,
-,17,,A-0-5045-0,"EUROS",AAT0,
-,18,,A-0-5185-0," S 15",AAT0,
-,19,,A-0-5325-0," N-TV",AAT0,
-,20,,A-0-5465-0," DMAX",AAT0,
-,21,,A-0-5605-0," TM 3",AAT0,
-,22,,A-0-5745-0,"  HSE",AAT0,
-,23,,A-0-5885-0,"VIVA2",AAT0,
-,24,,A-0-6065-0," S 21",AAT0,
-,25,,A-0-6225-0," S 22",AAT0,
-,26,,A-0-6385-0,"  QVC",AAT0,
-,27,,A-0-6545-0,"  RTL",AAT0,
-,28,,A-0-6705-0,"  N24",AAT0,
-,29,,A-0-9425-0,"PHNIX",AAT0,
-,30,,A-0-9585-0," KIKA",AAT0,
-,31,,A-0-9745-0,"3 SAT",AAT0,
-,32,,A-0-9905-0," ARTE",AAT0,
-,33,,A-0-10065-0," NICK",AAT0,
-,34,,A-0-10225-0," C 26",AAT0,
-,35,,A-0-10385-0,"WDR 3",AAT0,
-,36,,A-0-10545-0," C 28",AAT0,
-,37,,A-0-10705-0," C 29",AAT0,
+,1,,A-0-2806-0,"  VOX",ACT0,
+,2,,A-0-2946-0," VIVA",ACT0,
+,3,,A-0-3085-0,"  DSF",ACT0,
+,4,,A-0-3225-0," BR 3",ACT0,
+,5,,A-0-3365-0,"ORF 1",ACT0,
+,6,,A-0-3505-0,"  ARD",ACT0,
+,7,,A-0-3645-0,"  ZDF",ACT0,
+,8,,A-0-3785-0,"SWR 3",ACT0,
+,9,,A-0-3925-0," C 08",ACT0,
+,10,,A-0-4065-0,"  RTL",ACT0,
+,11,,A-0-4205-0,"SAT 1",ACT0,
+,12,,A-0-4345-0,"PRO 7",ACT0,
+,13,,A-0-4485-0,"KABEL",ACT0,
+,14,,A-0-4625-0," S 11",ACT0,
+,15,,A-0-4765-0,"S-RTL",ACT0,
+,16,,A-0-4905-0,"RTL 2",ACT0,
+,17,,A-0-5045-0,"EUROS",ACT0,
+,18,,A-0-5185-0," S 15",ACT0,
+,19,,A-0-5325-0," N-TV",ACT0,
+,20,,A-0-5465-0," DMAX",ACT0,
+,21,,A-0-5605-0," TM 3",ACT0,
+,22,,A-0-5745-0,"  HSE",ACT0,
+,23,,A-0-5885-0,"VIVA2",ACT0,
+,24,,A-0-6065-0," S 21",ACT0,
+,25,,A-0-6225-0," S 22",ACT0,
+,26,,A-0-6385-0,"  QVC",ACT0,
+,27,,A-0-6545-0,"  RTL",ACT0,
+,28,,A-0-6705-0,"  N24",ACT0,
+,29,,A-0-9425-0,"PHNIX",ACT0,
+,30,,A-0-9585-0," KIKA",ACT0,
+,31,,A-0-9745-0,"3 SAT",ACT0,
+,32,,A-0-9905-0," ARTE",ACT0,
+,33,,A-0-10065-0," NICK",ACT0,
+,34,,A-0-10225-0," C 26",ACT0,
+,35,,A-0-10385-0,"WDR 3",ACT0,
+,36,,A-0-10545-0," C 28",ACT0,
+,37,,A-0-10705-0," C 29",ACT0,
 ,1,,C-133-2-10-01,"Sky Cinema",DCT0,
 ,2,,C-133-2-11-01,"Sky Cinema +1",DCT0,
 ,3,,C-133-2-43-01,"Sky Cinema +24",DCT0,
--- a/source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.csv.in
@@ -1,33 +1,33 @@
-,1,,A-0-3645-0,"  ARD",AAT0,
-,2,,A-0-3505-0,"  ZDF",AAT0,
-,3,,A-0-9425-0," BR 3",AAT0,
-,4,,A-0-4065-0,"TVA  ",AAT0,
-,5,,A-0-4205-0,"RTL  ",AAT0,
-,6,,A-0-2945-0,"SAT 1",AAT0,
-,7,,A-0-4625-0,"PRO 7",AAT0,
-,8,,A-0-3085-0,"RTL 2",AAT0,
-,9,,A-0-3365-0,"KABEL",AAT0,
-,10,,A-0-5465-0,"  VOX",AAT0,
-,11,,A-0-6385-0,"TELE5",AAT0,
-,12,,A-0-3925-0,"SIXX ",AAT0,
-,13,,A-0-5885-0," KIKA",AAT0,
-,14,,A-0-4765-0,"S-RTL",AAT0,
-,15,,A-0-6225-0,"NICK+",AAT0,
-,16,,A-0-4485-0,"VIVA ",AAT0,
-,17,,A-0-5605-0," N-TV",AAT0,
-,18,,A-0-6065-0,"  N24",AAT0,
-,19,,A-0-5045-0,"PHNIX",AAT0,
-,20,,A-0-5185-0,"CNN  ",AAT0,
-,21,,A-0-9745-0,"EURSP",AAT0,
-,22,,A-0-4345-0,"SPOR1",AAT0,
-,23,,A-0-3785-0,"MDR 3",AAT0,
-,24,,A-0-9585-0,"ORF2 ",AAT0,
-,25,,A-0-5325-0,"3 SAT",AAT0,
-,26,,A-0-3225-0," ARTE",AAT0,
-,27,,A-0-5745-0," BR-A",AAT0,
-,28,,A-0-2805-0,"SERTV",AAT0,
-,29,,A-0-4905-0,"  HSE",AAT0,
-,30,,A-0-8305-0,"  QVC",AAT0,
+,1,,A-0-3645-0,"  ARD",ACT0,
+,2,,A-0-3505-0,"  ZDF",ACT0,
+,3,,A-0-9425-0," BR 3",ACT0,
+,4,,A-0-4065-0,"TVA  ",ACT0,
+,5,,A-0-4205-0,"RTL  ",ACT0,
+,6,,A-0-2945-0,"SAT 1",ACT0,
+,7,,A-0-4625-0,"PRO 7",ACT0,
+,8,,A-0-3085-0,"RTL 2",ACT0,
+,9,,A-0-3365-0,"KABEL",ACT0,
+,10,,A-0-5465-0,"  VOX",ACT0,
+,11,,A-0-6385-0,"TELE5",ACT0,
+,12,,A-0-3925-0,"SIXX ",ACT0,
+,13,,A-0-5885-0," KIKA",ACT0,
+,14,,A-0-4765-0,"S-RTL",ACT0,
+,15,,A-0-6225-0,"NICK+",ACT0,
+,16,,A-0-4485-0,"VIVA ",ACT0,
+,17,,A-0-5605-0," N-TV",ACT0,
+,18,,A-0-6065-0,"  N24",ACT0,
+,19,,A-0-5045-0,"PHNIX",ACT0,
+,20,,A-0-5185-0,"CNN  ",ACT0,
+,21,,A-0-9745-0,"EURSP",ACT0,
+,22,,A-0-4345-0,"SPOR1",ACT0,
+,23,,A-0-3785-0,"MDR 3",ACT0,
+,24,,A-0-9585-0,"ORF2 ",ACT0,
+,25,,A-0-5325-0,"3 SAT",ACT0,
+,26,,A-0-3225-0," ARTE",ACT0,
+,27,,A-0-5745-0," BR-A",ACT0,
+,28,,A-0-2805-0,"SERTV",ACT0,
+,29,,A-0-4905-0,"  HSE",ACT0,
+,30,,A-0-8305-0,"  QVC",ACT0,
 ,1,,C-61441-10014-11120-06,"arte HD",DCT0,
 ,2,,C-61441-10014-50009-06,"kabel eins HD",DCT0,
 ,3,,C-61441-10014-50010-06,"SPORT1 HD",DCT0,
--- a/source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.csv.in
@@ -1,30 +1,30 @@
-,1,,A-0-2945-0,"  RTL",AAT0,1
-,2,,A-0-3085-0,"SAT 1",AAT0,1
-,3,,A-0-4625-0,"PRO 7",AAT0,1
-,4,,A-0-4765-0,"RTL 2",AAT0,1
-,5,,A-0-4905-0,"KABEL",AAT0,1
-,6,,A-0-3365-0,"  DSF",AAT0,
-,7,,A-0-3645-0,"  ZDF",AAT0,
-,8,,A-0-3785-0,"  NDR",AAT0,
-,9,,A-0-3925-0,"  VOX",AAT0,
-,10,,A-0-4065-0," KIKA",AAT0,
-,11,,A-0-4205-0,"3 SAT",AAT0,
-,12,,A-0-4345-0,"  N24",AAT0,
-,13,,A-0-4485-0,"PHNIX",AAT0,
-,14,,A-0-5045-0,"S-RTL",AAT0,
-,15,,A-0-5185-0,"TELE5",AAT0,
-,16,,A-0-5325-0," N-TV",AAT0,
-,17,,A-0-5465-0," S 17",AAT0,
-,18,,A-0-5605-0," S 18",AAT0,
-,19,,A-0-5745-0," S 19",AAT0,
-,20,,A-0-5885-0," S 20",AAT0,
-,21,,A-0-6065-0,"  RTL",AAT0,
-,22,,A-0-6225-0,"  BBC",AAT0,
-,23,,A-0-6385-0," S 23",AAT0,
-,24,,A-0-8305-0,"  QVC",AAT0,
-,25,,A-0-9425-0,"EUROS",AAT0,
-,26,,A-0-9585-0,"MDR 3",AAT0,
-,27,,A-0-9745-0,"WDR 3",AAT0,
+,1,,A-0-2945-0,"  RTL",ACT0,1
+,2,,A-0-3085-0,"SAT 1",ACT0,1
+,3,,A-0-4625-0,"PRO 7",ACT0,1
+,4,,A-0-4765-0,"RTL 2",ACT0,1
+,5,,A-0-4905-0,"KABEL",ACT0,1
+,6,,A-0-3365-0,"  DSF",ACT0,
+,7,,A-0-3645-0,"  ZDF",ACT0,
+,8,,A-0-3785-0,"  NDR",ACT0,
+,9,,A-0-3925-0,"  VOX",ACT0,
+,10,,A-0-4065-0," KIKA",ACT0,
+,11,,A-0-4205-0,"3 SAT",ACT0,
+,12,,A-0-4345-0,"  N24",ACT0,
+,13,,A-0-4485-0,"PHNIX",ACT0,
+,14,,A-0-5045-0,"S-RTL",ACT0,
+,15,,A-0-5185-0,"TELE5",ACT0,
+,16,,A-0-5325-0," N-TV",ACT0,
+,17,,A-0-5465-0," S 17",ACT0,
+,18,,A-0-5605-0," S 18",ACT0,
+,19,,A-0-5745-0," S 19",ACT0,
+,20,,A-0-5885-0," S 20",ACT0,
+,21,,A-0-6065-0,"  RTL",ACT0,
+,22,,A-0-6225-0,"  BBC",ACT0,
+,23,,A-0-6385-0," S 23",ACT0,
+,24,,A-0-8305-0,"  QVC",ACT0,
+,25,,A-0-9425-0,"EUROS",ACT0,
+,26,,A-0-9585-0,"MDR 3",ACT0,
+,27,,A-0-9745-0,"WDR 3",ACT0,
 ,1,,C-61441-10002-50106-01,"Syfy (KD)",DCT0,
 ,2,,C-61441-10002-50703-01,"-",DCT0,
 ,3,,C-61441-10002-50704-01,"MTV Brand New",DCT0,
--- a/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.TLL.out
+++ b/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.TLL.out
--- a/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.csv.in
@@ -1,34 +1,34 @@
-,1,,A-0-2804-0,"KABEL",AAT0,
-,2,,A-0-2945-0," S 07",AAT0,
-,3,,A-0-3085-0,"  RTL",AAT0,
-,4,,A-0-3224-0," S 09",AAT0,
-,5,,A-0-3364-0,"  HOT",AAT0,
-,6,,A-0-3504-0," DMAX",AAT0,
-,7,,A-0-3644-0,"SFB 3",AAT0,
-,8,,A-0-3785-0,"PHNIX",AAT0,
-,9,,A-0-3924-0,"  ZDF",AAT0,
-,10,,A-0-4064-0,"SAT 1",AAT0,
-,11,,A-0-4205-0,"  ARD",AAT0,
-,12,,A-0-4345-0,"  RTL",AAT0,
-,13,,A-0-4485-0,"QVC D",AAT0,
-,14,,A-0-4625-0,"  VOX",AAT0,
-,15,,A-0-4765-0," S 12",AAT0,
-,16,,A-0-4905-0,"RTL 2",AAT0,
-,17,,A-0-5044-0,"  BBC",AAT0,
-,18,,A-0-5185-0," KIKA",AAT0,
-,19,,A-0-5324-0,"TELE5",AAT0,
-,20,,A-0-5465-0,"DVIER",AAT0,
-,21,,A-0-5605-0," S 18",AAT0,
-,22,,A-0-5744-0,"  N24",AAT0,
-,23,,A-0-5885-0,"PRO 7",AAT0,
-,24,,A-0-6064-0,"S-RTL",AAT0,
-,25,,A-0-6225-0," N-TV",AAT0,
-,26,,A-0-6384-0,"  DSF",AAT0,
-,27,,A-0-9425-0," ARTE",AAT0,
-,28,,A-0-9584-0," C 22",AAT0,
-,29,,A-0-9745-0," TV 5",AAT0,
-,30,,A-0-9904-0," C 24",AAT0,
-,31,,A-0-10065-0," C 25",AAT0,
+,1,,A-0-2804-0,"KABEL",ACT0,
+,2,,A-0-2945-0," S 07",ACT0,
+,3,,A-0-3085-0,"  RTL",ACT0,
+,4,,A-0-3224-0," S 09",ACT0,
+,5,,A-0-3364-0,"  HOT",ACT0,
+,6,,A-0-3504-0," DMAX",ACT0,
+,7,,A-0-3644-0,"SFB 3",ACT0,
+,8,,A-0-3785-0,"PHNIX",ACT0,
+,9,,A-0-3924-0,"  ZDF",ACT0,
+,10,,A-0-4064-0,"SAT 1",ACT0,
+,11,,A-0-4205-0,"  ARD",ACT0,
+,12,,A-0-4345-0,"  RTL",ACT0,
+,13,,A-0-4485-0,"QVC D",ACT0,
+,14,,A-0-4625-0,"  VOX",ACT0,
+,15,,A-0-4765-0," S 12",ACT0,
+,16,,A-0-4905-0,"RTL 2",ACT0,
+,17,,A-0-5044-0,"  BBC",ACT0,
+,18,,A-0-5185-0," KIKA",ACT0,
+,19,,A-0-5324-0,"TELE5",ACT0,
+,20,,A-0-5465-0,"DVIER",ACT0,
+,21,,A-0-5605-0," S 18",ACT0,
+,22,,A-0-5744-0,"  N24",ACT0,
+,23,,A-0-5885-0,"PRO 7",ACT0,
+,24,,A-0-6064-0,"S-RTL",ACT0,
+,25,,A-0-6225-0," N-TV",ACT0,
+,26,,A-0-6384-0,"  DSF",ACT0,
+,27,,A-0-9425-0," ARTE",ACT0,
+,28,,A-0-9584-0," C 22",ACT0,
+,29,,A-0-9745-0," TV 5",ACT0,
+,30,,A-0-9904-0," C 24",ACT0,
+,31,,A-0-10065-0," C 25",ACT0,
 ,1,,C-133-33-32-05,"Sonnenklar TV",DCT0,
 ,2,,C-133-33-661-05,"AstroTV",DCT0,
 ,3,,C-133-33-900-05,"SPORT1",DCT0,
--- a/source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.csv.in
@@ -1,37 +1,37 @@
-,1,,A-0-2805-0," S 06",AAT0,1
-,2,,A-0-2945-0,"  RTL",AAT0,2
-,3,,A-0-3085-0," S 08",AAT0,3
-,4,,A-0-3225-0,"  QVC",AAT0,4
-,5,,A-0-3365-0," HR 3",AAT0,1234
-,6,,A-0-3505-0,"  ARD",AAT0,S
-,7,,A-0-3645-0,"  ZDF",AAT0,L
-,8,,A-0-3785-0,"WDR 3",AAT0,S
-,9,,A-0-3925-0,"  VOX",AAT0,
-,10,,A-0-4065-0," KIKA",AAT0,
-,11,,A-0-4205-0,"3 SAT",AAT0,
-,12,,A-0-4345-0,"PHNIX",AAT0,
-,13,,A-0-4485-0," N-TV",AAT0,
-,14,,A-0-4625-0," S 11",AAT0,
-,15,,A-0-4765-0," S 12",AAT0,
-,16,,A-0-4905-0,"EUROS",AAT0,
-,17,,A-0-5045-0," S 14",AAT0,
-,18,,A-0-5185-0,"S-RTL",AAT0,
-,19,,A-0-5325-0,"KABEL",AAT0,
-,20,,A-0-5465-0," S 17",AAT0,
-,21,,A-0-5605-0," S 18",AAT0,
-,22,,A-0-5745-0,"RTL 2",AAT0,
-,23,,A-0-5885-0," ARTE",AAT0,
-,24,,A-0-6065-0," BR 3",AAT0,
-,25,,A-0-6225-0,"TELE5",AAT0,
-,26,,A-0-6385-0,"  DSF",AAT0,
-,27,,A-0-6545-0,"TELE5",AAT0,
-,28,,A-0-6705-0,"DVIER",AAT0,
-,29,,A-0-9425-0,"  NDR",AAT0,
-,30,,A-0-9585-0,"  HSE",AAT0,
-,31,,A-0-9745-0,"  RTL",AAT0,
-,32,,A-0-9905-0," C 24",AAT0,
-,33,,A-0-10065-0," DMAX",AAT0,
-,34,,A-0-10245-0,"  BBC",AAT0,
+,1,,A-0-2805-0," S 06",ACT0,1
+,2,,A-0-2945-0,"  RTL",ACT0,2
+,3,,A-0-3085-0," S 08",ACT0,3
+,4,,A-0-3225-0,"  QVC",ACT0,4
+,5,,A-0-3365-0," HR 3",ACT0,1234
+,6,,A-0-3505-0,"  ARD",ACT0,S
+,7,,A-0-3645-0,"  ZDF",ACT0,L
+,8,,A-0-3785-0,"WDR 3",ACT0,S
+,9,,A-0-3925-0,"  VOX",ACT0,
+,10,,A-0-4065-0," KIKA",ACT0,
+,11,,A-0-4205-0,"3 SAT",ACT0,
+,12,,A-0-4345-0,"PHNIX",ACT0,
+,13,,A-0-4485-0," N-TV",ACT0,
+,14,,A-0-4625-0," S 11",ACT0,
+,15,,A-0-4765-0," S 12",ACT0,
+,16,,A-0-4905-0,"EUROS",ACT0,
+,17,,A-0-5045-0," S 14",ACT0,
+,18,,A-0-5185-0,"S-RTL",ACT0,
+,19,,A-0-5325-0,"KABEL",ACT0,
+,20,,A-0-5465-0," S 17",ACT0,
+,21,,A-0-5605-0," S 18",ACT0,
+,22,,A-0-5745-0,"RTL 2",ACT0,
+,23,,A-0-5885-0," ARTE",ACT0,
+,24,,A-0-6065-0," BR 3",ACT0,
+,25,,A-0-6225-0,"TELE5",ACT0,
+,26,,A-0-6385-0,"  DSF",ACT0,
+,27,,A-0-6545-0,"TELE5",ACT0,
+,28,,A-0-6705-0,"DVIER",ACT0,
+,29,,A-0-9425-0,"  NDR",ACT0,
+,30,,A-0-9585-0,"  HSE",ACT0,
+,31,,A-0-9745-0,"  RTL",ACT0,
+,32,,A-0-9905-0," C 24",ACT0,
+,33,,A-0-10065-0," DMAX",ACT0,
+,34,,A-0-10245-0,"  BBC",ACT0,
 ,1,,C-41985-1051-11100-45,"Das Erste HD",DCT0,
 ,2,,C-102-1079-11110-42,"ZDF HD",DCT0,
 ,3,,C-9999-321-32103-78,"kabel eins HD",DCT0,
--- a/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.TLL.out
+++ b/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.TLL.out
--- a/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.csv.in
+++ b/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.csv.in
@@ -1,40 +1,40 @@
-,1,,A-0-2805-0,"RTL 2",AAT0,
-,2,,A-0-2946-0,"  RTL",AAT0,
-,3,,A-0-3085-0," S 08",AAT0,
-,4,,A-0-3225-0,"  N24",AAT0,
-,5,,A-0-3365-0,"QVC D",AAT0,
-,6,,A-0-3505-0,"  ARD",AAT0,
-,7,,A-0-3645-0," C 06",AAT0,
-,8,,A-0-3785-0,"SWR 3",AAT0,
-,9,,A-0-3925-0," C 08",AAT0,
-,10,,A-0-4065-0," ARTE",AAT0,
-,11,,A-0-4205-0,"  VOX",AAT0,
-,12,,A-0-4345-0,"PHNIX",AAT0,
-,13,,A-0-4485-0,"PRO 7",AAT0,
-,14,,A-0-4625-0," S 11",AAT0,
-,15,,A-0-4765-0," VIVA",AAT0,
-,16,,A-0-4905-0," S 13",AAT0,
-,17,,A-0-5045-0," S 14",AAT0,
-,18,,A-0-5185-0," S 15",AAT0,
-,19,,A-0-5325-0,"KABEL",AAT0,
-,20,,A-0-5465-0," S 17",AAT0,
-,21,,A-0-5605-0," BR 3",AAT0,
-,22,,A-0-5745-0,"  HOT",AAT0,
-,23,,A-0-5885-0," S 20",AAT0,
-,24,,A-0-6065-0,"TELE5",AAT0,
-,25,,A-0-6225-0," S 22",AAT0,
-,26,,A-0-6385-0," S 23",AAT0,
-,27,,A-0-6545-0," HR 3",AAT0,
-,28,,A-0-6705-0," S 25",AAT0,
-,29,,A-0-9425-0,"WDR 3",AAT0,
-,30,,A-0-9585-0," C 22",AAT0,
-,31,,A-0-9745-0," KIKA",AAT0,
-,32,,A-0-9905-0,"MDR 3",AAT0,
-,33,,A-0-10065-0," C 25",AAT0,
-,34,,A-0-10225-0," C 26",AAT0,
-,35,,A-0-10385-0," C 27",AAT0,
-,36,,A-0-10545-0,"3 SAT",AAT0,
-,37,,A-0-10705-0," C 29",AAT0,
+,1,,A-0-2805-0,"RTL 2",ACT0,
+,2,,A-0-2946-0,"  RTL",ACT0,
+,3,,A-0-3085-0," S 08",ACT0,
+,4,,A-0-3225-0,"  N24",ACT0,
+,5,,A-0-3365-0,"QVC D",ACT0,
+,6,,A-0-3505-0,"  ARD",ACT0,
+,7,,A-0-3645-0," C 06",ACT0,
+,8,,A-0-3785-0,"SWR 3",ACT0,
+,9,,A-0-3925-0," C 08",ACT0,
+,10,,A-0-4065-0," ARTE",ACT0,
+,11,,A-0-4205-0,"  VOX",ACT0,
+,12,,A-0-4345-0,"PHNIX",ACT0,
+,13,,A-0-4485-0,"PRO 7",ACT0,
+,14,,A-0-4625-0," S 11",ACT0,
+,15,,A-0-4765-0," VIVA",ACT0,
+,16,,A-0-4905-0," S 13",ACT0,
+,17,,A-0-5045-0," S 14",ACT0,
+,18,,A-0-5185-0," S 15",ACT0,
+,19,,A-0-5325-0,"KABEL",ACT0,
+,20,,A-0-5465-0," S 17",ACT0,
+,21,,A-0-5605-0," BR 3",ACT0,
+,22,,A-0-5745-0,"  HOT",ACT0,
+,23,,A-0-5885-0," S 20",ACT0,
+,24,,A-0-6065-0,"TELE5",ACT0,
+,25,,A-0-6225-0," S 22",ACT0,
+,26,,A-0-6385-0," S 23",ACT0,
+,27,,A-0-6545-0," HR 3",ACT0,
+,28,,A-0-6705-0," S 25",ACT0,
+,29,,A-0-9425-0,"WDR 3",ACT0,
+,30,,A-0-9585-0," C 22",ACT0,
+,31,,A-0-9745-0," KIKA",ACT0,
+,32,,A-0-9905-0,"MDR 3",ACT0,
+,33,,A-0-10065-0," C 25",ACT0,
+,34,,A-0-10225-0," C 26",ACT0,
+,35,,A-0-10385-0," C 27",ACT0,
+,36,,A-0-10545-0,"3 SAT",ACT0,
+,37,,A-0-10705-0," C 29",ACT0,
 ,1,,C-40984-1089-12003-05,"RTL Television",DCT0,
 ,2,,C-40984-1089-12020-05,"RTL 2",DCT0,
 ,3,,C-40984-1089-12040-05,"Super RTL",DCT0,
--- a/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.TLL.out
+++ b/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.TLL.out
--- a/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.csv.in
+++ b/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.csv.in
@@ -1,53 +1,53 @@
-,1,,A-0-4345-0," C 11",AAT0,1
-,2,,A-0-4065-0," C 09",AAT0,1
-,3,,A-0-3785-0," C 07",AAT0,1
-,4,,A-0-3925-0," C 08",AAT0,1
-,5,,A-0-10545-0," C 28",AAT0,1
-,6,,A-0-13585-0," C 47",AAT0,2
-,7,,A-0-15345-0," C 58",AAT0,2
-,8,,A-0-3225-0," S 09",AAT0,
-,9,,A-0-4485-0,"CT 1 ",AAT0,
-,10,,A-0-4205-0,"CT 2 ",AAT0,
-,11,,A-0-14545-0," C 53",AAT0,
-,12,,A-0-2945-0," S 07",AAT0,S
-,13,,A-0-3505-0," C 05",AAT0,S
-,14,,A-0-3645-0,"ORF 1",AAT0,S
-,15,,A-0-9585-0," C 22",AAT0,
-,16,,A-0-9745-0," C 23",AAT0,
-,17,,A-0-9905-0," C 24",AAT0,
-,18,,A-0-10065-0," C 25",AAT0,S
-,19,,A-0-10225-0," C 26",AAT0,S
-,20,,A-0-10705-0," C 29",AAT0,
-,21,,A-0-10865-0," C 30",AAT0,
-,22,,A-0-11185-0," C 32",AAT0,
-,23,,A-0-11345-0," C 33",AAT0,S
-,24,,A-0-11505-0," C 34",AAT0,
-,25,,A-0-11665-0," C 35",AAT0,
-,26,,A-0-11825-0," C 36",AAT0,S
-,27,,A-0-12465-0,"ORF 2",AAT0,S
-,28,,A-0-12625-0," C 41",AAT0,
-,29,,A-0-12785-0,"CT 1 ",AAT0,
-,30,,A-0-12945-0," C 43",AAT0,
-,31,,A-0-13265-0," C 45",AAT0,
-,32,,A-0-13425-0," C 46",AAT0,
-,33,,A-0-13745-0," C 48",AAT0,
-,34,,A-0-13905-0," C 49",AAT0,
-,35,,A-0-14225-0," C 51",AAT0,
-,36,,A-0-14385-0," C 52",AAT0,
-,37,,A-0-14705-0," C 54",AAT0,
-,38,,A-0-14865-0," C 55",AAT0,
-,39,,A-0-15025-0," NOVA",AAT0,
-,40,,A-0-15185-0," C 57",AAT0,
-,41,,A-0-15505-0,"  BBC",AAT0,
-,42,,A-0-15665-0," C 60",AAT0,
-,43,,A-0-15825-0," C 61",AAT0,
-,44,,A-0-15985-0," C 62",AAT0,
-,45,,A-0-16145-0," TV 5",AAT0,S
-,46,,A-0-16305-0," C 64",AAT0,S
-,47,,A-0-16465-0,"CT 2 ",AAT0,
-,48,,A-0-16625-0," ARTE",AAT0,S
-,49,,A-0-16785-0,"TVPOL",AAT0,S
-,50,,A-0-16945-0," C 68",AAT0,S
+,1,,A-0-4345-0," C 11",ACT0,1
+,2,,A-0-4065-0," C 09",ACT0,1
+,3,,A-0-3785-0," C 07",ACT0,1
+,4,,A-0-3925-0," C 08",ACT0,1
+,5,,A-0-10545-0," C 28",ACT0,1
+,6,,A-0-13585-0," C 47",ACT0,2
+,7,,A-0-15345-0," C 58",ACT0,2
+,8,,A-0-3225-0," S 09",ACT0,
+,9,,A-0-4485-0,"CT 1 ",ACT0,
+,10,,A-0-4205-0,"CT 2 ",ACT0,
+,11,,A-0-14545-0," C 53",ACT0,
+,12,,A-0-2945-0," S 07",ACT0,S
+,13,,A-0-3505-0," C 05",ACT0,S
+,14,,A-0-3645-0,"ORF 1",ACT0,S
+,15,,A-0-9585-0," C 22",ACT0,
+,16,,A-0-9745-0," C 23",ACT0,
+,17,,A-0-9905-0," C 24",ACT0,
+,18,,A-0-10065-0," C 25",ACT0,S
+,19,,A-0-10225-0," C 26",ACT0,S
+,20,,A-0-10705-0," C 29",ACT0,
+,21,,A-0-10865-0," C 30",ACT0,
+,22,,A-0-11185-0," C 32",ACT0,
+,23,,A-0-11345-0," C 33",ACT0,S
+,24,,A-0-11505-0," C 34",ACT0,
+,25,,A-0-11665-0," C 35",ACT0,
+,26,,A-0-11825-0," C 36",ACT0,S
+,27,,A-0-12465-0,"ORF 2",ACT0,S
+,28,,A-0-12625-0," C 41",ACT0,
+,29,,A-0-12785-0,"CT 1 ",ACT0,
+,30,,A-0-12945-0," C 43",ACT0,
+,31,,A-0-13265-0," C 45",ACT0,
+,32,,A-0-13425-0," C 46",ACT0,
+,33,,A-0-13745-0," C 48",ACT0,
+,34,,A-0-13905-0," C 49",ACT0,
+,35,,A-0-14225-0," C 51",ACT0,
+,36,,A-0-14385-0," C 52",ACT0,
+,37,,A-0-14705-0," C 54",ACT0,
+,38,,A-0-14865-0," C 55",ACT0,
+,39,,A-0-15025-0," NOVA",ACT0,
+,40,,A-0-15185-0," C 57",ACT0,
+,41,,A-0-15505-0,"  BBC",ACT0,
+,42,,A-0-15665-0," C 60",ACT0,
+,43,,A-0-15825-0," C 61",ACT0,
+,44,,A-0-15985-0," C 62",ACT0,
+,45,,A-0-16145-0," TV 5",ACT0,S
+,46,,A-0-16305-0," C 64",ACT0,S
+,47,,A-0-16465-0,"CT 2 ",ACT0,
+,48,,A-0-16625-0," ARTE",ACT0,S
+,49,,A-0-16785-0,"TVPOL",ACT0,S
+,50,,A-0-16945-0," C 68",ACT0,S
 ,1,,C-1-101-1001-33,"UPC Expres",DCT0,S
 ,2,,C-1-101-1002-33,"STV1",DCT0,1
 ,3,,C-1-101-1003-33,"STV2",DCT0,1