1 files changed, 37 insertions, 68 deletions

diff --git a/dvb-s/AsiaSat-5-100.5E b/dvb-s/AsiaSat-5-100.5E
index a93adebf..339b9422 100644
--- a/dvb-s/AsiaSat-5-100.5E
+++ b/dvb-s/AsiaSat-5-100.5E
@@ -56,11 +56,10 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3704000
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3702000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 3255000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -118,11 +117,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TDM Macau Satélite]
-	DELIVERY_SYSTEM = DVBS
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3784000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3255000
+	SYMBOL_RATE = 3600000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -261,15 +261,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ukraïna 24]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3934000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3939000
@@ -288,7 +279,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[SES]
+[AsiaSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3960000
 	POLARIZATION = HORIZONTAL
@@ -360,12 +351,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[APTN]
-	DELIVERY_SYSTEM = DVBS2
+[{}]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 4114000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 18400000
-	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -450,35 +440,21 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12267000
+[Madani Channel Urdu]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12301000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
+	SYMBOL_RATE = 2916000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12288000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Xinhua News TV]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12320000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 8000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12347000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -514,23 +490,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Madani Channel Urdu]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12427000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2916000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12437000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2590000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12494000
@@ -548,10 +507,11 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12582000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12579000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5632000
+	SYMBOL_RATE = 1460000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -573,9 +533,9 @@
 
 [SETN]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12627000
+	FREQUENCY = 12621000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3300000
+	SYMBOL_RATE = 4166000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -587,20 +547,29 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[TTV News]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12645000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1250000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [TVBS News]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12651000
+	FREQUENCY = 12656000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 4000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TAS]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12686000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1667000
+	FREQUENCY = 12678000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7120000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO