[Sky and Freesat 28.2E] Update itv_rename section

Delete redundant SD renames
Group channels by names

AutoBouquetsMaker/providers/sat_282_freesat.xml

@@ -101,17 +101,7 @@ except:
 #The Sky ones are sorted by Channel IDs, Freesat and Sky Channel IDs are different!
 	itv_rename = {
 		# ITV regions
-		1004: "ITV1 Border Scotland",
-		1011: "ITV1 London",
-#		1019: "ITV1 Wales",	#This is correct on stream, no need for rename.
-		1010: "ITV1 Granada",
-		1012: "ITV1 Meridian East",
-		1009: "ITV1 Channel Isles",
 		1023: "STV North",
-		1024: "STV West",
-#		1026: "UTV",	#This is correct on stream, no need for rename.
-		1008: "ITV1 Central West",
-		1108: "STV Tayside",
 		1025: "STV East",
 
 		# +1 Channels
@@ -134,12 +124,14 @@ except:
 		1042: "ITV1 Central East HD",
 		1048: "ITV1 Channel Isles HD",
 		1047: "ITV1 Border Scotland HD",
-		20009: "STV West HD",
 #		10013: "ITV1 Wales HD",	#This is correct on stream, no need for rename.
 		10011: "ITV1 Meridian East HD",
 		10012: "ITV1 Central West HD",
 		10005: "ITV1 London HD",
 		10007: "ITV1 Granada HD",
+
+		20009: "STV West HD",
+
 #		1040: "UTV HD",	#This is correct on stream, no need for rename.
 	}
 

AutoBouquetsMaker/providers/sat_282_sky_irl.xml

@@ -198,17 +198,7 @@ except:
 	}
 
 	itv_rename = {
-		1020: "ITV1 Border Scotland",
-		6000: "ITV1 London",
-#		6020: "ITV1 Wales",	#This is correct on stream, no need for rename.
-		6130: "ITV1 Granada",
-		6142: "ITV1 Meridian East",
-		6200: "ITV1 Channel Isles",
 		6210: "STV North",
-		6220: "STV West",
-#		6230: "UTV",	#This is correct on stream, no need for rename.
-		6300: "ITV1 Central West",
-		6325: "STV Tayside",
 		6371: "STV East",
 
 		# +1 Channels
@@ -224,22 +214,24 @@ except:
 		1061: "ITV1 Border England HD",
 		1062: "ITV1 West Country SW HD",
 		1063: "ITV1 West Country West HD",
-		1167: "STV Dundee HD",
-		1168: "STV North HD",
-		1170: "STV East HD",
 		1208: "ITV1 Meridian Thames Valley HD",
 		1209: "ITV1 Meridian South Coast HD",
 		1214: "ITV1 Yorkshire East HD",
 		1217: "ITV1 Anglia West HD",
 		1219: "ITV1 Central East HD",
 		3062: "ITV1 Channel Isles HD",
 		3063: "ITV1 Border Scotland HD",
-		4055: "STV West HD",
 #		6501: "ITV1 Wales HD",	#This is correct on stream, no need for rename.
 		6502: "ITV1 Meridian East HD",
 		6503: "ITV1 Central West HD",
 		6504: "ITV1 London HD",
 		6505: "ITV1 Granada HD",
+
+		1167: "STV Dundee HD",
+		1168: "STV North HD",
+		1170: "STV East HD",
+		4055: "STV West HD",
+
 #		6510: "UTV HD",	#This is correct on stream, no need for rename.
 	}
 

AutoBouquetsMaker/providers/sat_282_sky_uk.xml

@@ -361,17 +361,7 @@ except:
 	}
 
 	itv_rename = {
-		1020: "ITV1 Border Scotland",
-		6000: "ITV1 London",
-#		6020: "ITV1 Wales",	#This is correct on stream, no need for rename.
-		6130: "ITV1 Granada",
-		6142: "ITV1 Meridian East",
-		6200: "ITV1 Channel Isles",
 		6210: "STV North",
-		6220: "STV West",
-#		6230: "UTV",	#This is correct on stream, no need for rename.
-		6300: "ITV1 Central West",
-		6325: "STV Tayside",
 		6371: "STV East",
 
 		# +1 Channels
@@ -387,22 +377,24 @@ except:
 		1061: "ITV1 Border England HD",
 		1062: "ITV1 West Country SW HD",
 		1063: "ITV1 West Country West HD",
-		1167: "STV Dundee HD",
-		1168: "STV North HD",
-		1170: "STV East HD",
 		1208: "ITV1 Meridian Thames Valley HD",
 		1209: "ITV1 Meridian South Coast HD",
 		1214: "ITV1 Yorkshire East HD",
 		1217: "ITV1 Anglia West HD",
 		1219: "ITV1 Central East HD",
 		3062: "ITV1 Channel Isles HD",
 		3063: "ITV1 Border Scotland HD",
-		4055: "STV West HD",
 #		6501: "ITV1 Wales HD",	#This is correct on stream, no need for rename.
 		6502: "ITV1 Meridian East HD",
 		6503: "ITV1 Central West HD",
 		6504: "ITV1 London HD",
 		6505: "ITV1 Granada HD",
+
+		1167: "STV Dundee HD",
+		1168: "STV North HD",
+		1170: "STV East HD",
+		4055: "STV West HD",
+
 #		6510: "UTV HD",	#This is correct on stream, no need for rename.
 	}