Merge tag 'upstream/0+git20150208.f2053b3'

Upstream version 0+git20150208.f2053b3

6 files changed, 166 insertions, 196 deletions

diff --git a/dvb-s/Astra-31.5E b/dvb-s/Astra-31.5E
deleted file mode 100644
index 31266ff..0000000
--- a/dvb-s/Astra-31.5E
+++ /dev/null
@@ -1,55 +0,0 @@
-# Astra 1G @ 31.5E
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11992000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 10
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11992000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 20
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 30
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 40
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12304500
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W
index 383b122..0c85d50 100644
--- a/dvb-s/Atlantic-Bird-1-12.5W
+++ b/dvb-s/Atlantic-Bird-1-12.5W
@@ -1,5 +1,4 @@
 # Atlantic Bird 1 @ 12.5W
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W
index 2800188..9d751a7 100644
--- a/dvb-s/Atlantic-Bird-3-5.0W
+++ b/dvb-s/Atlantic-Bird-3-5.0W
@@ -1,5 +1,4 @@
 # Atlantic Bird 3 @ 5.0W
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS2
@@ -10,7 +9,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -22,7 +21,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 3
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -34,7 +33,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 11
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -46,7 +45,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 4
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -58,7 +57,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 5
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -70,7 +69,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 12
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -82,7 +81,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -94,7 +93,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -106,7 +105,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 3
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -118,7 +117,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 4
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -130,7 +129,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 5
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -142,7 +141,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 6
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -154,7 +153,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 7
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -166,7 +165,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 8
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -178,7 +177,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 9
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -190,7 +189,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 10
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -202,7 +201,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 11
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -214,7 +213,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 12
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -226,7 +225,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 13
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -238,7 +237,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 14
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -250,7 +249,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 15
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -262,7 +261,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 16
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -274,7 +273,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -286,7 +285,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -298,7 +297,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -310,7 +309,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -322,8 +321,8 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 121212
-	PLS MODE = 1
+	PLS_CODE = 121212
+	PLS_MODE = 1
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -335,8 +334,8 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 121212
-	PLS MODE = 1
+	PLS_CODE = 121212
+	PLS_MODE = 1
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -348,7 +347,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -360,6 +359,6 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E
index c1759e0..0df0ab3 100644
--- a/dvb-s/Hotbird-13.0E
+++ b/dvb-s/Hotbird-13.0E
@@ -1,5 +1,4 @@
 # EUTELSAT SkyPlex, Hotbird 13E
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
@@ -266,30 +265,6 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11432000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 1
-	PLS CODE = 8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11432000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 2
-	PLS CODE = 8
-	INVERSION = AUTO
-
-[CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11470000
 	POLARIZATION = VERTICAL
@@ -458,11 +433,27 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11919000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 2/3
+	ROLLOFF = AUTO
+	MODULATION = PSK/8
+	STREAM_ID = 1
+	PLS_CODE = 8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11919000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	ROLLOFF = AUTO
+	MODULATION = PSK/8
+	STREAM_ID = 2
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -690,7 +681,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -702,7 +693,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
diff --git a/dvb-s/Intelsat-12-45.0E b/dvb-s/Intelsat-12-45.0E
index d98b9dd..124b0ec 100644
--- a/dvb-s/Intelsat-12-45.0E
+++ b/dvb-s/Intelsat-12-45.0E
@@ -1,5 +1,4 @@
 # Intelsat 12 @ 45.0E
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS2
diff --git a/dvb-s/Sirius-5.0E b/dvb-s/Sirius-5.0E
index e5d47b7..9f93c38 100644
--- a/dvb-s/Sirius-5.0E
+++ b/dvb-s/Sirius-5.0E
@@ -1,34 +1,59 @@
 # Sirius 5.0E
-# freq pol sr fec
+# automatically generated from kingofsat.net ini file 0048.ini
+# http://en.kingofsat.net/satellites.php
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11215000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11265000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11265000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = 1/2
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11227000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11305000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11247000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11305000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11420000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11345000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11345000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11385000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
@@ -217,7 +242,7 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12169000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
@@ -225,18 +250,28 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12188000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 7/8
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 10
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12188000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+	STREAM_ID = 20
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12207000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
@@ -285,23 +320,33 @@
 	FREQUENCY = 12322000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12341000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 30
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12341000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 40
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12360000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 7/8
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -317,7 +362,7 @@
 	FREQUENCY = 12399000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -329,15 +374,15 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12437000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12456000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
@@ -353,6 +398,14 @@
 	INVERSION = AUTO
 
 [CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12575000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13922000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
+[CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12608000
 	POLARIZATION = HORIZONTAL
@@ -370,113 +423,97 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12668000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = 1/2
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12672000
+	FREQUENCY = 12670000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 2600000
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12674000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	FREQUENCY = 12680000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 9404000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12678000
+	FREQUENCY = 12682000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13333000
+	SYMBOL_RATE = 6888000
 	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12680000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12687000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9404000
+	SYMBOL_RATE = 5600000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12685000
+	FREQUENCY = 12687000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = 3/4
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 6667000
+	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12693000
+	FREQUENCY = 12694000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3333000
 	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12701000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12702000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
+	SYMBOL_RATE = 2100000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12715000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
+	FREQUENCY = 12703000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2963000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12718000
+	FREQUENCY = 12719000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23500000
+	SYMBOL_RATE = 2960000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12724000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1772000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12722000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1600000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12728000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12725000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 19720000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 1480000
+	INNER_FEC = 8/9
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12737000
+	FREQUENCY = 12728000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6150000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 1600000
+	INNER_FEC = 2/3
 	INVERSION = AUTO