summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-05-05 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-05-05 18:00:00 +0200
commitf2a4e5438d0fa75c82a46af864abd63d293ec339 (patch)
treed099c69f678fd4454ba0b8657d18c2a64564b2dd
parentcfac68ee8458c6b51e638dd787d931bd5baad57a (diff)
downloadvdr-patch-lnbsharing-f2a4e5438d0fa75c82a46af864abd63d293ec339.tar.gz
vdr-patch-lnbsharing-f2a4e5438d0fa75c82a46af864abd63d293ec339.tar.bz2
Version 1.0.2vdr-1.0.2
- Now taking an active video cutting process into account when doing shutdown or housekeeping (thanks to Stefan Huelswitt). - The default duration of an instant recording has been increased to 3 hours and is now configurable in the "Setup/Recording" menu. - Added Greek language texts (thanks to Dimitrios Dimitrakos). - Fixed the unit of the "SVDRP timeout" setup parameter (thanks to Marcus Kuba 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, 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 Stephan Schreiber and Uwe Scheffler). Note that all channels may have moved, so you should carefully check any timers you have set! For future updates of this file somebody with digital cable should take the role of the "maintainer" and send me updated versions based on the file that comes with the most recent version of VDR. I will then simply replace the entire file 'channels.conf.cable' whenever a new version is sent to me. - Fixed skipping forward in time shift mode near the end of the recording (thanks to Andreas Böttger for reporting this one).
-rw-r--r--CONTRIBUTORS20
-rw-r--r--HISTORY24
-rw-r--r--MANUAL6
-rw-r--r--channels.conf126
-rw-r--r--channels.conf.cable291
-rw-r--r--config.c8
-rw-r--r--config.h5
-rw-r--r--dvbapi.c5
-rw-r--r--i18n.c224
-rw-r--r--menu.c7
-rw-r--r--tools.c8
-rw-r--r--vdr.c4
12 files changed, 470 insertions, 258 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 874d98e..b6bd60a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,6 +12,7 @@ Carsten Koch <Carsten.Koch@icem.de>
for implementing the 'new recording' indicator
for suggesting that the "Back" button in replay mode should bring up the "Recordings" menu
for fixing the watchdog timer if the program hangs in OSD activities
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
Plamen Ganev <pganev@com-it.net>
for fixing the frequency offset for Hotbird channels
@@ -125,6 +126,8 @@ Stefan Huelswitt <huels@iname.com>
for reporting a possible endless loop in shifting recordings between DVB cards
for making it no longer setting PIDs 0x1FFF, which apparently fixes problems
with CAMs and AC3 sound only working the first time
+ for making the main loop take an active video cutting process into account when
+ doing shutdown or housekeeping
Ulrich Röder <roeder@efr-net.de>
for pointing out that there are channels that have a symbol rate higher than
@@ -292,6 +295,7 @@ Dirk Wiebel <dirk@wiebel.de>
Gerald Raaf <graaf@attglobal.net>
for helping to fix the still picture workaround in case the progress display
is active
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
Andreas Roedl <flood@flood-net.de>
for adding some DVB-T channels for Berlin (Germany) to channels.conf.terr
@@ -309,3 +313,19 @@ Matthias Hilbig <hilbig@upb.de>
Simon Dean <linux-dvb@sickhack.com>
for reporting a problem with '.' at the end of a directory name in case of VFAT=1
(Windows can't handle these)
+
+Dimitrios Dimitrakos <mail@dimitrios.de>
+ for translating OSD texts to the Greek language
+
+Marcus Kuba <marcus@kuba4u.de>
+ for reporting a bug in the unit of the "SVDRP timeout" setup parameter
+
+Ulrich Petri <ulope@gmx.de>
+ for his help in debugging a crash on systems with disks that have a block size
+ larger than 1MB
+
+Oliver Lorei <oliverlorei@cityweb.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
+
+Andreas Böttger <fboettger@t-online.de>
+ for reporting a bug in skipping forward in time shift mode near the end of the recording
diff --git a/HISTORY b/HISTORY
index 76e658e..8b1217a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1218,3 +1218,27 @@ Video Disk Recorder Revision History
AC3 sound only working the first time (thanks to Stefan Huelswitt).
- 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-05: Version 1.0.2
+
+- Now taking an active video cutting process into account when doing shutdown or
+ housekeeping (thanks to Stefan Huelswitt).
+- The default duration of an instant recording has been increased to 3 hours and
+ is now configurable in the "Setup/Recording" menu.
+- Added Greek language texts (thanks to Dimitrios Dimitrakos).
+- Fixed the unit of the "SVDRP timeout" setup parameter (thanks to Marcus Kuba
+ 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,
+ 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
+ Stephan Schreiber and Uwe Scheffler). Note that all channels may have moved, so
+ you should carefully check any timers you have set!
+ For future updates of this file somebody with digital cable should take the role
+ of the "maintainer" and send me updated versions based on the file that comes
+ with the most recent version of VDR. I will then simply replace the entire file
+ 'channels.conf.cable' whenever a new version is sent to me.
+- Fixed skipping forward in time shift mode near the end of the recording (thanks
+ to Andreas Böttger for reporting this one).
diff --git a/MANUAL b/MANUAL
index 58d78ae..9787131 100644
--- a/MANUAL
+++ b/MANUAL
@@ -518,6 +518,12 @@ Video Disk Recorder User's Manual
If this parameter is empty, the channel name will be used
by default.
+ Instant rec. time = 180
+ Defines the duration of an instant recording in minutes.
+ Default is 180 minutes (3 hours). The stop time of an
+ instant recording can be modified at any time by editing
+ the respective timer in the "Timers" menu.
+
Record Dolby Digital = yes
Turns recording of the Dolby Digital audio channels on
or off. This may be useful if you don't have the equipment
diff --git a/channels.conf b/channels.conf
index be18f30..7594a05 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
diff --git a/channels.conf.cable b/channels.conf.cable
index b6d5c05..3987fd8 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,184 +1,165 @@
-:verschlüsselte Fernsehprogramm
-PREMIERE ONE:378:h:0:6900:3071:3072:0:1:51
-PREMIERE MOVIE 1:370:h:0:6900:511:512;515:0:1:10
-PREMIERE MOVIE 2:370:h:0:6900:1791:1792:0:1:11
-PREMIERE MOVIE 3:370:h:0:6900:2303:2304:0:1:43
-PREMIERE ACTION:370:h:0:6900:1023:1024,1025:0:1:20
-PREMIERE X-ACTION:370:h:0:6900:2047:2048,2049:0:1:50
-PREMIERE SCI-FI:370:h:0:6900:1535:1536:0:1:41
-PREMIERE STAR:370:h:0:6900:767:768:0:1:9
-PREMIERE COMEDY:370:h:0:6900:1279:1280:0:1:29
-13 TH STREET:378:h:0:6900:2303:2304,2305:0:1:42
-KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
-STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
-DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
-FILMPALAST:378:h:0:6900:2559:2560:0:1:516
-DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
-SUNSET:378:h:0:6900:1023:1024:0:1:16
-PLANET:402:h:0:6900:1100:1104:0:1:13
-CLASSICA:378:h:0:6900:767:768:0:1:15
-GOLDSTAR TV:378:h:0:6900:3839:3840:0:1:518
-HEIMATKANAL:378:h:0:6900:2815:2816:0:1:517
-K-TOON:378:h:0:6900:511:512:0:1:12
-FOX KIDS:378:h:0:6900:1279:1280:0:1:28
-KiKa:394:h:0:6900:310:320:330:0:28008
-JUNIOR:378:h:0:6900:255:256:0:1:19
:Fernsehprogramme
-Das Erste:410:h:0:6900:101:102,88:104:0:28106
-ZDF:394:h:0:6900:110:120,121:130:0:28006
+Das Erste:410:h:0:6900:101:102:111:0:28106
+ZDF:394:h:0:6900:110:120:130:0:28006
+3sat:394:h:0:6900:210:220:230:0:28007
+arte:410:h:0:6900:401:402:404:0:28109
+EuroNews:394:h:0:6900:2221:2233:768:0:28015
ZDF.info:394:h:0:6900:610:620:0:0:28011
ZDF.doku:394:h:0:6900:660:670:0:0:28014
ZDF Theaterkanal:394:h:0:6900:1110:1120:130:0:28016
EinsExtra:426:h:0:6900:101:102:0:0:28201
EinsFestival:426:h:0:6900:201:202:0:0:28202
EinsMuXx:426:h:0:6900:301:302:0:0:28203
-3sat:394:h:0:6900:210:220:230:0:28007
-arte:410:h:0:6900:401:402:404:0:28109
-EuroNews:394:h:0:6900:2221:2233:768:0:28015
Phoenix:410:h:0:6900:901:902:0:0:28114
Eurosport:394:h:0:6900:410:420:430:0:28009
DW-tv:610:h:0:6900:634:632:0:0:6101
CNBC:394:h:0:6900:510:520:530:0:28010
+:Regionalprogramme
WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
+B1 Berlin:426:h:0:6900:601:602,603:604:0:28206
+ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
SuedWest BW:410:h:0:6900:801:802:804:0:28113
SuedWest RP:426:h:0:6900:3101:3102:3104:0:28231
BR-alpha:410:h:0:6900:701:702:704:0:28112
-B1 Berlin:426:h:0:6900:601:602:604:0:28206
N3:426:h:0:6900:2401:2402:2404:0:28224
-ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
hessen fernsehen:410:h:0:6900:301:302:304:0:28108
Bayerisches FS:410:h:0:6900:201:202:204:0:28107
Test-R:410:h:0:6900:901:902:104:0:28130
+:Premiere Hauptprogramme
+Premiere START:370:C:0:6900:255:256:32:101:8
+Premiere 1:370:C:0:6900:511:512:0:101:10
+Premiere 2:370:C:0:6900:1791:1792:0:101:11
+Premiere 3:370:C:0:6900:2303:2304:0:101:43
+Premiere 4:370:C:0:6900:767:768:0:101:9
+Premiere 5:370:C:0:6900:1279:1280:0:101:29
+Premiere 6:370:C:0:6900:1535:1536:0:101:41
+Premiere 7:370:C:0:6900:1023:1024:0:101:20
+Premiere SERIE:378:C:0:6900:1023:1024:0:101:16
+Premiere Nostalgie:378:C:0:6900:2559:2560:0:101:516
+13 TH STREET:354:C:0:6900:2303:2304:0:101:42
+Stundio Universal:402:C:0:6900:1050:1054:0:101:36
+Krimi &Co:378:C:0:6900:1535:1536:0:101:23
+Disney Channel:402:C:0:6900:1030:1034:0:101:34
+Discovery Channel:378:C:0:6900:1791:1792:0:101:14
+Fox Kids:354:C:0:6900:1279:1280:0:101:28
+Junior:354:C:0:6900:255:256:0:101:19
+K-TOON:354:C:0:6900:0:0:0:101:12
+GOLDSTAR TV:354:C:0:6900:3839:3840:0:101:518
+CLASSICA:354:C:0:6900:767:768:0:101:15
:Mediavision
-Extreme Sport:346:h:0:6900:801:802:0:1:50700
-Bloomberg:346:h:0:6900:811:812:0:1:50701
-Single TV:346:h:0:6900:621:622:0:1:50706
-Fashion TV:346:h:0:6900:821:822:0:1:50702
-BET ON JAZZ:346:h:0:6900:841:842:0:1:50704
-LANDSCAPE:346:h:0:6900:831:832:0:1:50703
-Einstein:346:h:0:6900:623:624:0:1:50719
+Bloomberg:346:h:0:6900:811:812:0:101:50701
+Fashion TV:346:h:0:6900:821:822:0:101:50702
+Einstein:346:h:0:6900:623:624:0:101:50719
+Extreme Sport:346:h:0:6900:801:802:0:101:50700
+LANDSCAPE:346:h:0:6900:831:832:0:101:50703
+Single TV:346:h:0:6900:621:622:0:101:50706
Leitseite:346:h:0:6900:2254:0:0:0:5004
-Via 1 - Schöner Reisen:346:h:0:6900:611:612:0:0:50705
-Parlamentsfernsehen:610:h:0:6900:33:36:47:0:6100
-Vh1 - Classic:610:h:0:6900:604:603:0:0:6106
+BET ON JAZZ:346:h:0:6900:841:842:0:101:50704
+:Digit. Bouquet"Kabel Berlin"
+Parlamentsfernsehen:610:C:0:6900:33:36:47:0:6100
+DW-tv:610:C:0:6900:634:632:0:0:6101
+Kanal 7:610:C:0:6900:49:52:0:101:6103
+Euronews:610:C:0:6900:597:592,591:0:101:6104
+Vh1 - Classic:610:h:0:6900:604:603:0:101:6106
+Travel:610:C:0:6900:595:594:0:101:6105
+Nuvolari:618:C:0:6900:1011:1012:0:101:50101
+Marco Polo:618:C:0:6900:1021:1022:0:101:50102
+Alice:618:C:0:6900:1031:1032:0:101:50103
+Leonardo:618:C:0:6900:1041:1042:0:101:50104
+Club:618:C:0:6900:1051:1052:0:101:50105
+Avante:618:C:0:6900:1061:1062:0:101:50106
+Expo 24*7:618:C:0:6900:1071:1072:0:101:50107
+Innergy:618:C:0:6900:0:0:0:101:50108
+BBC Prime:618:C:0:6900:1091:1092:0:101:50109
+Eurosport News:618:C:0:6900:1101:1102:0:101:50110
:Diverse TV-Sender
-TV Polonia:434:h:0:6900:641:642:0:1:53204
-Kanal D:434:h:0:6900:651:652:0:1:53205
-RTP international:434:h:0:6900:661:662:0:1:53206
-ERT-Sat:434:h:0:6900:691:692:0:1:53209
-CNE:434:h:0:6900:4056:4057:0:1:53208
-ZEE TV:442:h:0:6900:517:773:0:1:53301
-NTV i:442:h:0:6900:514:515:0:1:53302
+TV Polonia:434:h:0:6900:641:642:0:101:53204
+Kanal D:434:h:0:6900:651:652:0:101:53205
+RTP international:434:h:0:6900:661:662:0:101:53206
+ERT-Sat:434:h:0:6900:691:692:0:101:53209
+CNE:434:h:0:6900:4056:4057:0:101:53208
+ZEE TV:442:h:0:6900:517:773:0:101:53301
+NTV i:442:h:0:6900:514:515:0:101:53302
ATV:434:h:0:6900:631:632:0:0:53203
TW1:610:h:0:6900:6106:6107:0:0:6106
-PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
-:Premiere World Bundesliga
-Superdom:362:h:0:6900:255:256:0:1:26
-Spiel 1:362:h:0:6900:255:256,257:0:1:17
-Spiel 2:362:h:0:6900:2047:2048,2049:0:1:240
-BuLi-Konferenz:362:h:0:6900:3071:3072,3073:0:1:208
-BuLi-Spiel 1:362:h:0:6900:3327:3328,3329:0:1:209
-BuLi-Spiel 2:362:h:0:6900:2303:2304,2305:0:1:210
-BuLi-Spiel 3:362:h:0:6900:3583:3584,3585:0:1:211
-BuLi-Spiel 4:362:h:0:6900:2559:2560,2561:0:1:212
-BuLi-Spiel 5:362:h:0:6900:2815:2816,2817:0:1:213
:Premiere Sport
-PREMIERE SPORT 1:362:h:0:6900:255:256:0:1:17
-PREMIERE SPORT 2:362:h:0:6900:3327:3328:0:1:27
-PREMIERE SPORT 3:354:h:0:6900:2815:2816:0:1:18
-:Premiere Formel 1
-F1 Studio:362:h:0:6900:255:256:0:1:17
-F1 Box:362:h:0:6900:2047:2048:0:1:240
-F1 Verfolger:362:h:0:6900:2303:2304:0:1:241
-F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
-F1 Multi:362:h:0:6900:2815:2816:0:1:243
-F1 Info:362:h:0:6900:3071:3072:0:1:244
-:Premiere Cinedom 1
-Cinedom 1A:362:h:0:6900:1535:1536,1537:0:1:176
-Cinedom 1B:386:h:0:6900:1535:1536,1537:0:1:178
-Cinedom 1C:362:h:0:6900:511:512,513:0:1:180
-Cinedom 1D:354:h:0:6900:511:512,513:0:1:190
-:Premiere Cinedom 2
-Cinedom 2A:386:h:0:6900:1791:1792,1793:0:1:179
-Cinedom 2B:362:h:0:6900:1279:1280,1281:0:1:183
-Cinedom 2C:386:h:0:6900:511:512:0:1:184
-Cinedom 2D:386:h:0:6900:1279:1280:0:1:188
-Cinedom 2E:354:h:0:6900:1023:1024:0:1:193
-: Premiere Cinedom 3
-Cinedom 3A:362:h:0:6900:1023:1024,1025:0:1:182
-Cinedom 3B:386:h:0:6900:767:768:0:1:185
-Cinedom 3C:354:h:0:6900:2559:2560:0:1:192
-Cinedom 3D:354:h:0:6900:1535:1536:0:1:195
-: Premiere Cinedom 4
-Cinedom 4A:362:h:0:6900:767:768,769:0:1:181
-Cinedom 4B:386:h:0:6900:2047:2048:0:1:187
-Cinedom 4C:354:h:0:6900:767:768:0:1:191
-: Premiere Cinedom 5
-Cinedom 5A:386:h:0:6900:1023:1024,1025:0:1:186
-Cinedom 5B:354:h:0:6900:1279:1280,1281:0:1:194
-: Premiere Cinedom Deluxe
-CINEDOM DELUXE:354:h:0:6900:255:256,257:0:1:189
-:Premiere Erotic
-BEATE-UHSE.TV:354:h:0:6900:3839:3840:0:1:21
-BLUE MOVIE 1:354:h:0:6900:1791:1792:0:1:513
-BLUE MOVIE 2:354:h:0:6900:2047:2048:0:1:514
-BLUE MOVIE 3:354:h:0:6900:2303:2304:0:1:515
+PREMIERE SPORT 1:362:C:0:6900:255:256,257:0:101:17
+PREMIERE SPORT 2:378:C:0:6900:3839:3840,3841:0:101:27
+:Premiere Direkt 1
+PREMIERE DIREKT 1A:362:C:0:6900:1023:1024,1025:0:101:182
+PREMIERE DIREKT 1B:378:C:0:6900:511:512,513:0:101:177
+:Premiere Direkt 2
+PREMIERE DIREKT 2A:378:C:0:6900:255:256,257:0:101:176
+PREMIERE DIREKT 2B:362:C:0:6900:767:768,769:0:101:181
+:Premiere Direkt 3
+PREMIERE DIREKT 3A:362:C:0:6900:511:512,513:0:101:180
+PREMIERE DIREKT 3B:362:C:0:6900:1279:1280,1281:0:101:183
+:Premiere Direkt 4
+PREMIERE DIREKT 4A:378:C:0:6900:2815:2816,2817:0:101:18
+PREMIERE DIREKT 4B:386:C:0:6900:1535:1536,1537:0:101:216
+:Premiere Erotik
+BEATE-UHSE.TV:354:C:0:6900:1023:1024:0:101:21
+PREMIERE EROTIK 1:378:C:0:6900:1279:1280:0:101:513
+PREMIERE EROTIK 2:362:C:0:6900:1535:1536:0:101:778
+PREMIERE EROTIK 3:362:C:0:6900:1791:1792:0:101:779
+PREMIERE EROTIK 4:362:C:0:6900:3583:3584:0:101:780
:Radioprogramme
-Fritz:426:h:0:6900:0:901:0:0:28209
-HR XXL:410:h:0:6900:0:3501:0:0:28125
-JUMP:426:h:0:6900:0:1001:0:0:28210
-SPUTNIK:426:h:0:6900:0:1201:0:0:28212
-RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
-DLR-Berlin:394:h:0:6900:0:710:0:0:28012
-DLF-Köln:394:h:0:6900:0:810:0:0:28013
-Österreich 1:394:h:0:6900:0:169:0:0:28017
-100,6:354:h:0:6900:0:1312:0:0:161
-Bayern 4 Klassik:410:h:0:6900:0:3001:0:0:28120
-B5 aktuell:410:h:0:6900:0:3101:0:0:28121
-Bremen 2:410:h:0:6900:0:3801:0:0:28128
-Bayern 1:410:h:0:6900:0:3601:0:0:28126
-NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
-SR 1:410:h:0:6900:0:3901:0:0:28129
-hr-klassik:410:h:0:6900:0:3401:0:0:28124
-hr2:410:h:0:6900:0:3301:0:0:28123
-hr-chronos:410:h:0:6900:0:3201:0:0:28122
-Radio 3:426:h:0:6900:0:701:0:0:28207
-MDR KULTUR:426:h:0:6900:0:801:0:0:28208
-MDR info:426:h:0:6900:0:1101:0:0:28211
-SWR-2:426:h:0:6900:0:1401:0:0:28214
-WDR3:426:h:0:6900:0:1501:0:0:28215
-WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
+Fritz:426:h:0:6900:1:901:0:0:28209
+HR XXL:410:h:0:6900:1:3501:0:0:28125
+JUMP:426:h:0:6900:1:1001:0:0:28210
+SPUTNIK:426:h:0:6900:1:1201:0:0:28212
+RADIOmultikulti:426:h:0:6900:1:1301:0:0:28213
+DLR-Berlin:394:h:0:6900:1:710:0:0:28012
+DLF-Köln:394:h:0:6900:1:810:0:0:28013
+Österreich 1:394:h:0:6900:1:169:0:0:28017
+100,6:354:h:0:6900:1:1312:0:0:161
+Bayern 4 Klassik:410:h:0:6900:1:3001:0:0:28120
+B5 aktuell:410:h:0:6900:1:3101:0:0:28121
+Bremen 2:410:h:0:6900:1:3801:0:0:28128
+Bayern 1:410:h:0:6900:1:3601:0:0:28126
+NDR 4 Info:410:h:0:6900:1:3701:0:0:28127
+SR 1:410:h:0:6900:1:3901:0:0:28129
+hr-klassik:410:h:0:6900:1:3401:0:0:28124
+hr2:410:h:0:6900:1:3301:0:0:28123
+hr-chronos:410:h:0:6900:1:3201:0:0:28122
+Radio 3:426:h:0:6900:1:701:0:0:28207
+MDR KULTUR:426:h:0:6900:1:801:0:0:28208
+MDR info:426:h:0:6900:1:1101:0:0:28211
+SWR-2:426:h:0:6900:1:1401:0:0:28214
+WDR3:426:h:0:6900:1:1501:0:0:28215
+WDR Radio 5:426:h:0:6900:1:1601:0:0:28216
:verschlüsselte Radioprogramme
-ALTERNATIVE ROCK:378:h:0:6900:1:800:0:1:151
-HITLISTE:378:h:0:6900:1:784:0:1:150
-DANCE:378:h:0:6900:1:816:0:1:152
-EASY LISTENING:402:h:0:6900:1:1201:0:1:162
-CLASSIC ROCK:378:h:0:6900:1:544:0:1:154
-Cristal New Age:442:h:0:6900:1:536:0:0:53351
-Movie Sounds:442:h:0:6900:1:537:0:1:53352
-LOVE SONGS:402:h:0:6900:1:1191:0:1:163
-KLASSIK POPULÄR:378:h:0:6900:1:592:0:1:145
-KLASS. SYMPHONIEN:378:h:0:6900:1:608:0:1:146
-OPER & VOKALMUSIK:378:h:0:6900:1:624:0:1:147
-BAROCKMUSIK:378:h:0:6900:1:640:0:1:148
-JAZZ:378:h:0:6900:1:656:0:1:149
-COUNTRY:378:h:0:6900:1:352:0:1:153
-FILMMUSIK:378:h:0:6900:1:368:0:1:155
-DEUTSCHE HITS:402:h:0:6900:1:1156:0:1:156
-SOUL CLASSICS:402:h:0:6900:1:1161:0:1:157
-TÜRK MÜZIGI:402:h:0:6900:1:1166:0:1:158
-GOLD:402:h:0:6900:1:1171:0:1:159
-MUSICALS:402:h:0:6900:1:1196:0:1:164
-OLD GOLD:402:h:0:6900:1:1186:0:1:165
-SCHLAGER:402:h:0:6900:1:1176:0:1:166
-VOLKSMUSIK:402:h:0:6900:1:1181:0:1:167
-All Jazz:442:h:0:6900:1:535:0:1:53350
-Sinfonica:442:h:0:6900:1:538:0:1:53353
-Opernfestival:442:h:0:6900:1:539:0:1:53354
-Barock Fantasie:442:h:0:6900:1:540:0:1:53355
-Musica Camerata:442:h:0:6900:1:541:0:1:53356
-Musica Antica:442:h:0:6900:1:542:0:1:53357
-Adagio:442:h:0:6900:1:543:0:1:53358
-Jazz Legends:442:h:0:6900:1:544:0:1:53359
+ALTERNATIVE ROCK:370:C:0:6900:1:800:0:101:151
+CLASSIC ROCK:370:C:0:6900:1:544:0:101:154
+DANCE:370:C:0:6900:1:816:0:101:152
+LOVE SONGS:370:C:0:6900:1:352:0:101:163
+GOLD:370:C:0:6900:1:576:0:101:159
+OLD GOLD:370:C:0:6900:1:304:0:101:165
+SOUL CLASSICS:370:C:0:6900:1:400:0:101:157
+EASY LISTENING:370:C:0:6900:1:384:0:101:162
+DEUTSCHE HITS:370:C:0:6900:1:592:0:101:156
+SCHLAGER:370:C:0:6900:1:320:0:101:166
+VOLKSMUSIK:362:C:0:6900:1:336:0:101:167
+COUNTRY:362:C:0:6900:1:352:0:101:153
+FILMMUSIK:362:C:0:6900:1:368:0:101:155
+MUSICALS:362:C:0:6900:1:384:0:101:164
+JAZZ:362:C:0:6900:1:656:0:101:149
+KLASSIK POPUL04R:378:C:0:6900:1:592:0:101:145
+ORCHESTRALE WERKE:378:C:0:6900:1:608:0:101:146
+BAROCK:378:C:0:6900:1:640:0:101:148
+OPER:378:C:0:6900:1:624:0:101:147
+TÜRK MÜZIGI:378:C:0:6900:1:560:0:101:158
+HITLISTE:370:C:0:6900:1:784:0:101:150
+Radio GoldStar:354:C:0:6900:1:368:0:101:171
+All Jazz:442:C:0:6900:1:535:0:101:53350
+Cristal New Age:442:C:0:6900:1:536:0:101:53351
+Movie Sounds:442:C:0:6900:1:537:0:101:53352
+Sinfonica:442:C:0:6900:1:538:0:101:53353
+Opernfestival:442:C:0:6900:1:539:0:101:53354
+Barock Fantasie:442:C:0:6900:1:540:0:101:53355
+Musica Camerata:442:C:0:6900:1:541:0:101:53356
+Musica Antica:442:C:0:6900:1:542:0:101:53357
+Adagio:442:C:0:6900:1:543:0:101:53358
+Jazz legends:442:C:0:6900:1:544:0:101:53359
diff --git a/config.c b/config.c
index 76e138b..0d663d5 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 1.97 2002/04/02 21:56:51 kls Exp $
+ * $Id: config.c 1.98 2002/05/05 09:07:42 kls Exp $
*/
#include "config.h"
@@ -332,7 +332,8 @@ cTimer::cTimer(bool Instant)
struct tm *now = localtime_r(&t, &tm_r);
day = now->tm_mday;
start = now->tm_hour * 100 + now->tm_min;
- stop = start + 200; // "instant recording" records 2 hours by default
+ stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
+ stop = (stop / 60) * 100 + (stop % 60);
if (stop >= 2400)
stop -= 2400;
//TODO VPS???
@@ -930,6 +931,7 @@ cSetup::cSetup(void)
MenuScrollPage = 1;
MarkInstantRecord = 1;
strcpy(NameInstantRecord, "TITLE EPISODE");
+ InstantRecordTime = 180;
LnbSLOF = 11700;
LnbFrequLo = 9750;
LnbFrequHi = 10600;
@@ -1017,6 +1019,7 @@ bool cSetup::Parse(char *s)
else if (!strcasecmp(Name, "MenuScrollPage")) MenuScrollPage = atoi(Value);
else if (!strcasecmp(Name, "MarkInstantRecord")) MarkInstantRecord = atoi(Value);
else if (!strcasecmp(Name, "NameInstantRecord")) strn0cpy(NameInstantRecord, Value, MaxFileName);
+ else if (!strcasecmp(Name, "InstantRecordTime")) InstantRecordTime = atoi(Value);
else if (!strcasecmp(Name, "LnbSLOF")) LnbSLOF = atoi(Value);
else if (!strcasecmp(Name, "LnbFrequLo")) LnbFrequLo = atoi(Value);
else if (!strcasecmp(Name, "LnbFrequHi")) LnbFrequHi = atoi(Value);
@@ -1099,6 +1102,7 @@ bool cSetup::Save(const char *FileName)
fprintf(f, "MenuScrollPage = %d\n", MenuScrollPage);
fprintf(f, "MarkInstantRecord = %d\n", MarkInstantRecord);
fprintf(f, "NameInstantRecord = %s\n", NameInstantRecord);
+ fprintf(f, "InstantRecordTime = %d\n", InstantRecordTime);
fprintf(f, "LnbSLOF = %d\n", LnbSLOF);
fprintf(f, "LnbFrequLo = %d\n", LnbFrequLo);
fprintf(f, "LnbFrequHi = %d\n", LnbFrequHi);
diff --git a/config.h b/config.h
index 67ae92c..0f3420e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.110 2002/04/21 10:09:56 kls Exp $
+ * $Id: config.h 1.112 2002/04/26 13:56:30 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,7 +19,7 @@
#include "eit.h"
#include "tools.h"
-#define VDRVERSION "1.0.1"
+#define VDRVERSION "1.0.2"
#define MAXPRIORITY 99
#define MAXLIFETIME 99
@@ -337,6 +337,7 @@ public:
int MenuScrollPage;
int MarkInstantRecord;
char NameInstantRecord[MaxFileName];
+ int InstantRecordTime;
int LnbSLOF;
int LnbFrequLo;
int LnbFrequHi;
diff --git a/dvbapi.c b/dvbapi.c
index 0006e43..77e5372 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.c 1.173 2002/04/21 11:55:48 kls Exp $
+ * $Id: dvbapi.c 1.174 2002/05/03 15:59:32 kls Exp $
*/
#include "dvbapi.h"
@@ -279,8 +279,7 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
{
if (index) {
- if (Forward)
- CatchUp();
+ CatchUp();
int d = Forward ? 1 : -1;
for (;;) {
Index += d;
diff --git a/i18n.c b/i18n.c
index eb37100..5e44f53 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c 1.82 2002/04/20 09:40:37 kls Exp $
+ * $Id: i18n.c 1.86 2002/05/04 14:44:32 kls Exp $
*
* Slovenian translations provided by Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
* Italian translations provided by Alberto Carraro <bertocar@tin.it>
@@ -15,6 +15,7 @@
* Finnish translations provided by Hannu Savolainen <hannu@opensound.com>
* Polish translations provided by Michael Rakowski <mrak@gmx.de>
* Spanish translations provided by Ruben Nunez Francisco <ruben.nunez@tang-it.com>
+ * Greek translations provided by Dimitrios Dimitrakos <mail@dimitrios.de>
*
*/
@@ -63,7 +64,7 @@
#include "config.h"
#include "tools.h"
-const int NumLanguages = 11;
+const int NumLanguages = 12;
typedef const char *tPhrase[NumLanguages];
@@ -80,6 +81,7 @@ const tPhrase Phrases[] = {
"Suomi",
"Polski",
"Español",
+ "Ellinika",
},
// Menu titles:
{ "VDR",
@@ -93,6 +95,7 @@ const tPhrase Phrases[] = {
"VDR",
"VDR",
"VDR",
+ "VDR",
},
{ "Schedule",
"Programm",
@@ -105,6 +108,7 @@ const tPhrase Phrases[] = {
"Ohjelmat",
"Program",
"Programa",
+ "Programma",
},
{ "Channels",
"Kanäle",
@@ -117,6 +121,7 @@ const tPhrase Phrases[] = {
"Kanavat",
"Kanaly",
"Canales",
+ "Kanalia",
},
{ "Timers",
"Timer",
@@ -129,6 +134,7 @@ const tPhrase Phrases[] = {
"Ajastin",
"Timery",
"Timer",
+ "Programmatismos",
},
{ "Recordings",
"Aufzeichnungen",
@@ -141,6 +147,7 @@ const tPhrase Phrases[] = {
"Nauhoitteet",
"Nagrania",
"Grabaciones",
+ "Egrafes",
},
{ "Setup",
"Einstellungen",
@@ -153,6 +160,7 @@ const tPhrase Phrases[] = {
"Asetukset",
"Nastawy",
"Configuración",
+ "Rithmisis",
},
{ "Commands",
"Befehle",
@@ -165,6 +173,7 @@ const tPhrase Phrases[] = {
"Komennot",
"Rozkazy",
"Órdenes",
+ "Entoles",
},
{ "Edit channel",
"Kanal editieren",
@@ -177,6 +186,7 @@ const tPhrase Phrases[] = {
"Muokkaa kanavaa",
"Ustawienie kanalu",
"Modificar canal",
+ "Prosarmoges kanaliou",
},
{ "Edit timer",
"Timer editieren",
@@ -189,6 +199,7 @@ const tPhrase Phrases[] = {
"Muokkaa ajastusta",
"Ustawienie timerow",
"Modificar timer",
+ "Prosarmoges programmatismou",
},
{ "Event",
"Sendung",
@@ -201,6 +212,7 @@ const tPhrase Phrases[] = {
"Tapahtuma",
"Audycja",
"Evento",
+ "Ekpompi",
},
{ "Summary",
"Inhalt",
@@ -213,6 +225,7 @@ const tPhrase Phrases[] = {
"Yhteenveto",
"Zawartosc",
"Resúmen",
+ "Periexomeno",
},
{ "Schedule - %s",
"Programm - %s",
@@ -225,6 +238,7 @@ const tPhrase Phrases[] = {
"Ohjelma - %s",
"Program - %s",
"Programa - %s",
+ "Programma - %s",
},
{ "What's on now?",
"Was läuft jetzt?",
@@ -237,6 +251,7 @@ const tPhrase Phrases[] = {
"Nykyinen ohjelma",
"Program biezacy",
"¿Qué hay ahora?",
+ "Ti pezi tora",
},
{ "What's on next?",
"Was läuft als nächstes?",
@@ -249,6 +264,7 @@ const tPhrase Phrases[] = {
"Seuraava ohjelma",
"Program nastepny",
"¿Qué hay proximo?",
+ "Ti tha peksi meta",
},
// Button texts (should not be more than 10 characters!):
{ "Edit",
@@ -262,6 +278,7 @@ const tPhrase Phrases[] = {
"Muuta",
"Edycja",
"Modificar",
+ "Prosarmogi",
},
{ "New",
"Neu",
@@ -274,6 +291,7 @@ const tPhrase Phrases[] = {
"Uusi",
"Nowy",
"Nuevo",
+ "Neo",
},
{ "Delete",
"Löschen",
@@ -286,6 +304,7 @@ const tPhrase Phrases[] = {
"Poista",
"Usunac",
"Borrar",
+ "Swisimo",
},
{ "Mark",
"Markieren",
@@ -298,6 +317,7 @@ const tPhrase Phrases[] = {
"Merkitse",
"Zaznaczyc",
"Marcar",
+ "Markarisma",
},
{ "On/Off",
"Ein/Aus",
@@ -310,6 +330,7 @@ const tPhrase Phrases[] = {
"Päällä/Pois",
"Zal./ Wyl.",
"On/Off",
+ "Energo/Klisto",
},
{ "Record",
"Aufnehmen",
@@ -322,6 +343,7 @@ const tPhrase Phrases[] = {
"Nauhoita",
"Nagrywac",
"Grabar",
+ "Egrafi",
},
{ "Play",
"Wiedergabe",
@@ -334,6 +356,7 @@ const tPhrase Phrases[] = {
"Toista",
"Odtwarzac",
"Play",
+ "Anametadosi",
},
{ "Rewind",
"Anfang",
@@ -346,6 +369,7 @@ const tPhrase Phrases[] = {
"Takaisinkel.",
"Poczatek",
"Rebobinar",
+ "Arxi",
},
{ "Button$Stop",
"Beenden",
@@ -358,6 +382,7 @@ const tPhrase Phrases[] = {
"Pysäytä",
"Zakonczyc",
"Parar",
+ "Terma",
},
{ "Resume",
"Weiter",
@@ -370,6 +395,7 @@ const tPhrase Phrases[] = {
"Jatka",
"Dalej",
"Continuar",
+ "Sinexia",
},
{ "Summary",
"Inhalt",
@@ -382,6 +408,7 @@ const tPhrase Phrases[] = {
"Yhteenveto",
"Zawartosc",
"Resumen",
+ "Periexomeno",
},
{ "Open",
"Öffnen",
@@ -394,6 +421,7 @@ const tPhrase Phrases[] = {
"Avaa",
"Otworzyc",
"Abrir",
+ "Anigma",
},
{ "Switch",
"Umschalten",
@@ -406,6 +434,7 @@ const tPhrase Phrases[] = {
"Valitse",
"Przelaczyc",
"Cambiar",
+ "Alagi",
},
{ "Now",
"Jetzt",
@@ -418,6 +447,7 @@ const tPhrase Phrases[] = {
"Nyt",
"Teraz",
"Ahora",
+ "Tora",
},
{ "Next",
"Nächste",
@@ -430,6 +460,7 @@ const tPhrase Phrases[] = {
"Seuraava",
"Nastepny",
"Siguiente",
+ "Epomeno",
},
{ "Button$Schedule",
"Programm",
@@ -442,6 +473,7 @@ const tPhrase Phrases[] = {
"Ohjelmisto",
"Program",
"Programa",
+ "Programma",
},
{ "Language",
"Sprache",
@@ -454,6 +486,7 @@ const tPhrase Phrases[] = {
"Kieli",
"Jezyk",
"Lengua",
+ "Glosa",
},
{ "Eject",
"Auswerfen",
@@ -466,6 +499,7 @@ const tPhrase Phrases[] = {
"Avaa",
"Wyrzucenie",
"Eyectar",
+ "Apovoli",
},
{ "ABC/abc",
"ABC/abc",
@@ -478,6 +512,7 @@ const tPhrase Phrases[] = {
"ABC/abc",
"ABC/abc",
"ABC/abc",
+ "ABC/abc",
},
{ "Insert",
"Einfügen",
@@ -490,6 +525,7 @@ const tPhrase Phrases[] = {
"",// TODO
"",// TODO
"",// TODO
+ "Isodos",
},
{ "Overwrite",
"Überschreiben",
@@ -502,6 +538,7 @@ const tPhrase Phrases[] = {
"",// TODO
"",// TODO
"",// TODO
+ "Epanagrafi",
},
// Confirmations:
{ "Delete channel?",
@@ -515,6 +552,7 @@ const tPhrase Phrases[] = {
"Poistetaanko kanava?",
"Usunac kanal?",
"¿Eliminar canal?",
+ "Na sviso to kanali?",
},
{ "Delete timer?",
"Timer löschen?",
@@ -527,6 +565,7 @@ const tPhrase Phrases[] = {
"Poistetaanko ajastus?",
"Usunac timer?",
"¿Eliminar timer?",
+ "Svisimo tou programmitismou?",
},
{ "Delete recording?",
"Aufzeichnung löschen?",
@@ -539,6 +578,7 @@ const tPhrase Phrases[] = {
"Poistetaanko nauhoitus?",
"Usunac nagranie?",
"¿Eliminar grabacion?",
+ "Svisimo tis egrafis?",
},
{ "Timer still recording - really delete?",
"Timer zeichnet auf - trotzdem löschen?",
@@ -551,6 +591,7 @@ const tPhrase Phrases[] = {
"Ajastin nauhoittaa - poistetaanko silti?",
"Nagrywanie w trakcie - napewno usunac?",
"¿Timer activo - de verdad eliminarlo?",
+ "Ginete akoma programmatismeni egrafi - na svisti sigoura?",
},
{ "Stop recording?",
"Aufzeichnung beenden?",
@@ -563,6 +604,7 @@ const tPhrase Phrases[] = {
"Pysäytetäänkö nauhoitus?",
"Zakonczyc nagranie?",
"¿Parar grabación?",
+ "Akirosi egrafis?",
},
{ "on primary interface",
"auf dem primären Interface",
@@ -575,6 +617,7 @@ const tPhrase Phrases[] = {
"päävastaanottimella",
"na pierwszym interfejsie",
"en interface primario",
+ "stin protevon karta",
},
{ "Cancel editing?",
"Schneiden abbrechen?",
@@ -587,6 +630,7 @@ const tPhrase Phrases[] = {
"Peruutetaanko muokkaus?",
"Zakonczyc montaz?",
"¿Cancelar modificación?",
+ "Akirosi alagon?",
},
{ "Really restart?",
"Wirklich neu starten?",
@@ -599,6 +643,7 @@ const tPhrase Phrases[] = {
"Aloitetaanko varmasti alusta?",
"Rzeczywiscie nowy start?",
"¿De verdad reiniciar?",
+ "Na gini sigoura epanekinisi?",
},
{ "Recording - restart anyway?",
"Aufnahme läuft - trotzdem neu starten?",
@@ -611,6 +656,7 @@ const tPhrase Phrases[] = {
"Nauhoitus käynnissä - aloitetaanko alusta?",
"Nagrywanie w trakcie - rzeczywiscie nowy start?",
"¿Grabando - reiniciar?",
+ "Ginete egrafi - na gini epanekinisi sigoura?",
},
{ "Recording - shut down anyway?",
"Aufnahme läuft - trotzdem ausschalten?",
@@ -623,6 +669,7 @@ const tPhrase Phrases[] = {
"Nauhoitus kesken - lopetetaanko se?",
"Nagrywanie w trakcie - mimo to wylaczyc?",
"¿Grabando - apagar?",
+ "Ginete egrafi - na stamatisi i litourgia sigoura?",
},
{ "Recording in %d minutes, shut down anyway?",
"Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -635,6 +682,7 @@ const tPhrase Phrases[] = {
"Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
"Nagrywanie za %d minut - mimo to wylaczyc?",
"¿Grabando en %d minutos, de verdad cortar?",
+ "Anamenete egrafi se %d lepta - na stamatisi i litourgia sigoura?",
},
{ "Press any key to cancel shutdown",
"Taste drücken um Shutdown abzubrechen",
@@ -647,6 +695,7 @@ const tPhrase Phrases[] = {
"Peruuta pysäytys painamalla jotakin näppäintä",
"Dowolny przycisk zatrzyma wylaczanie",
"Pulse una tecla para interrumpir corte",
+ "Piese ena pliktro na stamatisi to katevasma",
},
// Channel parameters:
{ "Name",
@@ -660,6 +709,7 @@ const tPhrase Phrases[] = {
"Nimi",
"Nazwa",
"Nombre",
+ "Onoma",
},
{ "Frequency",
"Frequenz",
@@ -672,6 +722,7 @@ const tPhrase Phrases[] = {
"Taajuus",
"Czestotliwosc",
"Frecuencia",
+ "Sixnotita",
},
{ "Polarization",
"Polarisation",
@@ -684,6 +735,7 @@ const tPhrase Phrases[] = {
"Polarisaatio",
"Polaryzacja",
"Polarización",
+ "Polosi",
},
{ "DiSEqC",
"DiSEqC",
@@ -696,6 +748,7 @@ const tPhrase Phrases[] = {
"DiSEqC",
"DiSEqC",
"DiSEqC",
+ "DiSEqC",
},
{ "Srate",
"Srate",
@@ -708,6 +761,7 @@ const tPhrase Phrases[] = {
"Srate",
"Srate",
"Srate",
+ "Srate",
},
{ "Vpid",
"Vpid",
@@ -720,6 +774,7 @@ const tPhrase Phrases[] = {
"Kuva PID",
"Vpid",
"Vpid",
+ "Vpid",
},
{ "Apid1",
"Apid1",
@@ -732,6 +787,7 @@ const tPhrase Phrases[] = {
"Ääni PID1",
"Apid1",
"Apid1",
+ "Apid1",
},
{ "Apid2",
"Apid2",
@@ -744,6 +800,7 @@ const tPhrase Phrases[] = {
"Ääni PID2",
"Apid2",
"Apid2",
+ "Apid2",
},
{ "Dpid1",
"Dpid1",
@@ -756,6 +813,7 @@ const tPhrase Phrases[] = {
"AC3 PID1",
"Dpid1",
"Dpid1",
+ "Dpid1",
},
{ "Dpid2",
"Dpid2",
@@ -768,6 +826,7 @@ const tPhrase Phrases[] = {
"AC3 PID2",
"Dpid2",
"Dpid2",
+ "Dpid2",
},
{ "Tpid",
"Tpid",
@@ -780,6 +839,7 @@ const tPhrase Phrases[] = {
"TekstiTV PID",
"Tpid",
"Tpid",
+ "Tpid",
},
{ "CA",
"CA",
@@ -792,6 +852,7 @@ const tPhrase Phrases[] = {
"Salauskortti",
"CA",
"CA",
+ "CA",
},
{ "Pnr",
"Pnr",
@@ -804,6 +865,7 @@ const tPhrase Phrases[] = {
"Ohjelmatunnus",
"Pnr",
"Pnr",
+ "Pnr",
},
// Timer parameters:
{ "Active",
@@ -817,6 +879,7 @@ const tPhrase Phrases[] = {
"Aktiivinen",
"Aktywny",
"Activo",
+ "Energo",
},
{ "Channel",
"Kanal",
@@ -829,6 +892,7 @@ const tPhrase Phrases[] = {
"Kanava",
"Kanal",
"Canal",
+ "Kanali",
},
{ "Day",
"Tag",
@@ -841,6 +905,7 @@ const tPhrase Phrases[] = {
"Päivä",
"Dzien",
"Día",
+ "Imera",
},
{ "Start",
"Anfang",
@@ -853,6 +918,7 @@ const tPhrase Phrases[] = {
"Aloitus",
"Poczatek",
"Comienzo",
+ "Arxi",
},
{ "Stop",
"Ende",
@@ -865,6 +931,7 @@ const tPhrase Phrases[] = {
"Lopetus",
"Koniec",
"Fin",
+ "Telos",
},
{ "Priority",
"Priorität",
@@ -877,6 +944,7 @@ const tPhrase Phrases[] = {
"Prioriteetti",
"Priorytet",
"Prioridad",
+ "Protereotita",
},
{ "Lifetime",
"Lebensdauer",
@@ -889,6 +957,7 @@ const tPhrase Phrases[] = {
"Voimassaolo",
"Trwalosc dni",
"Durabilidad",
+ "Xronos Zois",
},
{ "File",
"Datei",
@@ -901,6 +970,7 @@ const tPhrase Phrases[] = {
"Tiedosto",
"Plik",
"Fichero",
+ "Arxeio",
},
{ "First day",
"Erster Tag",
@@ -913,6 +983,7 @@ const tPhrase Phrases[] = {
"1. päivä",
"Pierwszy dzien",
"Primer día",
+ "Proti mera",
},
// Error messages:
{ "Channel is being used by a timer!",
@@ -926,6 +997,7 @@ const tPhrase Phrases[] = {
"Kanava on ajastimen käytössä!",
"Kanal jest zajety przez timer nagran",
"¡Canal está ocupado por un timer!",
+ "To kanali xrisimopiite apo programmatismeni thesi",
},
{ "Can't switch channel!",
"Kanal kann nicht umgeschaltet werden!",
@@ -938,6 +1010,7 @@ const tPhrase Phrases[] = {
"Kanavan vaihtaminen ei mahdollista!",
"Kanal nie moze byc teraz przelaczony!",
"¡No puedo cambiar canal!",
+ "Den mporo na pao sto kanali!",
},
{ "Timer is recording!",
"Timer zeichnet gerade auf!",
@@ -950,6 +1023,7 @@ const tPhrase Phrases[] = {
"Ajastinnauhoitus käynnissä!",
"Timer nagrywa!",
"¡Timer esta grabando!",
+ "Ginete progrmamatismeni egrafi!",
},
{ "Error while accessing recording!",
"Fehler beim Ansprechen der Aufzeichnung!",
@@ -962,6 +1036,7 @@ const tPhrase Phrases[] = {
"Nauhoituksen toistaminen epäonnistui!",
"Blad - brak dostepu do nagrania!",
"¡Error al accesar la grabación!",
+ "Lathos stin evresi tis egrafis!",
},
{ "Error while deleting recording!",
"Fehler beim Löschen der Aufzeichnung!",
@@ -974,6 +1049,7 @@ const tPhrase Phrases[] = {
"Nauhoituksen poistaminen epäonnistui!",
"Blad przy usuwaniu nagrania!",
"¡Error al borrar la grabación!",
+ "Lathos stin prospathia na svisti i egrafi!",
},
{ "*** Invalid Channel ***",
"*** Ungültiger Kanal ***",
@@ -986,6 +1062,7 @@ const tPhrase Phrases[] = {
"*** Virheellinen kanavavalinta! ***",
"*** Niewazny kanal ***",
"*** Canal inválido ***",
+ "*** Kanali akiro ***",
},
{ "No free DVB device to record!",
"Keine freie DVB-Karte zum Aufnehmen!",
@@ -998,6 +1075,7 @@ const tPhrase Phrases[] = {
"Ei vapaata vastaanotinta nauhoitusta varten!",
"Brak wolnej karty DVB do nagrywania!",
"¡No hay dispositivo DVB disponible para grabar!",
+ "Den iparxi elevteri DVB Karta gia egrafi!",
},
{ "Channel locked (recording)!",
"Kanal blockiert (zeichnet auf)!",
@@ -1010,6 +1088,7 @@ const tPhrase Phrases[] = {
"Kanava lukittu (nauhoitusta varten)!",
"Kanal zablokowany (nagrywanie w toku)!",
"¡Canal bloqueado (grabando)!",
+ "To kanali ine mplokarismeno (Ginete egrafi)!",
},
{ "Can't start Transfer Mode!",
"Transfer-Mode kann nicht gestartet werden!",
@@ -1022,6 +1101,7 @@ const tPhrase Phrases[] = {
"Käsittämättömiä teknisiä ongelmia!",
"Tryb transferowy jest niemozliwy!",
"¡No puedo iniciar modo de transferencia!",
+ "Den mpori na arxisi to Transfer-Mode!",
},
{ "Can't start editing process!",
"Schnitt kann nicht gestartet werden!",
@@ -1034,6 +1114,7 @@ const tPhrase Phrases[] = {
"Muokkauksen aloittaminen ei onnistu!",
"Uruchamianie montazu jest niemozliwe!",
"¡No puedo iniciar proceso de modificación!",
+ "Den mpori na arxisi to kopsimo tis tenias!",
},
{ "Editing process already active!",
"Schnitt bereits aktiv!",
@@ -1046,6 +1127,7 @@ const tPhrase Phrases[] = {
"Muokkaus on jo käynnissä!",
"Montaz w toku!",
"¡Proceso de modificación ya fue iniciado!",
+ "To kopsimo ti tenias ini idi se litourgia!",
},
{ "Can't shutdown - option '-s' not given!",
"Shutdown unmöglich - Option '-s' fehlt!",
@@ -1056,8 +1138,9 @@ const tPhrase Phrases[] = {
"Arrêt impossible - option '-s' absente!",
"Kan ikke slå av - startet uten parameteret '-s'!",
"Ei voida sammuttaa '-s' parametria ei annettu!",
- "Wylaczenie niemozliwe - brak opcji '-s' !",
+ "Wylaczenie niemozliwe - brak opcji '-s'!",
"¡No puedo cortar - opción '-s' absente!",
+ "Den mporo na kliso ton ipologisti. Lipi i parametros '-s'!",
},
{ "Low disk space!",
"Platte beinahe voll!",
@@ -1070,6 +1153,7 @@ const tPhrase Phrases[] = {
"Kovalevy lähes täynnä!",
"Dysk wkrotce pelny!",
"¡Disco casi lleno",
+ "O Skliros kontevi na gemisi!",
},
// Setup pages:
{ "OSD",
@@ -1083,6 +1167,7 @@ const tPhrase Phrases[] = {
"Tekstinäyttö",
"OSD",
"OSD",
+ "OSD",
},
{ "EPG",
"EPG",
@@ -1095,6 +1180,7 @@ const tPhrase Phrases[] = {
"Ohjelmaopas",
"EPG",
"EPG",
+ "EPG",
},
{ "DVB",
"DVB",
@@ -1107,6 +1193,7 @@ const tPhrase Phrases[] = {
"DVB",
"DVB",
"DVB",
+ "DVB",
},
{ "LNB",
"LNB",
@@ -1119,6 +1206,7 @@ const tPhrase Phrases[] = {
"LNB",
"LNB",
"LNB",
+ "LNB",
},
{ "CICAM",
"CICAM",
@@ -1131,6 +1219,7 @@ const tPhrase Phrases[] = {
"CICAM",
"CICAM",
"CICAM",
+ "CICAM",
},
{ "Recording",
"Aufnahme",
@@ -1143,6 +1232,7 @@ const tPhrase Phrases[] = {
"Nauhoita",
"Nagranie",
"Grabación",
+ "Egrafi",
},
{ "Replay",
"Wiedergabe",
@@ -1155,6 +1245,7 @@ const tPhrase Phrases[] = {
"Toista",
"Odtwarzanie",
"Poner",
+ "Anametadosi",
},
{ "Miscellaneous",
"Sonstiges",
@@ -1167,6 +1258,7 @@ const tPhrase Phrases[] = {
"Sekalaista",
"Pozostale",
"Varios",
+ "Diafora",
},
{ "Restart",
"Neustart",
@@ -1179,6 +1271,7 @@ const tPhrase Phrases[] = {
"Aloita uudelleen",
"Zastartowac",
"Reiniciar",
+ "Epanekinisi",
},
// Setup parameters:
{ "Setup.OSD$Language",
@@ -1192,6 +1285,7 @@ const tPhrase Phrases[] = {
"Kieli",
"Jezyk",
"Lengua",
+ "Glosa",
},
{ "Setup.OSD$Width",
"Breite",
@@ -1204,6 +1298,7 @@ const tPhrase Phrases[] = {
"Leveys",
"Szerokosc",
"Anchura",
+ "Makros",
},
{ "Setup.OSD$Height",
"Höhe",
@@ -1216,6 +1311,7 @@ const tPhrase Phrases[] = {
"Korkeus",
"Wysokosc",
"Altura",
+ "Ipsos",
},
{ "Setup.OSD$Message time (s)",
"Anzeigedauer für Nachrichten (s)",
@@ -1228,6 +1324,7 @@ const tPhrase Phrases[] = {
"Ilmoitusten näkymisaika (s)",
"Czas wyswietlania wiadomosci (s)",
"Duración muestra mensajes (s)",
+ "Xronos endiksis minimaton (d)",
},
{ "Setup.OSD$Channel info position",
"Kanal-Info Position",
@@ -1240,6 +1337,7 @@ const tPhrase Phrases[] = {
"Kanavainfon sijainti",
"Lokalizacja informacji o kanale",
"Posición para información canal",
+ "Thesi Pliroforias kanalion",
},
{ "Setup.OSD$Info on channel switch",
"Info beim Kanalwechsel",
@@ -1252,6 +1350,7 @@ const tPhrase Phrases[] = {
"Näytä kanavainfo",
"Informacja przy zmianie kanalu",
"Información para cambio de canal",
+ "Plirofories stin alagi kanaliou",
},
{ "Setup.OSD$Scroll pages",
"Seitenweise scrollen",
@@ -1264,6 +1363,7 @@ const tPhrase Phrases[] = {
"Valikkojen rullaus",
"Przesuwac stronami",
"Desplazar página entera",
+ "Scroll selidas",
},
{ "Setup.OSD$Sort timers",
"Timer sortieren",
@@ -1276,6 +1376,7 @@ const tPhrase Phrases[] = {
"Järjestä ajastimet",
"Sortowanie timerow",
"Ordenar timer",
+ "Organosi programmatismenon",
},
{ "Setup.OSD$Recording directories",
"Aufnahmeverzeichnisse",
@@ -1288,6 +1389,7 @@ const tPhrase Phrases[] = {
"Nauhoitushakemistot",
"Wykaz nagran",
"Directorios para grabación",
+ "Fakeli egrafon",
},
{ "Setup.EPG$EPG scan timeout (h)",
"Zeit bis EPG Scan (h)",
@@ -1300,6 +1402,7 @@ const tPhrase Phrases[] = {
"Ohjelmatied. odotusaika (h)",
"Czas do skanu EPG (h)",
"Tiempo hasta exploración EPG (h)",
+ "Xronos mexri sarosi EPG se Ores",
},
{ "Setup.EPG$EPG bugfix level",
"EPG Fehlerbereinigung",
@@ -1312,6 +1415,7 @@ const tPhrase Phrases[] = {
"EPG Bugfix Level",
"Poziom bledow EPG",
"Nivel para arreglar EPG",
+ "EPG Bugfix Vathmos",
},
{ "Setup.EPG$Set system time",
"Systemzeit stellen",
@@ -1324,6 +1428,7 @@ const tPhrase Phrases[] = {
"Vastaanota kellonaika",
"Ustawianie czasu",
"Ajustar reloj de sistema",
+ "Sintonismos Oras ipologosti",
},
{ "Setup.EPG$Use time from transponder",
"Transponder für Systemzeit",
@@ -1336,6 +1441,7 @@ const tPhrase Phrases[] = {
"Vastaanota kellonaika lähettimeltä",
"Transponder do ustawiania czasu",
"Transponder para reloj de sistema",
+ "Transponder gia sintonismo tis oras",
},
{ "Setup.DVB$Primary DVB interface",
"Primäres DVB Interface",
@@ -1348,6 +1454,7 @@ const tPhrase Phrases[] = {
"Ensisij. vast.otin",
"Pierwotny interfejs DVB",
"Primer interface DVB",
+ "Protevon DVB karta",
},
{ "Setup.DVB$Video format",
"Video Format",
@@ -1360,6 +1467,7 @@ const tPhrase Phrases[] = {
"Kuvamuoto",
"Format telewizyjny",
"Formato Vídeo",
+ "Video Format",
},
{ "Setup.LNB$SLOF (MHz)",
"SLOF (MHz)",
@@ -1372,6 +1480,7 @@ const tPhrase Phrases[] = {
"SLOF (MHz)",
"SLOF (MHz)",
"SLOF (MHz)",
+ "SLOF (MHz)",
},
{ "Setup.LNB$Low LNB frequency (MHz)",
"Untere LNB-Frequenz (MHz)",
@@ -1384,6 +1493,7 @@ const tPhrase Phrases[] = {
"LO LNB taajuus (MHz)",
"Dolna czestotliwosc LNB (MHz)",
"Frecuencia baja LNB (MHz)",
+ "Kato LNB-Sixnotita (MHz)",
},
{ "Setup.LNB$High LNB frequency (MHz)",
"Obere LNB-Frequenz (MHz)",
@@ -1396,6 +1506,7 @@ const tPhrase Phrases[] = {
"HI LNB taajuus (MHz)",
"Gorna czestotliwosc LNB (MHz)",
"Frecuencia alta LNB (MHz)",
+ "Ano LNB-Sixnotita (MHz)",
},
{ "Setup.LNB$Use DiSEqC",
"DiSEqC benutzen",
@@ -1408,6 +1519,7 @@ const tPhrase Phrases[] = {
"Käytä DiSEqC",
"Uzywac DiSEqC",
"Utilizar DiSEqC",
+ "Energopiisi DiSEqC",
},
{ "Setup.CICAM$CICAM DVB",
"CICAM DVB",
@@ -1420,6 +1532,7 @@ const tPhrase Phrases[] = {
"CICAM DVB",
"CICAM DVB",
"CICAM DVB",
+ "CICAM DVB",
},
{ "Setup.Recording$Margin at start (min)",
"Zeitpuffer bei Anfang (min)",
@@ -1432,6 +1545,7 @@ const tPhrase Phrases[] = {
"Aloitusmarginaali (min)",
"Poczatkowy czas buforowy (min)",
"Comenzar grabación antes (min)",
+ "Prosthetos xronos prin arxi (lepta)",
},
{ "Setup.Recording$Margin at stop (min)",
"Zeitpuffer bei Ende (min)",
@@ -1444,6 +1558,7 @@ const tPhrase Phrases[] = {
"Lopetusmarginaali (min)",
"Koncowy czas buforowy (min)",
"Cortar grabación después (min)",
+ "Prosthetos xronos sto telos (lepta)",
},
{ "Setup.Recording$Primary limit",
"Primär-Limit",
@@ -1456,6 +1571,7 @@ const tPhrase Phrases[] = {
"PrimaryLimit",
"Pierwotny limit",
"L'mite primario",
+ "Protevon limit",
},
{ "Setup.Recording$Default priority",
"Default Priorität",
@@ -1468,6 +1584,7 @@ const tPhrase Phrases[] = {
"Oletusprioriteetti",
"Priorytet pierwotny",
"Prioridad predefinida",
+ "Protereotita",
},
{ "Setup.Recording$Default lifetime (d)",
"Default Lebensdauer (d)",
@@ -1480,6 +1597,7 @@ const tPhrase Phrases[] = {
"Oletus voimassaoloaika (d)",
"Pierwotna trwalosc (d)",
"Duración predefinida",
+ "Xronos zois",
},
{ "Setup.Recording$Use episode name",
"Episodenname verwenden",
@@ -1492,6 +1610,7 @@ const tPhrase Phrases[] = {
"Käytä jakson nimeä",
"Czy uzywac nazwe epizodu",
"Utilizar nombre de episodo",
+ "Xrisimopiisi onomatos episodiou",
},
{ "Setup.Recording$Mark instant recording",
"Direktaufzeichnung markieren",
@@ -1504,6 +1623,7 @@ const tPhrase Phrases[] = {
"Merkitse välitön nauh.",
"Zaznaczyc natychm. nagranie",
"Marcar grabaciones instantáneas",
+ "Markarisma apevthias egrafis",
},
{ "Setup.Recording$Name instant recording",
"Direktaufzeichnung benennen",
@@ -1516,6 +1636,20 @@ const tPhrase Phrases[] = {
"Nimeä välitön nauh.",
"Nazwac natychm. nagranie",
"Nombrar grabaciones instantáneas",
+ "eponomasi apevthias egrafis",
+ },
+ { "Setup.Recording$Instant rec. time (min)",
+ "Dauer der Direktaufzeichnung (min)",
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
+ "",//TODO
},
{ "Setup.Recording$Record Dolby Digital",
"Dolby Digital Ton aufzeichnen",
@@ -1528,6 +1662,7 @@ const tPhrase Phrases[] = {
"Dolby Digital nauhoitus",
"Nagrywac Dolby Digital",
"Grabar sonido Dolby Digital",
+ "Egrafi tou Dolby Digital ixou",
},
{ "Setup.Recording$Max. video file size (MB)",
"Max. Video Dateigröße (MB)",
@@ -1540,6 +1675,7 @@ const tPhrase Phrases[] = {
"Maksimi tiedoston koko (MB)",
"Maks. wielkosc pliku (MB)",
"Tamaño máx. ficheros (MB)",
+ "Megisto megethos arxeiou (MB)",
},
{ "Setup.Recording$Split edited files",
"Editierte Dateien aufteilen",
@@ -1552,6 +1688,7 @@ const tPhrase Phrases[] = {
"Paloittele muokatut",
"Dzielic montowane pliki",
"Quebrar ficheros",
+ "Diamelisma epeksergasm. arxeion",
},
{ "Setup.Replay$Multi speed mode",
"MultiSpeed Modus",
@@ -1564,6 +1701,7 @@ const tPhrase Phrases[] = {
"Moninopeustila",
"Tryb wielopredkosciowy",
"Modo multi-velocidad",
+ "Multispeed modus",
},
{ "Setup.Replay$Show replay mode",
"Wiedergabestatus anzeigen",
@@ -1576,6 +1714,7 @@ const tPhrase Phrases[] = {
"Näytä toiston tila",
"Wyswietlac status odtwarzania",
"Mostrar modo de replay",
+ "Endiksi status anametadosis",
},
{ "Setup.Miscellaneous$Min. event timeout (min)",
"Mindest Event Pause (min)",
@@ -1588,6 +1727,7 @@ const tPhrase Phrases[] = {
"Minimi tapahtuman odotus (min)",
"Min. czas do nast. akcji (Event) (min)",
"Tiempo mínimo pausa (min)",
+ "Elaxistos Xronos paremvolis (lepta)",
},
{ "Setup.Miscellaneous$Min. user inactivity (min)",
"Mindest Benutzer-Inaktivität (min)",
@@ -1600,18 +1740,20 @@ const tPhrase Phrases[] = {
"Minimi käyttäjän odotus (min)",
"Min. brak aktywnosci uzytkownika (min)",
"Tiempo mínimo inactividad (min)",
- },
- { "Setup.Miscellaneous$SVDRP timeout (min)",
- "SVDRP Timeout (min)",
- "SVDRP Timeout (min)",
- "Timeout SVDRP (min)",
- "SVDRP Timeout (min)",
- "Timeout SVDRP (min)",
- "Temps maxi SVDRP (min)",
- "Ubrukt SVDRP-levetid (min)",
- "SVDRP odotusaika (min)",
- "Min. brak aktywnosci SVDRP (min)",
- "SVDRP interrupción (min)",
+ "Elaxistos xronos mi xrisis (lepta)",
+ },
+ { "Setup.Miscellaneous$SVDRP timeout (s)",
+ "SVDRP Timeout (s)",
+ "SVDRP Timeout (s)",
+ "Timeout SVDRP (s)",
+ "SVDRP Timeout (s)",
+ "Timeout SVDRP (s)",
+ "Temps maxi SVDRP (s)",
+ "Ubrukt SVDRP-levetid (s)",
+ "SVDRP odotusaika (s)",
+ "Min. brak aktywnosci SVDRP (s)",
+ "SVDRP interrupción (s)",
+ "SVDRP Timeout (d)",
},
// The days of the week:
{ "MTWTFSS",
@@ -1625,6 +1767,7 @@ const tPhrase Phrases[] = {
"MTKTPLS",
"PWSCPSN",
"LMMJVSD",
+ "DTTPPSK",
},
{ "MonTueWedThuFriSatSun", // must all be 3 letters!
"MonDieMitDonFreSamSon",
@@ -1637,6 +1780,7 @@ const tPhrase Phrases[] = {
"MaaTiiKesTorPerLauSun",
"PonWtoSroCzwPiaSobNie",
"LunMarMieJueVieSabDom",
+ "DevTriTetPemParSavKir",
},
// The allowed characters in strings:
{ " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -1650,6 +1794,7 @@ const tPhrase Phrases[] = {
"",// TODO
"",// TODO
" aábcdeéfghiíjklmnñoópqrstuúvwxyz0123456789-.#~",
+ "",// TODO
},
// Learning keys:
{ "Learning Remote Control Keys",
@@ -1663,6 +1808,7 @@ const tPhrase Phrases[] = {
"Kaukosäätimen näppäinten opettelu",
"Nauka kodu pilota",
"Aprendiendo teclas del telemando",
+ "Ekmathisi Remote Control",
},
{ "Phase 1: Detecting RC code type",
"Phase 1: FB Code feststellen",
@@ -1675,6 +1821,7 @@ const tPhrase Phrases[] = {
"Vaihe 1: Lähetystavan selvittäminen",
"Faza 1: Detekcja typu kodu",
"Fase 1: Detectando tipo de receptor",
+ "Phasi 1: Dilosi RC Code",
},
{ "Press any key on the RC unit",
"Eine Taste auf der FB drücken",
@@ -1687,6 +1834,7 @@ const tPhrase Phrases[] = {
"Paina mitä tahansa kaukosäätimen näppäintä",
"Nacisnac klawisz pilota",
"Pulse una tecla en el telemando",
+ "Pata ena pliktro sto RC",
},
{ "RC code detected!",
"FB Code erkannt!",
@@ -1699,6 +1847,7 @@ const tPhrase Phrases[] = {
"Näppäinpainallus vastaanotettu!",
"Kod pilota zostal poznany!",
"¡Código detectado!",
+ "Evresi RC Code!",
},
{ "Do not press any key...",
"Keine Taste drücken...",
@@ -1711,6 +1860,7 @@ const tPhrase Phrases[] = {
"Älä paina mitään näppäintä...",
"Nie naciskac klawiszy...",
"No pulse tecla...",
+ "Min patas Pliktra...",
},
{ "Phase 2: Learning specific key codes",
"Phase 2: Einzelne Tastencodes lernen",
@@ -1723,6 +1873,7 @@ const tPhrase Phrases[] = {
"Vaihe 2: Näppäinkoodien opettelu",
"Faza 2: Nauka pojedynczych klawiszy",
"Fase 2: Aprendiendo códigos específicos",
+ "Fasi 2: Ekmathisi memonomenon kodikon pliktron",
},
{ "Press key for '%s'",
"Taste für '%s' drücken",
@@ -1735,6 +1886,7 @@ const tPhrase Phrases[] = {
"Paina näppäintä toiminnolle '%s'",
"Nacisnac klawisz dla '%s'",
"Pulsar tecla para '%s'",
+ "Pata to pliktro gia '%s'",
},
{ "Press 'Up' to confirm",
"'Auf' drücken zum Bestätigen",
@@ -1747,6 +1899,7 @@ const tPhrase Phrases[] = {
"Paina 'Ylös' hyväksyäksesi",
"Nacisnac 'Gora' do potwierdzenia",
"Pulse 'Arriba' para confirmar",
+ "Pata 'pano' gia apodoxi",
},
{ "Press 'Down' to continue",
"'Ab' drücken zum Weitermachen",
@@ -1759,6 +1912,7 @@ const tPhrase Phrases[] = {
"Paina 'Alas' jatkaaksesi",
"Nacisnac 'Dol' zeby kontynuowac",
"Pulse 'Abajo' para confirmar",
+ "Pata 'kato' gia sinexia",
},
{ "(press 'Up' to go back)",
"('Auf' drücken um zurückzugehen)",
@@ -1771,6 +1925,7 @@ const tPhrase Phrases[] = {
"(paina 'Ylös' palataksesi takaisin)",
"(Nacisnac 'Gora' cofa)",
"(Pulse 'Arriba' para retornar)",
+ "(Pata 'pano' gia na pas piso)",
},
{ "(press 'Down' to end key definition)",
"('Ab' drücken zum Beenden)",
@@ -1783,6 +1938,7 @@ const tPhrase Phrases[] = {
"(paina 'Alas' lopettaaksesi näppäinten opettelun)",
"(Nacisnac 'Dol' by zakonczyc)",
"(Pulse 'Abajo' para terminar programación teclas)",
+ "(Pata 'Kato' gia termatismo)",
},
{ "Phase 3: Saving key codes",
"Phase 3: Codes abspeichern",
@@ -1795,6 +1951,7 @@ const tPhrase Phrases[] = {
"Vaihe 3: Näppäinkoodien tallettaminen",
"Faza 3: Zapamietac Kod",
"Fase 3: Guardar códigos de teclas",
+ "Fasi 3: Apothikevsi kodikon",
},
{ "Press 'Up' to save, 'Down' to cancel",
"'Auf' speichert, 'Ab' bricht ab",
@@ -1807,6 +1964,7 @@ const tPhrase Phrases[] = {
"Paina 'Ylös' tallettaaksesi ja 'Alas' peruuttaaksesi",
"'Gora' zapamietuje, 'Dol' przerywa",
"Pulse 'Arriba' para guarder, 'Abajo' para anular",
+ "'kato' apothikevsi, 'Pano' akirosi",
},
// Key names:
{ "Up",
@@ -1820,6 +1978,7 @@ const tPhrase Phrases[] = {
"Ylös",
"Gora",
"Arriba",
+ "Pano",
},
{ "Down",
"Ab",
@@ -1832,6 +1991,7 @@ const tPhrase Phrases[] = {
"Alas",
"Dol",
"Abajo",
+ "Kato",
},
{ "Menu",
"Menü",
@@ -1844,6 +2004,7 @@ const tPhrase Phrases[] = {
"Valikko",
"Menu",
"Menu",
+ "Menou",
},
{ "Ok",
"Ok",
@@ -1856,6 +2017,7 @@ const tPhrase Phrases[] = {
"Ok",
"Ok",
"Ok",
+ "Ok",
},
{ "Back",
"Zurück",
@@ -1868,6 +2030,7 @@ const tPhrase Phrases[] = {
"Takaisin",
"Wstecz",
"Retornar",
+ "Piso",
},
{ "Left",
"Links",
@@ -1880,6 +2043,7 @@ const tPhrase Phrases[] = {
"Vasemmalle",
"Lewo",
"Izquierda",
+ "Aristera",
},
{ "Right",
"Rechts",
@@ -1892,6 +2056,7 @@ const tPhrase Phrases[] = {
"Oikealle",
"Prawo",
"Derecha",
+ "Deksia",
},
{ "Red",
"Rot",
@@ -1904,6 +2069,7 @@ const tPhrase Phrases[] = {
"Punainen",
"Czerwony",
"Rojo",
+ "Kokino",
},
{ "Green",
"Grün",
@@ -1916,6 +2082,7 @@ const tPhrase Phrases[] = {
"Vihreä",
"Zielony",
"Verde",
+ "Prasino",
},
{ "Yellow",
"Gelb",
@@ -1928,6 +2095,7 @@ const tPhrase Phrases[] = {
"Keltainen",
"Zolty",
"Amarillo",
+ "Kitrino",
},
{ "Blue",
"Blau",
@@ -1940,6 +2108,7 @@ const tPhrase Phrases[] = {
"Sininen",
"Niebieski",
"Azul",
+ "Mple",
},
{ "Power",
"Ausschalten",
@@ -1952,6 +2121,7 @@ const tPhrase Phrases[] = {
"Virtakytkin",
"Wylaczyc",
"Corriente",
+ "Klisimo",
},
{ "Volume+",
"Lautstärke+",
@@ -1964,6 +2134,7 @@ const tPhrase Phrases[] = {
"Äänenvoimakkuus+",
"Glosnej",
"Volumen+",
+ "Entasi+",
},
{ "Volume-",
"Lautstärke-",
@@ -1976,6 +2147,7 @@ const tPhrase Phrases[] = {
"Äänenvoimakkuus-",
"Ciszej",
"Volumen-",
+ "Entasi-",
},
{ "Mute",
"Stumm",
@@ -1988,6 +2160,7 @@ const tPhrase Phrases[] = {
"Äänen vaimennus",
"Cisza",
"Mudo",
+ "Mougko",
},
// Miscellaneous:
{ "yes",
@@ -2001,6 +2174,7 @@ const tPhrase Phrases[] = {
"kyllä",
"tak",
"sí",
+ "nai",
},
{ "no",
"nein",
@@ -2013,6 +2187,7 @@ const tPhrase Phrases[] = {
"ei",
"nie",
"no",
+ "oxi",
},
{ "top",
"oben",
@@ -2025,6 +2200,7 @@ const tPhrase Phrases[] = {
"ylä",
"gora",
"parte sup.",
+ "pano",
},
{ "bottom",
"unten",
@@ -2037,6 +2213,7 @@ const tPhrase Phrases[] = {
"ala",
"dol",
"fondo",
+ "kato",
},
{ "Disk",
"Disk",
@@ -2049,6 +2226,7 @@ const tPhrase Phrases[] = {
"Disk",
"Disk",
"Disco",
+ "Disk",
},
{ "free",
"frei",
@@ -2061,6 +2239,7 @@ const tPhrase Phrases[] = {
"vapaa",
"pozostalo",
"libre",
+ "akoma",
},
{ "Jump: ", // note the trailing blank
"Springen: ",
@@ -2073,6 +2252,7 @@ const tPhrase Phrases[] = {
"Hyppää: ",
"Skok: ",
"Saltar: ",
+ "Pidima: ",
},
{ "Volume ", // note the trailing blank
"Lautstärke ",
@@ -2085,6 +2265,7 @@ const tPhrase Phrases[] = {
"Äänenvoimakkuus ",
"Glosnosc ",
"Volumen ",
+ "Entasi ",
},
{ " Stop replaying", // note the leading blank!
" Wiedergabe beenden",
@@ -2097,6 +2278,7 @@ const tPhrase Phrases[] = {
" Pysäytä toisto",
" Zatrzymac odtwarzanie",
" Parar reprodución",
+ " Telos anametadosis",
},
{ " Stop recording ", // note the leading and trailing blanks!
" Aufzeichnung beenden ",
@@ -2109,6 +2291,7 @@ const tPhrase Phrases[] = {
" Pysäytä nauhoitus ",
" Zatrzymac nagrywanie ",
" Parar grabación ",
+ " Telos egrafis ",
},
{ " Cancel editing", // note the leading blank!
" Schneiden abbrechen",
@@ -2119,8 +2302,9 @@ const tPhrase Phrases[] = {
" Annuler le montage",
" Avbryt redigering",
" Peruuta muokkaus",
- " Przerwac montaz ",
- " Anular modificación ",
+ " Przerwac montaz",
+ " Anular modificación",
+ " Diakopi kopsimatos",
},
{ "Switching primary DVB...",
"Primäres Interface wird umgeschaltet...",
@@ -2133,6 +2317,7 @@ const tPhrase Phrases[] = {
"Vaihdetaan ensisijainen vastaanotin...",
"Pierwszy interfejs DVB przelacza...",
"Cambio interface primario...",
+ "I protevon DVB Karta alazi...",
},
{ "Up/Dn for new location - OK to move",
"Auf/Ab für neue Position - dann OK",
@@ -2145,6 +2330,7 @@ const tPhrase Phrases[] = {
"Ylös/Alas = liiku, OK = siirrä",
"Gora/Dol na nowa pozycje - Ok zmienia",
"Arriba/Abajo para nuevo lugar - OK para mover",
+ "Pano/Kato gia nea thesi. meta OK",
},
{ "Editing process started",
"Schnitt gestartet",
@@ -2157,6 +2343,7 @@ const tPhrase Phrases[] = {
"Muokkaus aloitettu",
"Uruchomiony proces montazu",
"Proceso modificación iniciado",
+ "Arxi kopsimatos",
},
{ "Editing process finished",
"Schnitt beendet",
@@ -2169,6 +2356,7 @@ const tPhrase Phrases[] = {
"Muokkaus lopetettu",
"Proces montazu zakonczony",
"Proceso modificacion terminado",
+ "To kopsimo termatistike",
},
{ "Editing process failed!",
"Schnitt gescheitert!",
@@ -2181,6 +2369,7 @@ const tPhrase Phrases[] = {
"Muokkaus epäonnistui!",
"Bledny proces montazu!",
"Modificación ha fallado!",
+ "Kopsimo apetixe!",
},
{ "scanning recordings...",
"Aufzeichnungen werden durchsucht...",
@@ -2193,6 +2382,7 @@ const tPhrase Phrases[] = {
"haetaan nauhoituksia...",
"Skan nagran...",
"buscando grabaciones...",
+ "Ginete sarosi egrafon...",
},
{ NULL }
};
diff --git a/menu.c b/menu.c
index ed219cd..0eeba12 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.187 2002/04/20 09:17:08 kls Exp $
+ * $Id: menu.c 1.189 2002/05/01 14:54:10 kls Exp $
*/
#include "menu.h"
@@ -22,6 +22,8 @@
#define MAXWAIT4EPGINFO 10 // seconds
#define MODETIMEOUT 3 // seconds
+#define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
+
#define CHNUMWIDTH (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
@@ -2202,6 +2204,7 @@ void cMenuSetupRecord::Set(void)
Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"), &data.UseSubtitle));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord));
Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
+ Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"), &data.RecordDolbyDigital));
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
@@ -2239,7 +2242,7 @@ void cMenuSetupMisc::Set(void)
SetupTitle("Miscellaneous");
Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"), &data.MinEventTimeout));
Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
- Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (min)"), &data.SVDRPTimeout));
+ Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"), &data.SVDRPTimeout));
}
// --- cMenuSetup ------------------------------------------------------------
diff --git a/tools.c b/tools.c
index 099fb7d..6f99ef0 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.c 1.62 2002/03/31 20:51:06 kls Exp $
+ * $Id: tools.c 1.63 2002/05/01 16:20:30 kls Exp $
*/
#include "tools.h"
@@ -251,10 +251,10 @@ int FreeDiskSpaceMB(const char *Directory, int *UsedMB)
int Free = 0;
struct statfs statFs;
if (statfs(Directory, &statFs) == 0) {
- int blocksPerMeg = 1024 * 1024 / statFs.f_bsize;
+ double blocksPerMeg = 1024.0 * 1024.0 / statFs.f_bsize;
if (UsedMB)
- *UsedMB = (statFs.f_blocks - statFs.f_bfree) / blocksPerMeg;
- Free = statFs.f_bavail / blocksPerMeg;
+ *UsedMB = int((statFs.f_blocks - statFs.f_bfree) / blocksPerMeg);
+ Free = int(statFs.f_bavail / blocksPerMeg);
}
else
LOG_ERROR_STR(Directory);
diff --git a/vdr.c b/vdr.c
index 874e826..89aac3c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: vdr.c 1.102 2002/03/29 10:09:20 kls Exp $
+ * $Id: vdr.c 1.103 2002/04/26 12:15:30 kls Exp $
*/
#include <getopt.h>
@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
Interface->Info(tr("Editing process finished"));
}
}
- if (!*Interact && (!cRecordControls::Active() || ForceShutdown)) {
+ if (!*Interact && ((!cRecordControls::Active() && !cVideoCutter::Active()) || ForceShutdown)) {
time_t Now = time(NULL);
if (Now - LastActivity > ACTIVITYTIMEOUT) {
// Shutdown: