Updated PW channels

2 files changed, 59 insertions, 75 deletions

diff --git a/HISTORY b/HISTORY
index 8cc945d1..1cfd53bd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1219,7 +1219,7 @@ Video Disk Recorder Revision History
 - Now encoding '.' at the end of a directory name in case of VFAT=1, since Windows
   can't handle these (thanks to Simon Dean for reporting this one).
 
-2002-05-03: Version 1.0.2
+2002-05-05: Version 1.0.2
 
 - Now taking an active video cutting process into account when doing shutdown or
   housekeeping (thanks to Stefan Huelswitt).
@@ -1230,9 +1230,9 @@ Video Disk Recorder Revision History
   for reporting this one).
 - Fixed a crash on systems with disks that have a block size larger than 1MB
   (thanks to Ulrich Petri for helping to debug this one).
-- Updated 'channels.conf' for the new PW settings (thanks to Andreas Share and
-  Carsten Koch). Note that all channels with numbers over 50 may have moved,
-  so you should carefully check any timers you have set!
+- Updated 'channels.conf' for the new PW settings (thanks to Andreas Share,
+  Carsten Koch, Gerald Raaf and Mel Schächner). Note that all channels with numbers
+  over 50 may have moved, so you should carefully check any timers you have set!
 - Updated 'channels.conf.cable' for the new PW settings (thanks to Oliver Lorei
   and Stephan Schreiber). Note that all channels may have moved, so you should
   carefully check any timers you have set!
diff --git a/channels.conf b/channels.conf
index be18f30b..7594a05c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -48,84 +48,68 @@ ORB:12110:h:0:27500:501:502:504:0:28205
 B1:12110:h:0:27500:601:602:604:0:28206
 ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
-Premiere World:11797:h:0:27500:255:256:32:0:8
-Premiere 1:11797:h:0:27500:511:512:0:101:10
-Premiere 2:11797:h:0:27500:1791:1792:0:101:11
+Premiere Start:11797:h:0:27500:255:256:0:101:8
+Premiere 1:11797:h:0:27500:511:512,513;515:0:101:10
+Premiere 2:11797:h:0:27500:1791:1792,1793;1795:0:101:11
 Premiere 3:11797:h:0:27500:2303:2304:0:101:43
-Premiere One:12032:h:0:27500:3071:3072:0:101:51
-Premiere Star:11797:h:0:27500:767:768:0:101:9
-Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:101:41
-Premiere Action:11797:h:0:27500:1023:1024:0:101:20
-Premiere X-Action:11798:h:0:27500:2047:2048:0:101:50
-Premiere Comedy:11797:h:0:27500:1279:1280:0:101:29
-13th Street:12031:h:0:27500:2303:2304:0:101:42
+Premiere 4:11797:h:0:27500:767:768:0:101:9
+Premiere 5:11797:h:0:27500:1279:1280:0:101:29
+Premiere 6:11797:h:0:27500:1535:1536:0:101:41
+Premiere 7:11797:h:0:27500:1023:1024:0:101:20
+13th Street:11758:h:0:27500:2303:2304:0:101:42
 Studio Universal:12090:V:0:27500:255:256:0:101:36
-Filmpalast:12031:h:0:27500:2559:2560:0:101:516
-Heimatkanal:12031:h:0:27500:2815:2816:0:101:517
-Discovery Channel:12031:h:0:27500:1791:1792:0:101:14
-Planet:12090:V:0:27500:1279:1280:0:101:13
-Fox Kids:12031:h:0:27500:1279:1280:0:101:28
-Fox Kids Türkce:11914:H:0:27500:767:768:8191:101:54
-Junior:12031:h:0:27500:255:256:0:101:19
-K-Toon:12031:h:0:27500:511:512:0:101:12
+Premiere Serie:12031:h:0:27500:1023:1024:0:101:16
 Disney Channel:12090:V:0:27500:767:768:0:101:34
-Sunset:12031:h:0:27500:1023:1024:0:101:16
+Premiere Nostalgie:12031:h:0:27500:2559:2560:0:101:516
+Discovery Channel:12031:h:0:27500:1791:1792:0:101:14
+Planet:12090:v:0:27500:1279:1280:0:101:13
+Fox Kids:11758:h:0:27500:1279:1280:0:101:28
+Junior:11758:h:0:27500:255:256:0:101:19
+K-Toon:11758:h:0:27500:511:512:0:101:12
 Krimi&Co:12031:h:0:27500:1535:1536:0:101:23
-Goldstar TV:12031:h:0:27500:3839:3840:0:101:518
-Classica:12031:h:0:27500:767:768:0:101:15
-Seasons:12090:V:0:27500:511:512:0:101:33
-:Cinedom
-Cinedom Deluxe:11758:h:0:27500:255:256,257;259:0:101:189
-Cinedom 1A:11758:h:0:27500:511:512,513:0:101:190
-Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:101:178
-Cinedom 1C:11720:h:0:27500:511:512,513:0:101:180
-Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:101:176
-Cinedom 2A:11758:h:0:27500:1023:1024,1025:0:101:193
-Cinedom 2B:11720:h:0:27500:1279:1280:0:101:183
-Cinedom 2C:12070:h:0:27500:1791:1792:0:101:179
-Cinedom 2D:12070:h:0:27500:511:512:0:101:184
-Cinedom 2E:12070:h:0:27500:1279:1280:0:101:188
-Cinedom 3A:11758:h:0:27500:2559:2560:0:101:192
-Cinedom 3B:11758:h:0:27500:1535:1536:0:101:195
-Cinedom 3C:12070:h:0:27500:767:768:0:101:185
-Cinedom 3D:11720:h:0:27500:1023:1024:0:101:182
-Cinedom 4A:11758:h:0:27500:767:768:0:101:191
-Cinedom 4B:11720:h:0:27500:767:768:0:101:181
-Cinedom 4C:12070:h:0:27500:2047:2048:0:101:187
-Cinedom 5A:11758:h:0:27500:1279:1280:0:101:194
-Cinedom 5B:11720:h:0:27500:1791:1792:0:101:177
-Cinedom 5C:12070:h:0:27500:1023:1024:0:101:186
-:Beta Digital
-N24:12480:v:0:27500:2047:2048:0:0:47
-CNBC:11954:h:0:27500:510:520:0:0:28010
-Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
+Goldstar TV:11758:h:0:27500:3839:3840:0:101:518
+Classica:11758:h:0:27500:767:768:0:101:15
+Sonnenklar TV:12090:V:0:27500:1023:1024:0:0:32
+:Premiere Direkt
+Premiere Direkt 1A:12031:h:0:27500:511:512,513;515:0:101:177
+Premiere Direkt 1B:11719:h:0:27500:1023:1024,1025;1027:0:101:182
+Premiere Direkt 2A:12031:h:0:27500:255:256;259:0:101:176
+Premiere Direkt 2B:11719:h:0:27500:767:768;769:0:101:181
+Premiere Direkt 3A:11719:h:0:27500:511:512;515:0:101:180
+Premiere Direkt 3B:11719:h:0:27500:1279:1280;1283:0:101:183
+Premiere Direkt 4A:12031:h:0:27500:2815:2816:0:101:18
+Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
 :PW Erotic
-Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:101:21
-Premiere Erotik 1:11758:h:0:27500:1791:1792:0:101:513
-Premiere Erotik 2:11758:h:0:27500:2047:2048:0:101:778
-Premiere Erotik 3:11758:h:0:27500:2303:2304:0:101:779
-Premiere Erotik 4:11758:h:0:27500:2559:2560:0:101:780
+Beate-Uhse.TV:11758:h:0:27500:1023:1024:0:101:21
+Premiere Erotik 1:12031:h:0:27500:1279:1280:0:101:513
+Premiere Erotik 2:11719:h:0:27500:1535:1536:0:101:778
+Premiere Erotik 3:11719:h:0:27500:1791:1792:0:101:779
+Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
 :Sportsworld
 Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
 Premiere Sport 2:12070:h:0:27500:3839:3840:0:101:27
-Premiere Sport 3:12070:h:0:27500:255:256:0:101:26
-:PW-Formel 1
-F1 Info:11720:h:0:27500:3071:3073:0:101:244
-F1 Multi:11720:h:0:27500:255:256:0:101:17
-F1 Supersignal:11720:h:0:27500:2047:2048:0:101:240
-F1 Verfolger:11720:h:0:27500:2815:2817:0:101:243
-F1 Cockpit:11720:h:0:27500:2303:2305:0:101:241
-F1 Boxen:11720:h:0:27500:2559:2561:0:101:242
-:Premiere World Bundesliga
-Superdom:11758:h:0:27500:2815:8192:0:101:18
-BuLi-Konferenz:11758:h:0:27500:3327:3328,3329:0:101:215
-BuLi-Spiel 1:11720:h:0:27500:255:256,257:0:101:17
-BuLi-Spiel 2:11720:h:0:27500:2047:2048,2049:0:101:240
-BuLi-Spiel 3:11720:h:0:27500:2303:2304,2305:0:101:241
-BuLi-Spiel 4:11720:h:0:27500:2559:2560,2561:0:101:242
-BuLi-Spiel 5:11720:h:0:27500:2815:2816,2817:0:101:243
-BuLi-Spiel 6:11720:h:0:27500:3071:3072,3073:0:101:244
-BuLi-Spiel 7:11758:h:0:27500:3071:3072,3073:0:101:214
+:Formel 1
+Supersignal:12070:h:0:27500:255:256:0:101:211
+Cockpitkanal:12070:h:0:27500:511:512:0:101:212
+Boxengasse:12070:h:0:27500:767:768:0:101:213
+Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
+Infokanal:12070:h:0:27500:1279:1280:0:101:215
+Multikanal:11720:h:0:27500:255:256:0:101:17
+:Beta Digital
+N24:12480:v:0:27500:2047:2048:0:0:47
+CNBC:11954:h:0:27500:510:520:0:0:28010
+Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
+:Premiere Bundesliga
+BL-Konferenz:12031:h:0:27500:2303:2304,2305:0:101:210
+BuLi 1:11719:h:0:27500:255:256,257:0:101:17
+BuLi 2:11719:h:0:27500:2047:2048,2049:0:101:240
+BuLi 3:11719:h:0:27500:2303:2304,2305:0:101:241
+BuLi 4:11719:h:0:27500:2559:2560,2561:0:101:242
+BuLi 5:11719:h:0:27500:2815:2816,2817:0:101:243
+BuLi 6:11719:h:0:27500:3071:3072,3073:0:101:244
+BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
+BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
+BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
@@ -169,7 +153,7 @@ ESC 1:12363:v:0:27500:163:104:0:0:0
 TV5 Europe:12363:v:0:27500:164:112:0:0:0
 TV7 Tunisia:12363:v:0:27500:166:128:0:0:0
 ARTE:12363:v:0:27500:167:137:0:0:0
-RAI Uno:12363:v:0:27500:289:290:0:0:8904
+RAI Uno:10788:v:0:22000:289:290:0:0:9004
 RTP International:12363:v:0:27500:300:301:0:0:0
 Fashion TV:12402:v:0:27500:163:92:0:0:0
 VideoService:12422:h:0:27500:255:256:0:0:0