diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Austria.Salzburg Elsnet.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Austria.Salzburg Elsnet.xml
index a9961a8054b..a3e178b18c5 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Austria.Salzburg Elsnet.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Austria.Salzburg Elsnet.xml
@@ -46,12 +46,12 @@
6900
- 442000
+ 434000
Mod64Qam
6900
- 434000
+ 442000
Mod64Qam
6900
@@ -117,7 +117,7 @@
594000
- Mod64Qam
+ Mod256Qam
6900
@@ -135,4 +135,14 @@
Mod256Qam
6900
+
+ 626000
+ Mod256Qam
+ 6900
+
+
+ 634000
+ Mod256Qam
+ 6900
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Oulu-DNA.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Oulu-DNA.xml
index ab183816a5e..0ed7dda0630 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Oulu-DNA.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Oulu-DNA.xml
@@ -1,47 +1,51 @@
-
+
- 242000
- Mod256Qam
+ 226000
+ Mod128Qam
6875
- 250000
- Mod256Qam
+ 178000
+ Mod128Qam
6875
-
+
- 258000
- Mod256Qam
+ 394000
+ Mod128Qam
6875
- 266000
+ 514000
Mod256Qam
6875
+
+ 330000
+ Mod128Qam
+ 6875
- 274000
- Mod256Qam
+ 370000
+ Mod128Qam
6875
- 290000
- Mod256Qam
+ 362000
+ Mod128Qam
6875
- 298000
+ 354000
Mod128Qam
6875
- 306000
+ 346000
Mod128Qam
6875
- 314000
+ 338000
Mod128Qam
6875
@@ -51,42 +55,77 @@
6875
- 330000
+ 314000
Mod128Qam
6875
- 338000
+ 378000
Mod128Qam
6875
- 346000
+ 306000
Mod128Qam
6875
- 354000
+ 298000
Mod128Qam
6875
- 362000
+ 290000
+ Mod256Qam
+ 6875
+
+
+ 274000
+ Mod256Qam
+ 6875
+
+
+ 266000
+ Mod256Qam
+ 6875
+
+
+ 258000
+ Mod256Qam
+ 6875
+
+
+ 250000
+ Mod256Qam
+ 6875
+
+
+ 242000
+ Mod256Qam
+ 6875
+
+
+ 386000
Mod128Qam
6875
- 370000
+ 186000
Mod128Qam
6875
- 378000
+ 194000
Mod128Qam
6875
- 386000
+ 202000
+ Mod128Qam
+ 6875
+
+
+ 218000
Mod128Qam
6875
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG) Berlin.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG) Berlin.xml
index 87ee765465c..443be26e576 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG) Berlin.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG) Berlin.xml
@@ -1,15 +1,25 @@
-
+
113000
Mod64Qam
6900
+
+ 114000
+ Mod64Qam
+ 6900
+
121000
Mod64Qam
6900
+
+ 122000
+ Mod64Qam
+ 6900
+
130000
Mod256Qam
@@ -95,6 +105,26 @@
Mod64Qam
6900
+
+ 450000
+ Mod256Qam
+ 6900
+
+
+ 458000
+ Mod64Qam
+ 6900
+
+
+ 458000
+ Mod256Qam
+ 6900
+
+
+ 450000
+ Mod64Qam
+ 6900
+
458000
Mod64Qam
@@ -125,11 +155,31 @@
Mod64Qam
6900
-
+
610000
Mod64Qam
6900
+
+ 610000
+ Mod256Qam
+ 6900
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+ 618000
+ Mod256Qam
+ 6900
+
+
+ 626000
+ Mod64Qam
+ 6900
+
626000
Mod256Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG).xml
index 473496cd5fe..668c3e035b9 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG).xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG).xml
@@ -1,15 +1,25 @@
-
+
113000
Mod64Qam
6900
+
+ 114000
+ Mod64Qam
+ 6900
+
121000
Mod64Qam
6900
+
+ 122000
+ Mod64Qam
+ 6900
+
130000
Mod256Qam
@@ -85,16 +95,26 @@
Mod256Qam
6900
-
+
450000
Mod64Qam
6900
+
+ 450000
+ Mod256Qam
+ 6900
+
458000
Mod64Qam
6900
+
+ 458000
+ Mod256Qam
+ 6900
+
466000
Mod64Qam
@@ -115,11 +135,36 @@
Mod64Qam
6900
+
+ 530000
+ Mod256Qam
+ 6900
+
+
+ 538000
+ Mod64Qam
+ 6900
+
538000
+ Mod256Qam
+ 6900
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+ 618000
Mod64Qam
6900
+
+ 618000
+ Mod256Qam
+ 6900
+
626000
Mod256Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml
index ddc3eb00e02..2e9f832d67e 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml
@@ -125,6 +125,11 @@
Mod256Qam
6900
+
+ 610000
+ Mod64Qam
+ 6900
+
650000
Mod256Qam
@@ -155,14 +160,4 @@
Mod256Qam
6900
-
- 129000
- Mod256Qam
- 6900
-
-
- 666000
- Mod256Qam
- 6900
-
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Spain.Euskaltel.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Spain.Euskaltel.xml
index 8e4099b039e..cdb87433328 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Spain.Euskaltel.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Spain.Euskaltel.xml
@@ -1,5 +1,50 @@
+
+ 378000
+ Mod256Qam
+ 6952
+
+
+ 386000
+ Mod256Qam
+ 6952
+
+
+ 394000
+ Mod256Qam
+ 6952
+
+
+ 402000
+ Mod256Qam
+ 6952
+
+
+ 410000
+ Mod256Qam
+ 6952
+
+
+ 418000
+ Mod256Qam
+ 6952
+
+
+ 426000
+ Mod64Qam
+ 6875
+
+
+ 434000
+ Mod64Qam
+ 6875
+
+
+ 458000
+ Mod256Qam
+ 6952
+
690000
Mod64Qam
@@ -90,4 +135,14 @@
Mod64Qam
6875
+
+ 834000
+ Mod64Qam
+ 6875
+
+
+ 842000
+ Mod64Qam
+ 6875
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Jonkoping.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Jonkoping.xml
new file mode 100644
index 00000000000..d4f9bc3a7cc
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Jonkoping.xml
@@ -0,0 +1,238 @@
+
+
+
+ 298000
+ Mod64Qam
+ 6875
+
+
+ 306000
+ Mod64Qam
+ 6875
+
+
+ 314000
+ Mod64Qam
+ 6875
+
+
+ 322000
+ Mod64Qam
+ 6875
+
+
+ 330000
+ Mod64Qam
+ 6875
+
+
+ 338000
+ Mod64Qam
+ 6875
+
+
+ 346000
+ Mod64Qam
+ 6875
+
+
+ 354000
+ Mod64Qam
+ 6875
+
+
+ 362000
+ Mod64Qam
+ 6875
+
+
+ 370000
+ Mod64Qam
+ 6875
+
+
+ 378000
+ Mod64Qam
+ 6875
+
+
+ 386000
+ Mod64Qam
+ 6875
+
+
+ 394000
+ Mod64Qam
+ 6875
+
+
+ 402000
+ Mod64Qam
+ 6875
+
+
+ 410000
+ Mod64Qam
+ 6875
+
+
+ 418000
+ Mod64Qam
+ 6875
+
+
+ 426000
+ Mod64Qam
+ 6875
+
+
+ 434000
+ Mod64Qam
+ 6875
+
+
+ 442000
+ Mod64Qam
+ 6875
+
+
+ 450000
+ Mod64Qam
+ 6875
+
+
+ 458000
+ Mod64Qam
+ 6875
+
+
+ 466000
+ Mod64Qam
+ 6875
+
+
+ 474000
+ Mod64Qam
+ 6875
+
+
+ 290000
+ Mod256Qam
+ 6875
+
+
+ 298000
+ Mod256Qam
+ 6875
+
+
+ 306000
+ Mod256Qam
+ 6875
+
+
+ 314000
+ Mod256Qam
+ 6875
+
+
+ 322000
+ Mod256Qam
+ 6875
+
+
+ 330000
+ Mod256Qam
+ 6875
+
+
+ 338000
+ Mod256Qam
+ 6875
+
+
+ 346000
+ Mod256Qam
+ 6875
+
+
+ 354000
+ Mod256Qam
+ 6875
+
+
+ 362000
+ Mod256Qam
+ 6875
+
+
+ 370000
+ Mod256Qam
+ 6875
+
+
+ 378000
+ Mod256Qam
+ 6875
+
+
+ 386000
+ Mod256Qam
+ 6875
+
+
+ 394000
+ Mod256Qam
+ 6875
+
+
+ 402000
+ Mod256Qam
+ 6875
+
+
+ 410000
+ Mod256Qam
+ 6875
+
+
+ 418000
+ Mod256Qam
+ 6875
+
+
+ 426000
+ Mod256Qam
+ 6875
+
+
+ 434000
+ Mod256Qam
+ 6875
+
+
+ 442000
+ Mod256Qam
+ 6875
+
+
+ 450000
+ Mod256Qam
+ 6875
+
+
+ 458000
+ Mod256Qam
+ 6875
+
+
+ 466000
+ Mod256Qam
+ 6875
+
+
+ 474000
+ Mod256Qam
+ 6875
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.UPC Cablecom.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.UPC Cablecom.xml
new file mode 100644
index 00000000000..2daac9fc955
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.UPC Cablecom.xml
@@ -0,0 +1,143 @@
+
+
+
+ 306000
+ Mod256Qam
+ 6900
+
+
+ 338000
+ Mod256Qam
+ 6900
+
+
+ 370000
+ Mod256Qam
+ 6900
+
+
+ 378000
+ Mod256Qam
+ 6900
+
+
+ 386000
+ Mod256Qam
+ 6900
+
+
+ 394000
+ Mod256Qam
+ 6900
+
+
+ 410000
+ Mod256Qam
+ 6900
+
+
+ 418000
+ Mod256Qam
+ 6900
+
+
+ 442000
+ Mod256Qam
+ 6900
+
+
+ 458000
+ Mod256Qam
+ 6900
+
+
+ 466000
+ Mod256Qam
+ 6900
+
+
+ 474000
+ Mod256Qam
+ 6900
+
+
+ 490000
+ Mod256Qam
+ 6900
+
+
+ 498000
+ Mod256Qam
+ 6900
+
+
+ 506000
+ Mod256Qam
+ 6900
+
+
+ 514000
+ Mod256Qam
+ 6900
+
+
+ 522000
+ Mod256Qam
+ 6900
+
+
+ 530000
+ Mod256Qam
+ 6900
+
+
+ 538000
+ Mod256Qam
+ 6900
+
+
+ 546000
+ Mod256Qam
+ 6900
+
+
+ 578000
+ Mod256Qam
+ 6900
+
+
+ 594000
+ Mod256Qam
+ 6900
+
+
+ 610000
+ Mod256Qam
+ 6900
+
+
+ 618000
+ Mod256Qam
+ 6900
+
+
+ 658000
+ Mod256Qam
+ 6900
+
+
+ 666000
+ Mod256Qam
+ 6900
+
+
+ 674000
+ Mod256Qam
+ 6900
+
+
+ 682000
+ Mod256Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.sasag.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.sasag.xml
index b78643216e3..989c9b76a24 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.sasag.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.sasag.xml
@@ -1,4 +1,9 @@
+
+
306000
@@ -106,7 +111,7 @@
6900
- 64200
+ 642000
Mod256Qam
6900
@@ -125,4 +130,19 @@
Mod256Qam
6900
+
+ 682000
+ Mod256Qam
+ 6900
+
+
+ 690000
+ Mod256Qam
+ 6900
+
+
+ 698000
+ Mod256Qam
+ 6900
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Aalsmeer-Uithoorn (ID 2257).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Aalsmeer-Uithoorn (ID 2257).xml
new file mode 100644
index 00000000000..25546d006ba
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Aalsmeer-Uithoorn (ID 2257).xml
@@ -0,0 +1,268 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW (ID 2249).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW (ID 2249).xml
new file mode 100644
index 00000000000..ee96c8a314f
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW (ID 2249).xml
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 165000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Basic-pakket (ID 2250).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Basic-pakket (ID 2250).xml
new file mode 100644
index 00000000000..f18833c4008
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Basic-pakket (ID 2250).xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Doorn (ID 3667).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Doorn (ID 3667).xml
new file mode 100644
index 00000000000..a39ce70be61
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Doorn (ID 3667).xml
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 165000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Hilvarenbeek (ID 4458).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Hilvarenbeek (ID 4458).xml
new file mode 100644
index 00000000000..45a2d4886bb
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Hilvarenbeek (ID 4458).xml
@@ -0,0 +1,250 @@
+
+
+
+
+
+ 452000
+ Mod64Qam
+ 6900
+
+
+
+ 444000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 298000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 394000
+ Mod64Qam
+ 6900
+
+
+
+ 402000
+ Mod64Qam
+ 6900
+
+
+
+ 460000
+ Mod64Qam
+ 6900
+
+
+
+ 523000
+ Mod64Qam
+ 6900
+
+
+
+ 662000
+ Mod64Qam
+ 6900
+
+
+
+ 436000
+ Mod64Qam
+ 6900
+
+
+
+ 250000
+ Mod64Qam
+ 6900
+
+
+
+ 258000
+ Mod64Qam
+ 6900
+
+
+
+ 266000
+ Mod64Qam
+ 6900
+
+
+
+ 274000
+ Mod64Qam
+ 6900
+
+
+
+ 282000
+ Mod64Qam
+ 6900
+
+
+
+ 290000
+ Mod64Qam
+ 6900
+
+
+
+ 482000
+ Mod64Qam
+ 6900
+
+
+
+ 762000
+ Mod64Qam
+ 6900
+
+
+
+ 734000
+ Mod64Qam
+ 6900
+
+
+
+ 692000
+ Mod64Qam
+ 6900
+
+
+
+ 582000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 832000
+ Mod64Qam
+ 6900
+
+
+
+ 170000
+ Mod64Qam
+ 6900
+
+
+
+ 162000
+ Mod64Qam
+ 6900
+
+
+
+ 154000
+ Mod64Qam
+ 6900
+
+
+
+ 146000
+ Mod64Qam
+ 6900
+
+
+
+ 138000
+ Mod64Qam
+ 6900
+
+
+
+ 130000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_IJsselstein (ID 7224).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_IJsselstein (ID 7224).xml
new file mode 100644
index 00000000000..a366e6f8aff
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_IJsselstein (ID 7224).xml
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 450000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 165000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Loenen (ID 5636).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Loenen (ID 5636).xml
new file mode 100644
index 00000000000..adc527d1fae
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Loenen (ID 5636).xml
@@ -0,0 +1,220 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 770000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 222000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 826000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Maassluis (ID 6227).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Maassluis (ID 6227).xml
new file mode 100644
index 00000000000..d542b9553cd
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Maassluis (ID 6227).xml
@@ -0,0 +1,268 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Midden-Holland (ID 4683).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Midden-Holland (ID 4683).xml
new file mode 100644
index 00000000000..37610c3be48
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Midden-Holland (ID 4683).xml
@@ -0,0 +1,244 @@
+
+
+
+
+
+ 770000
+ Mod64Qam
+ 6900
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 594000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 506000
+ Mod64Qam
+ 6900
+
+
+
+ 602000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 826000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 858000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 290000
+ Mod64Qam
+ 6900
+
+
+
+ 210000
+ Mod64Qam
+ 6875
+
+
+
+ 298000
+ Mod64Qam
+ 6900
+
+
+
+ 514000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 562000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Schiedam (ID 7244).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Schiedam (ID 7244).xml
new file mode 100644
index 00000000000..bb00eb27845
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Schiedam (ID 7244).xml
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 165000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Test_intern (ID 8378).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Test_intern (ID 8378).xml
new file mode 100644
index 00000000000..fd52b0a2ff8
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Test_intern (ID 8378).xml
@@ -0,0 +1,298 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 274000
+ Mod64Qam
+ 6875
+
+
+
+ 282000
+ Mod64Qam
+ 6875
+
+
+
+ 290000
+ Mod64Qam
+ 6875
+
+
+
+ 298000
+ Mod64Qam
+ 6875
+
+
+
+ 165000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Capelle_a-d_IJssel (ID 2273).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Capelle_a-d_IJssel (ID 2273).xml
new file mode 100644
index 00000000000..2a04bcd8548
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Capelle_a-d_IJssel (ID 2273).xml
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
+
+ 165000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Oudenbosch (ID 6536).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Oudenbosch (ID 6536).xml
new file mode 100644
index 00000000000..7e6981a583b
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Oudenbosch (ID 6536).xml
@@ -0,0 +1,268 @@
+
+
+
+
+
+ 538000
+ Mod64Qam
+ 6900
+
+
+
+ 554000
+ Mod64Qam
+ 6900
+
+
+
+ 642000
+ Mod64Qam
+ 6900
+
+
+
+ 658000
+ Mod64Qam
+ 6900
+
+
+
+ 778000
+ Mod64Qam
+ 6900
+
+
+
+ 570000
+ Mod64Qam
+ 6900
+
+
+
+ 682000
+ Mod64Qam
+ 6900
+
+
+
+ 706000
+ Mod64Qam
+ 6900
+
+
+
+ 650000
+ Mod64Qam
+ 6900
+
+
+
+ 730000
+ Mod64Qam
+ 6900
+
+
+
+ 674000
+ Mod64Qam
+ 6900
+
+
+
+ 738000
+ Mod64Qam
+ 6900
+
+
+
+ 786000
+ Mod64Qam
+ 6900
+
+
+
+ 306000
+ Mod64Qam
+ 6900
+
+
+
+ 546000
+ Mod64Qam
+ 6900
+
+
+
+ 842000
+ Mod64Qam
+ 6900
+
+
+
+ 530000
+ Mod64Qam
+ 6900
+
+
+
+ 698000
+ Mod64Qam
+ 6900
+
+
+
+ 714000
+ Mod64Qam
+ 6900
+
+
+
+ 666000
+ Mod64Qam
+ 6900
+
+
+
+ 634000
+ Mod64Qam
+ 6900
+
+
+
+ 626000
+ Mod64Qam
+ 6900
+
+
+
+ 690000
+ Mod64Qam
+ 6900
+
+
+
+ 834000
+ Mod64Qam
+ 6900
+
+
+
+ 314000
+ Mod64Qam
+ 6900
+
+
+
+ 618000
+ Mod64Qam
+ 6900
+
+
+
+ 746000
+ Mod64Qam
+ 6900
+
+
+
+ 754000
+ Mod64Qam
+ 6900
+
+
+
+ 794000
+ Mod64Qam
+ 6900
+
+
+
+ 802000
+ Mod64Qam
+ 6900
+
+
+
+ 810000
+ Mod64Qam
+ 6900
+
+
+
+ 610000
+ Mod64Qam
+ 6900
+
+
+
+ 354000
+ Mod64Qam
+ 6900
+
+
+
+ 586000
+ Mod64Qam
+ 6900
+
+
+
+ 578000
+ Mod64Qam
+ 6900
+
+
+
+ 362000
+ Mod64Qam
+ 6900
+
+
+
+ 322000
+ Mod64Qam
+ 6900
+
+
+
+ 330000
+ Mod64Qam
+ 6900
+
+
+
+ 338000
+ Mod64Qam
+ 6900
+
+
+
+ 346000
+ Mod64Qam
+ 6900
+
+
+
+ 370000
+ Mod64Qam
+ 6900
+
+
+
+ 378000
+ Mod64Qam
+ 6900
+
+
+
+ 386000
+ Mod64Qam
+ 6900
+
+
+
+ 850000
+ Mod64Qam
+ 6900
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.REKAM (ID 777).xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.REKAM (ID 777).xml
new file mode 100644
index 00000000000..e5a3d7b609e
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.REKAM (ID 777).xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+ 155000
+ Mod64Qam
+ 6875
+
+
+
+ 163000
+ Mod64Qam
+ 6875
+
+
+
+ 234000
+ Mod64Qam
+ 6875
+
+
+
+ 498000
+ Mod64Qam
+ 6875
+
+
+
+ 147000
+ Mod64Qam
+ 6875
+
+
+
+ 698000
+ Mod64Qam
+ 6875
+
+
+
+ 706000
+ Mod64Qam
+ 6875
+
+
+
+ 522000
+ Mod64Qam
+ 6875
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml
index a8a2b7a05a9..ac107be30d9 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml
@@ -5,18 +5,13 @@
Mod64Qam
6875
-
- 364000
- Mod64Qam
- 6875
-
372000
Mod64Qam
6875
- 380000
+ 554750
Mod64Qam
6875
@@ -26,7 +21,7 @@
6875
- 396000
+ 762750
Mod64Qam
6875
@@ -56,7 +51,7 @@
6875
- 388000
+ 738750
Mod64Qam
6875
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml
index 6907b440256..53e3948b266 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml
@@ -76,7 +76,7 @@
6875
- 324000
+ 810000
Mod64Qam
6875
@@ -86,12 +86,12 @@
6875
- 308000
+ 842000
Mod64Qam
6875
- 316000
+ 778000
Mod64Qam
6875
@@ -136,7 +136,7 @@
6875
- 778000
+ 722000
Mod64Qam
6875
@@ -146,12 +146,7 @@
6875
- 802000
- Mod64Qam
- 6875
-
-
- 810000
+ 522000
Mod64Qam
6875
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml
index b032ab416b7..0a6210bab92 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml
@@ -150,9 +150,4 @@
Mod64Qam
6875
-
- 279000
- Mod64Qam
- 6875
-
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml
index 56cf5681ad8..a803e4cd2c4 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml
@@ -66,12 +66,12 @@
6875
- 385000
+ 842000
Mod64Qam
6875
- 393000
+ 530000
Mod64Qam
6875
@@ -91,7 +91,7 @@
6875
- 377000
+ 658000
Mod64Qam
6875
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
778000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml
index 7c68e9d4624..882ce830a44 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml
@@ -66,12 +66,12 @@
6875
- 385000
+ 826000
Mod64Qam
6875
- 393000
+ 570000
Mod64Qam
6875
@@ -91,7 +91,7 @@
6875
- 377000
+ 738000
Mod64Qam
6875
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
634000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8400.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8400.xml
index e200f30fd3e..b63f28e38b7 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8400.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8400.xml
@@ -150,11 +150,6 @@
Mod256Qam
6875
-
- 417000
- Mod256Qam
- 6875
-
778000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml
index aa3dbc8857d..9c079a2482d 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml
@@ -66,12 +66,12 @@
6875
- 385000
+ 842000
Mod64Qam
6875
- 393000
+ 530000
Mod64Qam
6875
@@ -91,7 +91,7 @@
6875
- 377000
+ 546000
Mod64Qam
6875
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
778000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml
index 9ebefcb1f91..b6daed1d732 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml
@@ -36,17 +36,17 @@
6875
- 452000
+ 746750
Mod64Qam
6875
- 460000
+ 674750
Mod64Qam
6875
- 468000
+ 754750
Mod64Qam
6875
@@ -136,7 +136,7 @@
6875
- 674750
+ 650750
Mod64Qam
6875
@@ -146,12 +146,7 @@
6875
- 738750
- Mod64Qam
- 6875
-
-
- 746750
+ 730750
Mod64Qam
6875
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml
index 1638e72af91..e700609a95f 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml
@@ -31,7 +31,7 @@
6875
- 810000
+ 682000
Mod64Qam
6875
@@ -66,12 +66,12 @@
6875
- 385000
+ 810000
Mod64Qam
6875
- 393000
+ 570000
Mod64Qam
6875
@@ -91,7 +91,7 @@
6875
- 377000
+ 514000
Mod64Qam
6875
@@ -121,7 +121,7 @@
6875
- 570000
+ 530000
Mod64Qam
6875
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
546000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml
index 1221da2844d..7c20c2651d3 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml
@@ -6,7 +6,7 @@
6875
- 682000
+ 417000
Mod64Qam
6875
@@ -31,7 +31,7 @@
6875
- 810000
+ 530000
Mod64Qam
6875
@@ -66,12 +66,12 @@
6875
- 385000
+ 570000
Mod64Qam
6875
- 393000
+ 810000
Mod64Qam
6875
@@ -91,7 +91,7 @@
6875
- 377000
+ 658000
Mod64Qam
6875
@@ -121,7 +121,7 @@
6875
- 570000
+ 482000
Mod64Qam
6875
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
546000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml
index 57c98d7fb47..bd231355c0d 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml
@@ -1,32 +1,32 @@
- 313000
+ 441000
Mod64Qam
6875
- 361000
+ 627000
Mod64Qam
6875
- 353000
+ 635000
Mod64Qam
6875
- 345000
+ 449000
Mod64Qam
6875
- 551500
+ 417000
Mod64Qam
6875
- 329000
+ 457000
Mod64Qam
6875
@@ -36,12 +36,12 @@
6875
- 305000
+ 401000
Mod64Qam
6875
- 662000
+ 799750
Mod64Qam
6875
@@ -51,32 +51,32 @@
6875
- 831500
+ 551500
Mod64Qam
6875
- 337000
+ 490000
Mod64Qam
6875
- 321000
+ 433000
Mod64Qam
6875
- 247000
+ 584000
Mod64Qam
6875
- 255000
+ 619000
Mod64Qam
6875
- 263000
+ 156000
Mod64Qam
6875
@@ -86,72 +86,67 @@
6875
- 295000
- Mod64Qam
- 6875
-
-
- 629750
+ 425000
Mod64Qam
6875
- 811750
+ 164000
Mod64Qam
6875
- 620000
+ 465000
Mod64Qam
6875
- 709000
+ 708000
Mod64Qam
6875
- 717000
+ 716000
Mod64Qam
6875
- 271000
+ 762000
Mod64Qam
6875
- 454000
+ 409000
Mod64Qam
6875
- 462000
+ 592000
Mod64Qam
6875
- 594000
+ 662000
Mod64Qam
6875
- 612000
+ 807750
Mod64Qam
6875
- 446000
+ 815750
Mod64Qam
6875
- 287000
+ 823750
Mod64Qam
6875
- 279000
+ 791750
Mod64Qam
6875
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml
index 96a4a192391..a8d7b1c01ba 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
778000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml
index 7d4755c5294..1c7ea2b9d42 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml
@@ -6,7 +6,7 @@
6875
- 506000
+ 514000
Mod64Qam
6875
@@ -31,7 +31,7 @@
6875
- 810000
+ 546000
Mod64Qam
6875
@@ -66,12 +66,12 @@
6875
- 385000
+ 842000
Mod64Qam
6875
- 393000
+ 530000
Mod64Qam
6875
@@ -91,7 +91,7 @@
6875
- 377000
+ 810000
Mod64Qam
6875
@@ -121,7 +121,7 @@
6875
- 514000
+ 506000
Mod64Qam
6875
@@ -150,11 +150,6 @@
Mod64Qam
6875
-
- 417000
- Mod64Qam
- 6875
-
778000
Mod64Qam
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbip/Norway.TelenorFiber.m3u b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbip/Norway.TelenorFiber.m3u
index 47004dd9fd0..dc7841118c7 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbip/Norway.TelenorFiber.m3u
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbip/Norway.TelenorFiber.m3u
@@ -1,30 +1,34 @@
#EXTM3U
#EXTINF:0,NRK1 HD / Østafjells
-rtp://233.171.129.96:5500
+rtp://224.0.39.44:5500
+#EXTINF:0,NRK1 - Østafjells
+rtp://224.0.39.50:5500
#EXTINF:0,NRK1 - Østnytt
-rtp://233.171.129.117:5500
+rtp://224.0.39.49:5500
#EXTINF:0,NRK1 - Vestlandsrevyen
-rtp://233.171.129.100:5500
+rtp://224.0.39.54:5500
#EXTINF:0,NRK1 - Møre og Romsdal
-rtp://233.171.129.101:5500
+rtp://224.0.39.55:5500
#EXTINF:0,NRK1 - Nordland
-rtp://233.171.129.103:5500
+rtp://224.0.39.57:5500
#EXTINF:0,NRK1 - Rogaland
-rtp://233.171.129.99:5500
+rtp://224.0.39.53:5500
#EXTINF:0,NRK1 - Sørlandet
-rtp://233.171.129.97:5500
+rtp://224.0.39.51:5500
#EXTINF:0,NRK1 - Nordnytt
-rtp://233.171.129.104:5500
+rtp://224.0.39.58:5500
#EXTINF:0,NRK1 - Midtnytt
-rtp://233.171.129.102:5500
+rtp://224.0.39.56:5500
#EXTINF:0,NRK1 - Østfold
-rtp://233.171.129.98:5500
+rtp://224.0.39.52:5500
#EXTINF:0,NRK1 - Østlandssenningen
-rtp://233.171.129.94:5500
+rtp://224.0.39.48:5500
+#EXTINF:0,NRK1 - Tegnspråk
+rtp://224.0.39.59:5500
#EXTINF:0,NRK2
-rtp://233.171.129.105:5500
+rtp://224.0.39.45:5500
#EXTINF:0,NRK3
-rtp://233.171.129.106:5500
+rtp://224.0.39.46:5500
#EXTINF:0,TV2 HD
rtp://233.171.129.108:5500
#EXTINF:0,TV3
@@ -235,23 +239,3 @@ rtp://233.171.129.129:5500
rtp://233.171.129.144:5500
#EXTINF:0,The Poker Channel
rtp://233.171.129.17:5500
-#EXTINF:0,NRK P1
-rtp://239.192.225.129:5500
-#EXTINF:0,NRK P2
-rtp://239.192.225.130:5500
-#EXTINF:0,NRK P3
-rtp://239.192.225.131:5500
-#EXTINF:0,NRK mP3
-rtp://239.192.225.132:5500
-#EXTINF:0,NRK Alltid Nyheter
-rtp://239.192.225.133:5500
-#EXTINF:0,NRK Folkemusikk
-rtp://239.192.225.136:5500
-#EXTINF:0,NRK Klassisk
-rtp://239.192.225.135:5500
-#EXTINF:0,NRK Jazz
-rtp://239.192.225.134:5500
-#EXTINF:0,NRK været til sjøs
-rtp://239.192.225.137:5500
-#EXTINF:0,Radio Norge
-rtp://239.192.225.1:5500
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Brazil.All Regions.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Brazil.All Regions.xml
new file mode 100644
index 00000000000..40446236084
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Brazil.All Regions.xml
@@ -0,0 +1,318 @@
+
+
+
+ 177143
+ 6
+ 125
+
+
+ 183143
+ 6
+ 125
+
+
+ 189143
+ 6
+ 125
+
+
+ 195143
+ 6
+ 125
+
+
+ 201143
+ 6
+ 125
+
+
+ 207143
+ 6
+ 125
+
+
+ 213143
+ 6
+ 125
+
+
+ 473143
+ 6
+ 125
+
+
+ 479143
+ 6
+ 125
+
+
+ 485143
+ 6
+ 125
+
+
+ 491143
+ 6
+ 125
+
+
+ 497143
+ 6
+ 125
+
+
+ 503143
+ 6
+ 125
+
+
+ 509143
+ 6
+ 125
+
+
+ 515143
+ 6
+ 125
+
+
+ 521143
+ 6
+ 125
+
+
+ 527143
+ 6
+ 125
+
+
+ 533143
+ 6
+ 125
+
+
+ 539143
+ 6
+ 125
+
+
+ 545143
+ 6
+ 125
+
+
+ 551143
+ 6
+ 125
+
+
+ 557143
+ 6
+ 125
+
+
+ 563143
+ 6
+ 125
+
+
+ 569143
+ 6
+ 125
+
+
+ 575143
+ 6
+ 125
+
+
+ 581143
+ 6
+ 125
+
+
+ 587143
+ 6
+ 125
+
+
+ 593143
+ 6
+ 125
+
+
+ 599143
+ 6
+ 125
+
+
+ 605143
+ 6
+ 125
+
+
+ 611143
+ 6
+ 125
+
+
+ 617143
+ 6
+ 125
+
+
+ 623143
+ 6
+ 125
+
+
+ 629143
+ 6
+ 125
+
+
+ 635143
+ 6
+ 125
+
+
+ 641143
+ 6
+ 125
+
+
+ 647143
+ 6
+ 125
+
+
+ 653143
+ 6
+ 125
+
+
+ 659143
+ 6
+ 125
+
+
+ 665143
+ 6
+ 125
+
+
+ 671143
+ 6
+ 125
+
+
+ 677143
+ 6
+ 125
+
+
+ 683143
+ 6
+ 125
+
+
+ 689143
+ 6
+ 125
+
+
+ 695143
+ 6
+ 125
+
+
+ 701143
+ 6
+ 125
+
+
+ 707143
+ 6
+ 125
+
+
+ 713143
+ 6
+ 125
+
+
+ 719143
+ 6
+ 125
+
+
+ 725143
+ 6
+ 125
+
+
+ 731143
+ 6
+ 125
+
+
+ 737143
+ 6
+ 125
+
+
+ 743143
+ 6
+ 125
+
+
+ 749143
+ 6
+ 125
+
+
+ 755143
+ 6
+ 125
+
+
+ 761143
+ 6
+ 125
+
+
+ 767143
+ 6
+ 125
+
+
+ 773143
+ 6
+ 125
+
+
+ 779143
+ 6
+ 125
+
+
+ 785143
+ 6
+ 125
+
+
+ 791143
+ 6
+ 125
+
+
+ 797143
+ 6
+ 125
+
+
+ 803143
+ 6
+ 125
+
+
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/France.Nantes.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/France.Nantes.xml
index 063d230f041..d7ad5874c1d 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/France.Nantes.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/France.Nantes.xml
@@ -1,32 +1,32 @@
- 530000
+ 682000
8
166
- 658000
+ 490000
8
166
- 802000
+ 546000
8
166
- 506000
+ 738000
8
166
- 522000
+ 658000
8
166
- 498000
+ 538000
8
166
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Hannover.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Hannover.xml
new file mode 100644
index 00000000000..817932825d9
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Hannover.xml
@@ -0,0 +1,33 @@
+
+
+
+490000
+8
+125
+
+
+498000
+8
+125
+
+
+594000
+8
+125
+
+
+658000
+8
+125
+
+
+682000
+8
+125
+
+
+786000
+8
+125
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Rhein_Main.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Rhein_Main.xml
index 1ff3e0e846e..f33288b6942 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Rhein_Main.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Germany.Rhein_Main.xml
@@ -1,8 +1,8 @@
- 198500
- 7
+ 618000
+ 8
125
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Infill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Infill.xml
index e0542b4f3cc..dad66c9b6cc 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Infill.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Infill.xml
@@ -16,7 +16,12 @@
0
- 722000
+ 578000
+ 8
+ 0
+
+
+ 594000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Waiatarua.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Waiatarua.xml
index 31cc95af4e5..7b988041457 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Waiatarua.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Auckland - Waiatarua.xml
@@ -16,7 +16,17 @@
0
- 698000
+ 586000
+ 8
+ 0
+
+
+ 602000
+ 8
+ 0
+
+
+ 634000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Sugarloaf.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Sugarloaf.xml
index 670a0237018..fa011e06ac8 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Sugarloaf.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Sugarloaf.xml
@@ -16,12 +16,22 @@
0
- 778000
+ 562000
8
0
- 690000
+ 578000
+ 8
+ 0
+
+
+ 594000
+ 8
+ 0
+
+
+ 626000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Mt Cargill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Mt Cargill.xml
index 865b1d2559a..dd90b25f543 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Mt Cargill.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Mt Cargill.xml
@@ -16,12 +16,22 @@
0
- 746000
+ 562000
8
0
- 690000
+ 578000
+ 8
+ 0
+
+
+ 594000
+ 8
+ 0
+
+
+ 626000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Gramians.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Parikanapa.xml
similarity index 73%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Gramians.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Parikanapa.xml
index 30de4be7f7b..b1cb9e5b3a8 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Gramians.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Parikanapa.xml
@@ -1,22 +1,22 @@
- 530000
+ 562000
8
0
- 682000
+ 578000
8
0
- 698000
+ 658000
8
0
- 722000
+ 594000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Infill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Wheatstone Road.xml
similarity index 76%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Infill.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Wheatstone Road.xml
index 7c43b0768ec..99123f57421 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Infill.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Wheatstone Road.xml
@@ -1,27 +1,27 @@
- 682000
+ 570000
8
0
- 738000
+ 634000
8
0
- 762000
+ 682000
8
0
- 778000
+ 586000
8
0
- 674000
+ 602000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Mt Erin.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Mt Erin.xml
index 8e341cd3a72..1f7f4efc688 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Mt Erin.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Mt Erin.xml
@@ -16,7 +16,22 @@
0
- 682000
+ 570000
+ 8
+ 0
+
+
+ 586000
+ 8
+ 0
+
+
+ 602000
+ 8
+ 0
+
+
+ 634000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Napier Airport.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Napier Airport.xml
new file mode 100644
index 00000000000..7ca10d5bfec
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Napier Airport.xml
@@ -0,0 +1,38 @@
+
+
+
+ 690000
+ 8
+ 0
+
+
+ 706000
+ 8
+ 0
+
+
+ 778000
+ 8
+ 0
+
+
+ 562000
+ 8
+ 0
+
+
+ 578000
+ 8
+ 0
+
+
+ 594000
+ 8
+ 0
+
+
+ 626000
+ 8
+ 0
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisbourne - Whakapunake.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Invercargill - Forest Hill.xml
similarity index 60%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisbourne - Whakapunake.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Invercargill - Forest Hill.xml
index a111e633361..52cbe041409 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisbourne - Whakapunake.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Invercargill - Forest Hill.xml
@@ -1,22 +1,17 @@
- 690000
+ 562000
8
0
- 706000
+ 578000
8
0
- 778000
- 8
- 0
-
-
- 746000
+ 594000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Kapiti - Ngarara.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Kapiti - Ngarara.xml
index 0529d0bb9f2..3b5c5ee5752 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Kapiti - Ngarara.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Kapiti - Ngarara.xml
@@ -1,27 +1,22 @@
- 666000
- 8
- 0
-
-
- 730000
+ 570000
8
0
- 762000
+ 586000
8
0
- 570000
+ 602000
8
0
- 538000
+ 634000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Manawatu - Wharite.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Manawatu - Wharite.xml
index 981fc2e9fa0..7ca10d5bfec 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Manawatu - Wharite.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Manawatu - Wharite.xml
@@ -16,12 +16,22 @@
0
- 746000
+ 562000
8
0
- 698000
+ 578000
+ 8
+ 0
+
+
+ 594000
+ 8
+ 0
+
+
+ 626000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Southland - Hedgehope.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Kaka Hill.xml
similarity index 62%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Southland - Hedgehope.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Kaka Hill.xml
index 238aa92ea6a..e97a8259bb2 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Southland - Hedgehope.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Kaka Hill.xml
@@ -1,27 +1,32 @@
- 650000
+ 610000
8
0
- 666000
+ 626000
8
0
- 730000
+ 642000
8
0
- 746000
+ 562000
8
0
- 706000
+ 578000
+ 8
+ 0
+
+
+ 594000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Mt Campbell.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Mt Campbell.xml
new file mode 100644
index 00000000000..1a30d923186
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Mt Campbell.xml
@@ -0,0 +1,33 @@
+
+
+
+ 554000
+ 8
+ 0
+
+
+ 634000
+ 8
+ 0
+
+
+ 682000
+ 8
+ 0
+
+
+ 570000
+ 8
+ 0
+
+
+ 586000
+ 8
+ 0
+
+
+ 602000
+ 8
+ 0
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Rotorua - Pukepoto.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Rotorua - Pukepoto.xml
index 61eded2e90f..8438c47a2e9 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Rotorua - Pukepoto.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Rotorua - Pukepoto.xml
@@ -1,22 +1,22 @@
- 698000
+ 554000
8
0
- 746000
+ 586000
8
0
- 762000
+ 602000
8
0
- 794000
+ 570000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taranaki - Mt Taranaki.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taranaki - Mt Taranaki.xml
index 981fc2e9fa0..52cbe041409 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taranaki - Mt Taranaki.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taranaki - Mt Taranaki.xml
@@ -1,27 +1,17 @@
- 690000
+ 562000
8
0
- 706000
+ 578000
8
0
- 778000
- 8
- 0
-
-
- 746000
- 8
- 0
-
-
- 698000
+ 594000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Hospital Hill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Whakaroa.xml
similarity index 60%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Hospital Hill.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Whakaroa.xml
index a111e633361..96ccf01b32d 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Hospital Hill.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Whakaroa.xml
@@ -1,22 +1,17 @@
- 690000
+ 570000
8
0
- 706000
+ 586000
8
0
- 778000
- 8
- 0
-
-
- 746000
+ 602000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairua.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairoa.xml
similarity index 57%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairua.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairoa.xml
index 6c6f0910c32..e14d93e3834 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairua.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairoa.xml
@@ -1,5 +1,10 @@
+
+ 642000
+ 8
+ 0
+
698000
8
@@ -11,12 +16,22 @@
0
- 642000
+ 570000
+ 8
+ 0
+
+
+ 586000
+ 8
+ 0
+
+
+ 602000
8
0
- 522000
+ 634000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Tuhingamata.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Timaru - Cave Hill.xml
similarity index 73%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Tuhingamata.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Timaru - Cave Hill.xml
index 30de4be7f7b..b9dcf43b566 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Tuhingamata.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Timaru - Cave Hill.xml
@@ -1,22 +1,22 @@
- 530000
+ 570000
8
0
- 682000
+ 602000
8
0
- 698000
+ 650000
8
0
- 722000
+ 586000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Hamilton.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Hamilton.xml
index 20f01ee460f..85959ed62fb 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Hamilton.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Hamilton.xml
@@ -16,7 +16,22 @@
0
- 522000
+ 570000
+ 8
+ 0
+
+
+ 586000
+ 8
+ 0
+
+
+ 602000
+ 8
+ 0
+
+
+ 634000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Te Aroha.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Te Aroha.xml
index 95de7b6a814..efd7066c2d3 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Te Aroha.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Waikato - Te Aroha.xml
@@ -15,4 +15,24 @@
8
0
+
+ 562000
+ 8
+ 0
+
+
+ 578000
+ 8
+ 0
+
+
+ 594000
+ 8
+ 0
+
+
+ 626000
+ 8
+ 0
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wairarapa - Popoiti.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wairarapa - Popoiti.xml
new file mode 100644
index 00000000000..96ccf01b32d
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wairarapa - Popoiti.xml
@@ -0,0 +1,18 @@
+
+
+
+ 570000
+ 8
+ 0
+
+
+ 586000
+ 8
+ 0
+
+
+ 602000
+ 8
+ 0
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wanganui - Mt Jowett.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wanganui - Mt Jowett.xml
index 251766185d9..96ccf01b32d 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wanganui - Mt Jowett.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wanganui - Mt Jowett.xml
@@ -1,22 +1,17 @@
- 666000
+ 570000
8
0
- 730000
+ 586000
8
0
- 762000
- 8
- 0
-
-
- 794000
+ 602000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Infill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Infill.xml
index 3750b1f232b..fdb84d7bed6 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Infill.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Infill.xml
@@ -21,7 +21,17 @@
0
- 538000
+ 586000
+ 8
+ 0
+
+
+ 602000
+ 8
+ 0
+
+
+ 634000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Mt Kaukau.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Mt Kaukau.xml
index 981fc2e9fa0..7ca10d5bfec 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Mt Kaukau.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Wellington - Mt Kaukau.xml
@@ -16,12 +16,22 @@
0
- 746000
+ 562000
8
0
- 698000
+ 578000
+ 8
+ 0
+
+
+ 594000
+ 8
+ 0
+
+
+ 626000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Horokaka.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Horokaka.xml
deleted file mode 100644
index f28101c129c..00000000000
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Horokaka.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 554000
- 8
- 0
-
-
- 666000
- 8
- 0
-
-
- 706000
- 8
- 0
-
-
- 794000
- 8
- 0
-
-
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Parahaki.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Parahaki.xml
index a8a9b7c7df3..52cbe041409 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Parahaki.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Whangarei - Parahaki.xml
@@ -1,22 +1,17 @@
- 570000
+ 562000
8
0
- 682000
+ 578000
8
0
- 690000
- 8
- 0
-
-
- 714000
+ 594000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Buskerud - Ringerike.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Buskerud - Ringerike.xml
index 238fec6876c..ff1d7763afb 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Buskerud - Ringerike.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Buskerud - Ringerike.xml
@@ -1,5 +1,10 @@
+
+ 490000
+ 8
+ 0
+
554000
8
@@ -9,6 +14,11 @@
570000
8
0
+
+
+ 634000
+ 8
+ 0
698000
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Infill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Vestfold - Larvik.xml
similarity index 73%
rename from TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Infill.xml
rename to TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Vestfold - Larvik.xml
index 197feb52e60..46a2c24c6ef 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Infill.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Vestfold - Larvik.xml
@@ -1,27 +1,27 @@
- 650000
+ 786000
8
0
- 666000
+ 682000
8
0
- 746000
+ 594000
8
0
-
- 786000
+
+ 498000
8
0
-
- 554000
+
+ 658000
8
0
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Craigkelly.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Craigkelly.xml
index 18d97697e15..7ecd464b07c 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Craigkelly.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Craigkelly.xml
@@ -1,33 +1,38 @@
-
- 570000
- 8
- 167
-
-
- 538000
- 8
- 167
-
-
- 490000
- 8
- 167
-
-
- 514000
- 8
- 167
-
-
- 642000
- 8
- 167
-
-
- 618000
- 8
- 167
-
+
+474000
+8
+167
+
+
+498000
+8
+167
+
+
+522000
+8
+167
+
+
+618000
+8
+167
+
+
+642000
+8
+167
+
+
+666000
+8
+167
+
+
+722000
+8
+167
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Durris.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Durris.xml
index 686df67528e..b6dc8a51799 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Durris.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Durris.xml
@@ -6,32 +6,27 @@
167
- 506000
- 8
- 167
-
-
- 530000
+ 490000
8
167
- 546000
+ 506000
8
167
- 634000
+ 514000
8
167
- 714000
+ 530000
8
167
- 722000
+ 538000
8
167
diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Mendip.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Mendip.xml
index 6f3f95b1fc1..65f857bbf87 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Mendip.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Mendip.xml
@@ -1,27 +1,27 @@
- 738000
+ 690000
8
167
- 754000
+ 722000
8
167
- 770000
+ 738000
8
167
- 794000
+ 770000
8
167
- 802000
+ 794000
8
167
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/channels/channels.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/channels/channels.xml
index da06e000639..6ca526c4fb7 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/channels/channels.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/channels/channels.xml
@@ -3036,8 +3036,8 @@
EinsPlus
- plus@tv4.se
- TV4 Plus
+ sjuan@tv4.se
+ Sjuan
plus@uk.startv.com
@@ -5468,8 +5468,8 @@
Toon Disney
- playhouse@disney.no
- Disney Playhouse
+ junior@disney.go.com
+ Disney Junior
sportn@viasat.no
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/1-www_fernsehen_ch.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/1-www_fernsehen_ch.xml
index 2d2c53b0001..08ec28ba01e 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/1-www_fernsehen_ch.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/1-www_fernsehen_ch.xml
@@ -2,73 +2,109 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/20min_ch.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/20min_ch.xml
deleted file mode 100644
index 88c99cb5197..00000000000
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/20min_ch.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <tr>
- <td><#START></td>
- <td></td>
- <td><#TITLE></td>
- </tr>
-
-
-
-
-
-
- </tr>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
- <Z(>
- <tr>
- <td><*MATCH></td>
- <td><*VALUE></td>
- </tr>
- </Z)?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/3-www_tvtv_ch.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/3-www_tvtv_ch.xml
new file mode 100644
index 00000000000..4cd59b822e5
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/CH/3-www_tvtv_ch.xml
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<td><div><span><#START></span></div></td><td><div><a href><#TITLE></a></div><div><#DESCRIPTION></div></td>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/DK/www_ahot_dk.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/DK/www_ahot_dk.xml
index c2adffd30cf..4296f184143 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/DK/www_ahot_dk.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/DK/www_ahot_dk.xml
@@ -6,43 +6,62 @@
-
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
@@ -68,6 +87,8 @@
+
+
@@ -104,11 +125,8 @@
-
-
-
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telkku_com.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telkku_com.xml
new file mode 100644
index 00000000000..0d7a1b9478f
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telkku_com.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<li>
+ <span class="programDate"><a href="http://www.telkku.com/program/show/2011051007501"><#START> <#TITLE></a></span><br />
+ <span class="programDescription"><#DESCRIPTION></span>
+ </li>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telvis_fi.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telvis_fi.xml
index 3a187515894..a6931710fa8 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telvis_fi.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telvis_fi.xml
@@ -1,78 +1,137 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/descriptions_teleman_pl.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/descriptions_teleman_pl.xml
index 2ee225ec1c4..b5a817c29bd 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/descriptions_teleman_pl.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/descriptions_teleman_pl.xml
@@ -1,114 +1,145 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
<tr><th><#START>TRWA</th><td><a href="" title=""><#TITLE>: <#SUBTITLE></a><z(><div><span class=""><#GENRE>,</span></div><p></p></z)?>
-
-
+
+
- <div class="desc"><#DESCRIPTION><br class="clear" /></div><z(></div><div class="desc"><div class=""><strong></strong><span class="" title=""></span><span class=""></span><span class=""></span><a href="" title=""><img src="" width="" height="" alt="" /></a></div><div class=""></z)?>
+ <p itemprop="description"><#DESCRIPTION></p>
@@ -116,14 +147,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazeta_pl.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazeta_pl.xml
new file mode 100644
index 00000000000..b055c0f0e2b
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazeta_pl.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <div><#START></div><div><a><#TITLE></a><p><#GENRE></p><p><#DESCRIPTION></div><div>
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazetaecho_pl.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazetaecho_pl.xml
new file mode 100644
index 00000000000..963ea02f1ad
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazetaecho_pl.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <TR valign=top onmouseover="" onmouseout=""><TD class=s style='padding:4px; background-color:#EEEEEE' align=center><#START><BR><img src='' width=13 height=13></TD><TD class=s style='padding:4px' width=99%><A class=navs HREF=''><B><#TITLE></B></A><z(><BR><span class=vss><#GENRE>,<#COUNTRY>,<#YEAR>,<#ACTORS></span></z)?></TD></TR>
+
+
+
+
+
+
+ <TD width=95% class=vs></TD></TR>
+</TABLE><BR><P><#DESCRIPTION></TD></TR>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/tvplaneten_tv4_se.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/tvplaneten_tv4_se.xml
new file mode 100644
index 00000000000..394ddc672e0
--- /dev/null
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/tvplaneten_tv4_se.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<li>
+ <h3><#START> <#TITLE></h3>
+ <#DESCRIPTION>
+</li>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+ -
+ -
+ -
+ '
+ "
+ "
+ . Från
+ . Även
+
+
\ No newline at end of file
diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml
index a8d9fc6d337..e349a822d9a 100644
--- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml
+++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml
@@ -86,7 +86,7 @@
-
+
@@ -124,7 +124,7 @@
-
+