From c0f90a3e0c87901e80d180971c69a622a103b62c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 23 Mar 2013 12:16:00 +0100 Subject: [PATCH] Version 1.7.42 VDR developer version 1.7.42 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.42.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.41-1.7.42.diff MD5 checksums: 5a9ec132781045061325162fe03c2763 vdr-1.7.42.tar.bz2 011f2838026f849f031c40b2f06d9181 vdr-1.7.41-1.7.42.diff Approaching version 2.0.0: ========================== If there are no more serious bug reports, the final version 2.0.0 of VDR shall be released on March 31, 2013. So please test this developer version intensely and report any problems you might encounter as soon as possible. The following language files still have the given number of untranslated texts: da_DK.po: 134 el_GR.po: 197 hr_HR.po: 134 lt_LT.po: 1 nn_NO.po: 262 pt_PT.po: 28 sl_SI.po: 1 tr_TR.po: 134 If nobody takes care of these, they will remain untranslated in version 2.0.0. DEADLINE FOR SUBMITTING TRANSLATIONS IS SATURDAY, MARCH 30! From the HISTORY file: - Updated the Serbian OSD texts (thanks to Zoran Turalija). - Added maximum SNR and signal strength value for TechniSat SkyStar HD2 (thanks to Zoran Turalija). - Renamed the language file sr_SR.po to sr_RS.po (pointed out by Zoran Turalija). - Fixed loading the setup.conf file in case a parameter contains the '#' character (thanks to Johann Friedrichs). - The "Resume" button in the main menu is now only active if the respective recording actually exists (reported by Johann Friedrichs). - The cutter now allocates its buffers on the heap to avoid problems on systems with limited stack space (suggested by Juergen Lock). - Fixed formatting the channel definition example in the vdr(5) man page (thanks to Dominic Evans). - Updated the default channels.conf file. --- CONTRIBUTORS | 13 +- HISTORY | 16 + PLUGINS/src/hello/po/fi_FI.po | 4 +- PLUGINS/src/pictures/HISTORY | 2 +- PLUGINS/src/pictures/po/fi_FI.po | 4 +- PLUGINS/src/skincurses/po/fi_FI.po | 4 +- UPDATE-2.0.0 | 8 +- channels.conf | 229 +++++-------- config.c | 4 +- config.h | 6 +- cutter.c | 27 +- dvbdevice.c | 15 +- menu.c | 4 +- po/fi_FI.po | 2 +- po/{sr_SR.po => sr_RS.po} | 501 +++++++++++++++-------------- vdr.5 | 6 +- 16 files changed, 420 insertions(+), 425 deletions(-) rename po/{sr_SR.po => sr_RS.po} (69%) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index bd275cd0..4da1a5c4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1063,7 +1063,7 @@ Lars Bl Niko Tarnanen for translating OSD texts to the Finnish language -Rolf Ahrenberg +Rolf Ahrenberg for translating OSD texts to the Finnish language for fixing internationalization of the text for "Setup/DVB/Audio language(s)" for making pressing the Power button not stop Transfer Mode or replay immediately @@ -2740,6 +2740,9 @@ Johann Friedrichs for making cPalette::ClosestColor() treat fully transparent colors as "equal" for implementing scaling of SPU bitmaps for fixing creating a new VPS timer with the SVDRP command NEWT + for fixing loading the setup.conf file in case a parameter contains the '#' character + for reporting that the "Resume" button in the main menu was active even if the + respective recording did not exist Timo Helkio for reporting a hangup when replaying a TS recording with subtitles activated @@ -2916,6 +2919,8 @@ Juergen Lock in case, for instance, there is now a DVB-T device where there used to be a bonded DVB-S device for fixing a possible deadlock in handling the tuners of bonded devices + for suggesting to allocate the cutter's buffers on the heap to avoid problems on + systems with limited stack space Sergiu Dotenco for reporting a missing initialization in sDvbSpuRect @@ -2970,6 +2975,7 @@ Dominic Evans for suggesting to make the channel name column in the "What's on now/next" menu adjust its width to display the full short name of each channel for reporting wrong permissions of po/sr_SR.po + for fixing formatting the channel definition example in the vdr(5) man page Torsten Lang for reporting a problem with newline characters in stream component descriptions @@ -3123,3 +3129,8 @@ Matti Lehtim Siegfried Bosch for fixing a possible "Channel not available" if a recording starts on a system with bonded devices + +Zoran Turalija + for translating OSD texts to the Serbian language + for adding maximum SNR and signal strength value for TechniSat SkyStar HD2 + for pointing out that the language file sr_SR.po should be renamed to sr_RS.po diff --git a/HISTORY b/HISTORY index 0b9e6a2d..88f06260 100644 --- a/HISTORY +++ b/HISTORY @@ -7756,3 +7756,19 @@ Video Disk Recorder Revision History to Ville Skyttä). - Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann Friedrichs). + +2013-03-23: Version 1.7.42 + +- Updated the Serbian OSD texts (thanks to Zoran Turalija). +- Added maximum SNR and signal strength value for TechniSat SkyStar HD2 (thanks to + Zoran Turalija). +- Renamed the language file sr_SR.po to sr_RS.po (pointed out by Zoran Turalija). +- Fixed loading the setup.conf file in case a parameter contains the '#' character + (thanks to Johann Friedrichs). +- The "Resume" button in the main menu is now only active if the respective recording + actually exists (reported by Johann Friedrichs). +- The cutter now allocates its buffers on the heap to avoid problems on systems with + limited stack space (suggested by Juergen Lock). +- Fixed formatting the channel definition example in the vdr(5) man page (thanks to + Dominic Evans). +- Updated the default channels.conf file. diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po index a571922a..205a1f01 100644 --- a/PLUGINS/src/hello/po/fi_FI.po +++ b/PLUGINS/src/hello/po/fi_FI.po @@ -4,7 +4,7 @@ # Hannu Savolainen , 2002 # Jaakko Hyvätti , 2002 # Niko Tarnanen , 2003 -# Rolf Ahrenberg , 2003 +# Rolf Ahrenberg , 2003 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-18 14:04+0100\n" "PO-Revision-Date: 2007-08-11 12:34+0200\n" -"Last-Translator: Rolf Ahrenberg \n" +"Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY index 46ccc7c0..847f8b9a 100644 --- a/PLUGINS/src/pictures/HISTORY +++ b/PLUGINS/src/pictures/HISTORY @@ -9,7 +9,7 @@ VDR Plugin 'pictures' Revision History - Fixed the Play function (when used from a directory in the pictures menu it always started with the next directory). -- Added Finnish texts (thanks to Rolf Ahrenberg ). +- Added Finnish texts (thanks to Rolf Ahrenberg ). 2008-01-27: Version 0.0.3 diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po index 7f99e2cc..65b60425 100644 --- a/PLUGINS/src/pictures/po/fi_FI.po +++ b/PLUGINS/src/pictures/po/fi_FI.po @@ -1,7 +1,7 @@ # VDR plugin language source file. # Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Rolf Ahrenberg , 2008 +# Rolf Ahrenberg , 2008 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-18 12:57+0100\n" "PO-Revision-Date: 2008-01-12 17:41+0100\n" -"Last-Translator: Rolf Ahrenberg \n" +"Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po index 39afbbc8..2be31fbf 100644 --- a/PLUGINS/src/skincurses/po/fi_FI.po +++ b/PLUGINS/src/skincurses/po/fi_FI.po @@ -1,7 +1,7 @@ # VDR plugin language source file. # Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Rolf Ahrenberg , 2007 +# Rolf Ahrenberg , 2007 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-18 14:04+0100\n" "PO-Revision-Date: 2007-08-14 20:48+0300\n" -"Last-Translator: Rolf Ahrenberg \n" +"Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0 index c24fcb0d..6287a770 100644 --- a/UPDATE-2.0.0 +++ b/UPDATE-2.0.0 @@ -5,6 +5,10 @@ have been made "behind the scenes". See the file HISTORY for a detailed list of all changes. +Full support for HDTV: + +- VDR now fully supports HDTV. + Satellite Channel Routing: - VDR now supports "Satellite Channel Routing" (SCR) according to EN50494 (based on @@ -468,10 +472,6 @@ Misc: files to be spread around your system according to the FHS, you can set the parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as before. -- VDR can now be built according to the FHS ("File system Hierarchy Standard") by - activating the line - #USEFHS = 1 - in a copy of the file Make.config.template. - The script given to VDR with the '-r' option is now also called whenever a recording is deleted. - Synchronizing system time to the transponder time is now done using adjtime() in order diff --git a/channels.conf b/channels.conf index e47dd09b..1e279d44 100644 --- a/channels.conf +++ b/channels.conf @@ -1,146 +1,85 @@ -RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu;106=deu:105:0:12003:1:1089:0 -SAT.1;ProSiebenSat.1:12544:hC56:S19.2E:22000:255:256=deu;259=deu:32:0:17500:1:1107:0 -ProSieben;ProSiebenSat.1:12544:hC56:S19.2E:22000:511:512=deu;515=deu:33:0:17501:1:1107:0 -RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0 -Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu,103=2ch;106=dd:104:0:28106:1:1101:0 -Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu,203=2ch:204:0:28107:1:1101:0 -hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0 -NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0 -SR Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0 -WDR KĂśln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0 -BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0 -SWR Fernsehen BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0 -Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0 -ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0 -3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0 -KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0 -arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0 -ORF1;ORF:562:C34D34M16B8T8G4Y0:T:27500:3210:3211=deu;3213=deu:3215:0:10101:13130:320:0 -ORF2S;ORF:562:C34D34M16B8T8G4Y0:T:27500:3220:3221=deu;3223=deu:3225:0:10107:13130:320:0 -ATV;ORF:562:C34D34M16B8T8G4Y0:T:27500:3240:3241=deu:3245:0:10120:13130:320:0 -ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0 -ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0 -ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:630:0:28011:1:1079:0 -CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0 -Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0 -VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0 -kabel eins;ProSiebenSat.1:12544:hC56:S19.2E:22000:767:768=deu:34:0:17502:1:1107:0 -DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:133:5:0 -9Live;ProSiebenSat.1:12544:hC56:S19.2E:22000:1279:1280=deu:36:0:17504:1:1107:0 -DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0 -HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0 -Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0 -EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0 -rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0 -Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:579:0:28707:1:1026:0 -Veronica/JETIX;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0 -BVN;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0 -n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0 -Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0 -TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0 -Eurosport;SES Astra:12226:hC34:S19.2E:27500:101+8190:103=deu:102:0:31200:1:1091:0 -EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0 -EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:204:0:28202:1:1073:0 -EinsPlus;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0 -ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:630:0:28016:1:1079:0 -ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:630:0:28014:1:1079:0 -MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0 -rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0 -:Premiere World -PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1722,1702,1801:8:133:1:0 -PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1722,1831,1801:10:133:2:0 -PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1831,1722,1801:11:133:2:0 -PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1722,1831,1702,1801:43:133:2:0 -PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1831,1722,1702,1801:9:133:2:0 -PREMIERE SERIE,SERIE;PREMIERE:11797:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1831,1801,1722,1702:16:133:2:0 -PREMIERE KRIMI,KRIMI;PREMIERE:11797:hC34:S19.2E:27500:2815:2816=deu:32:1831,1702,1722,1801:23:133:2:0 -PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11719:hC34:S19.2E:27500:1535:1536=deu:32:1722,1831,1702,1801:516:133:3:0 -PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu,1025=deu:32:1831,1801,1722,1702:41:133:3:0 -PREMIERE FILMFEST,FILMFEST;PREMIERE:11719:hC34:S19.2E:27500:1279:1280=deu:32:1831,1801,1702,1722:20:133:3:0 -DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1831,1702,1722,1801:34:133:17:0 -:Premiere Direkt -PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0 -:PW Erotic -BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1702,1722,1801:21:133:17:0 -EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0 -:Sportsworld -PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1831,1722,1801,1702:17:133:3:0 -BIG BROTHER,BROTHER;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:0:1831,1702,1722,1801:27:133:4:0 -:Beta Digital -N24;ProSiebenSat.1:12544:hC56:S19.2E:22000:1023:1024=deu:35:0:17503:1:1107:0 -LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0 -:- -APS.TV3;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0 -ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0 -Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0 -Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0 -ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0 -FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0 -LCP;ABSAT:12285:vC34:S19.2E:27500:167:108:0:0:17027:1:1094:0 -ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0 -BEST OF SHOPPING;CSAT:12324:vC34:S19.2E:27500:2047+160:0:0:0:8612:1:1096:0 -ASTRA-Mosaic;SES ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0 -ASTRA-Mosaic 2;SES ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0 -ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0 -ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0 -ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0 -Chamber TV;Chambre des DØputØes:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0 -RTL Tele Letzebuerg:12551:vC56:S19.2E:22000:168:144=ltz,146=fra:301:0:3994:1:1108:0 -tien;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0 -NICK AUSTRIA;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0 -Service 3;MTV Networks Europe:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0 -VIVA;MTV Networks Europe:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0 -COMEDY CENTRAL;MTV Networks Europe:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0 -QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0 -TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0 -:NTSC -Venevision;T-Systems/MTI:11200:vC56:S13.0E:27500:922:923=und:0:0:4750:0:13400:0 -EBC.1;T-Systems/MTI:11200:vC56:S13.0E:27500:373:374=eng:0:0:4747:0:13400:0 -:HDTV -HDFORUM;TF1:11242:vC34:S13.0E:27500:0:36=fra,37=fra:0:0:13809:100:200:0 -LUXE TV HD;Eutelsat:11240:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0 -Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0 -Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0 -SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0 -SMD HD:12699:vC56:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0 -Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0 -TV HD;CSAT:12581:vC56:S19.2E:22000:165:100=fra;101=fra:0:0:9306:1:1110:0 -C M HD;Telenor:11261:hC78:S1.0W:24500:517:660=eng;661=eng:0:B00:3306:70:33:0 -CANAL+ HD;Telenor:11389:hC78:S1.0W:24500:512:640=eng;641=eng:580:0:3306:70:34:0 -Era 2;Service Provider:11645:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0 -TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:0 -:@201 Sky -Sky One;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4703:2:2030:0 -Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0 -ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2349=eng,2351=NAR:2353:0:10070:2:2044:0 -SCI FI;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0 -ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0 -ParaComedy 1;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0 -ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0 -Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0 -Sky Comedy;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,686=NAR;666=eng:582:960,961:4303:2:2007:0 -Sky Action;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,687=NAR;667=eng:583:960,961:4302:2:2007:0 -Sky Family;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,688=NAR;668=eng:584:960,961:4403:2:2007:0 -Sky ScFi/Horror;BSkyB:11836:hC23:S28.2E:27500:512+8190:640=eng,680=NAR;660=eng:576:960,961:4304:2:2007:0 -Sky Classics;BSkyB:11836:hC23:S28.2E:27500:513+8190:641=eng,681=NAR;661=eng:577:960,961:4305:2:2007:0 -Sky Indie;BSkyB:11836:hC23:S28.2E:27500:514+8190:642=eng,682=NAR;662=eng:578:960,961:4306:2:2007:0 -Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,653=NAR;663=eng:579:960,961:4603:2:2030:0 -Sky Drama;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,683=NAR;663=eng:579:960,961:5502:2:2007:0 -SkyMovies SD1;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,686=NAR;666=eng:2328:960,961:4602:2:2030:0 -SkyMovies SD2;BSkyB:12285:vC23:S28.2E:27500:514+8190:642=eng,682=NAR;662=eng:2331:960,961:4604:2:2030:0 -Sky Premiere;BSkyB:11603:vC23:S28.2E:27500:513+129:641=eng,661=NAR;681=eng:577:960,961:4651:2:2408:0 -Sky Prem+1;BSkyB:11603:vC23:S28.2E:27500:514+130:642=eng,662=NAR;682=eng:578:960,961:4652:2:2408:0 -:@900 Some 'seed' channels -Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0 -WDR Münster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0 -Animal Plnt+1;BSkyB:12070:hC23:S28.2E:27500:514+8190:662=eng,682=NAR:578:960,961:50002:2:2019:0 -S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0 -CNN;BSkyB:12051:vC23:S28.2E:27500:2317:2319=eng:2318:0:7140:2:2018:0 -BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0 -MTI;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0 -WRN Eng AAP;Globecast:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0 -DrDish Television;BetaDigital:12246:vC34:S19.2E:27500:2047:2048=deu:0:0:10107:1:1092:0 -! LifeStyle-TV !;T-Systems:12633:hC56:S19.2E:22000:204:304=deu:0:0:12603:1:1113:0 -Challenger Tv;Telespazio:11295:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0 -NDS Enc 3;NDS:11535:vC34:S1.0W:5632:308+8190:256=eng,257=fra:273:0:1:65535:1:0 +RTL Television,RTL;RTL World:12187:HC34M2S0:S19.2E:27500:163=2:104=deu@3;106=deu@106:105;110=deu:0:12003:1:1089:0 +SAT.1;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:255=2:256=deu@3;259=deu@106:32:0:17500:1:1107:0 +ProSieben;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:511=2:512=deu@3;515=deu@106:33:0:17501:1:1107:0 +RTL2;RTL World:12187:HC34M2S0:S19.2E:27500:166=2:128=deu@3:68:0:12020:1:1089:0 +Das Erste HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5101=27:5102=deu@3,5103=mis@3;5106=deu@106:5104;5105=deu:0:10301:1:1019:0 +ZDF HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6110=27:6120=deu@3,6121=mis@3,6123=mul@3;6122=deu@106:6130;6131=deu:0:11110:1:1011:0 +BR Süd HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3;5206=deu@106:5204:0:10325:1:1025:0 +hr-fernsehen;ARD:11836:HC34M2S0:S19.2E:27500:301=2:302=deu@3,303=mis@3:304:0:28108:1:1101:0 +NDR FS MV HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3;5226=deu@106:5224;5225=deu:0:10328:1:1025:0 +SR Fernsehen;ARD:12265:HC34M2S0:S19.2E:27500:1301=2:1302=deu@3,1303=mis@3:1304:0:28486:1:1093:0 +WDR HD Köln;ARD:12422:HC34M2S0:S19.2E:27500:5501=27:5502=deu@3,5503=mis@3;5506=deu@106:5504:0:28325:1:1201:0 +SWR BW HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3;5126=deu@106:5124;5125=deu:0:10303:1:1019:0 +rbb Berlin;ARD:12109:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28206:1:1073:0 +PHOENIX HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5261=27:5262=deu@3,5263=mul@3:5264:0:10331:1:1025:0 +BR-alpha;ARD:12265:HC34M2S0:S19.2E:27500:1401=2:1402=deu@3,1403=mis@3;1406=deu@106:1404:0:28487:1:1093:0 +3sat HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6510=27:6520=deu@3,6521=mis@3,6523=mul@3;6522=deu@106:6530;6531=deu:0:11150:1:1010:0 +arte HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5111=27:5112=deu@3,5113=fra@3;5116=deu@106:5114;5115=deu,5118=fra:0:10302:1:1019:0 +MDR Sachsen;ARD:12109:HC34M2S0:S19.2E:27500:2901=2:2902=deu@3,2903=mis@3:2904:0:28228:1:1073:0 +ServusTV HD Oesterreich;ServusTV:11303:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@4,3585=eng@4;3586=deu@122,3587=deu@106:3588:0:4913:1:1007:0 +N24;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1023=2:1024=deu@3:35:0:17503:1:1107:0 +Das Erste;ARD:11836:HC34M2S0:S19.2E:27500:101=2:102=deu@3,103=mis@3;106=deu@106:104;105=deu:0:28106:1:1101:0 +Bayerisches FS Süd;ARD:11836:HC34M2S0:S19.2E:27500:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28107:1:1101:0 +NDR FS MV;ARD:12109:HC34M2S0:S19.2E:27500:2601=2:2602=deu@3,2603=mis@3:2604:0:28224:1:1073:0 +WDR Köln;ARD:11836:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28111:1:1101:0 +SWR Fernsehen BW;ARD:11836:HC34M2S0:S19.2E:27500:801=2:802=deu@3,803=mis@3;806=deu@106:804:0:28113:1:1101:0 +PHOENIX;ARD:10744:HC56M2S0:S19.2E:22000:501=2:502=deu@3,503=mul@3:504:0:28725:1:1051:0 +ZDF;ZDFvision:11953:HC34M2S0:S19.2E:27500:110=2:120=deu@3,121=mis@3,122=mul@3;125=deu@106:130;131=deu:0:28006:1:1079:0 +3sat;ZDFvision:11953:HC34M2S0:S19.2E:27500:210=2:220=deu@3,221=mis@3,222=mul@3;225=deu@106:230;231=deu:0:28007:1:1079:0 +KiKA HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6610=27:6620=deu@3,6621=mis@3;6622=deu@106:6630:0:11160:1:1010:0 +KiKA;ZDFvision:11953:HC34M2S0:S19.2E:27500:310=2:320=deu@3,321=mis@3;325=deu@106:330:0:28008:1:1079:0 +arte;ARD:10744:HC56M2S0:S19.2E:22000:401=2:402=deu@3,403=fra@3:404:0:28724:1:1051:0 +ORF1 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:1920=27:1921=deu@4,1922=eng@4;1923=deu@106:1925:D05,D95,648,1702,1833,9C4,98C:4911:1:1007:0 +ORF1;ORF:12692:HC56M2S0:S19.2E:22000:160=2:161=deu@3;163=deu@106:165:D05,D95,648,1702,1833,9C4,98C:13001:1:1117:0 +ORF2 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:2920=27:2921=deu@4,2922=eng@4;2923=deu@106:2925:D05,D95,648,1702,1833,9C4,98C:4912:1:1007:0 +ORF2;ORF:12692:HC56M2S0:S19.2E:22000:500=2:501=deu@3;503=deu@106:505:D95,D05,648,1702,1833,9C4,98C:13002:1:1117:0 +ZDFinfo HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6710=27:6720=deu@3,6721=mis@3,6723=mul@3;6722=deu@106:6730:0:11170:1:1010:0 +ZDFinfo;ZDFvision:11953:HC34M2S0:S19.2E:27500:610=2:620=deu@3,621=mis@3,622=mul@3;625=deu@106:630:0:28011:1:1079:0 +CNN Int.;CNN:11778:VC34M2S0:S19.2E:27500:165=2:100=eng@3:0:0:28522:1:1068:0 +SUPER RTL;RTL World:12187:HC34M2S0:S19.2E:27500:165=2:120=deu@3:65:0:12040:1:1089:0 +VOX;RTL World:12187:HC34M2S0:S19.2E:27500:167=2:136=deu@3:71;74=deu:0:12060:1:1089:0 +kabel eins;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:767=2:768=deu@3:34:0:17502:1:1107:0 +DAS VIERTE,D VIERTE;BetaDigital:12460:HC34M2S0:S19.2E:27500:2047=2:2048=deu@3:36:0:1793:133:5:0 +BBC FOUR;BSkyB:10802:HC56M2S0:S28.2E:22000:5600=2:5601=eng@3,5602=NAR@3:5603;5604=eng:0:6416:2:2047:0 +BBC HD;BSkyB:10847:vC56M2O0S1:S28.5E:23000:5500=27:5502=NAR@3;5501=eng@106:5503;5504=eng:0:6940:2:2050:0 +BBC One HD;BSkyB:10847:VC23M5O25P0S1:S28.2E:23000:5400=27:5402=NAR@3;5401=eng@106:5403;5404=eng:0:6941:2:2050:0 +SAT.1 Gold;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1279=2:1280=deu@3:36:0:17504:1:1107:0 +SPORT1;BetaDigital:12480:VC34M2S0:S19.2E:27500:1023=2:1024=deu@3:39:0:900:133:33:0 +HSE24,HSE24;BetaDigital:12480:VC34M2S0:S19.2E:27500:1279=2:1280=deu@3:37:0:40:133:33:0 +Bloomberg Europe TV;Arqiva:11597:VC56M2S0:S19.2E:22000:1360=2:1320=eng@4:37:0:10067:1:1026:0 +NRJ 12;CSAT:11817:VC34M2S0:S19.2E:27500:163=2:92=fra@4;93=fra@106:41:1811,1812,500,1863,100:8004:1:1070:0 +rbb Brandenburg;ARD:12109:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28205:1:1073:0 +Sky News Intl;SES ASTRA:12604:HC56M2S0:S19.2E:22000:1290=2:2290=@4:0:0:7290:1:1111:0 +Veronica/DisneyXD;CANALDIGITAAL:12574:HC56M2O0S0:S19.2E:22000:0:0:0:622:5020:53:1109:0 +Test;CANALDIGITAAL:12574:HC56M2O0S0:S19.2E:22000:522+8190=2:97=dut@4:40:100:5025:53:1109:0 +n-tv;RTL World:12187:HC34M2S0:S19.2E:27500:169=2:73=deu@3:80:0:12090:1:1089:0 +Al Jazeera Channel;GlobeCast:11508:VC56M2S0:S19.2E:22000:709=2:729=ara@3:0:0:7009:1:1020:0 +ORF III;ORF:12662:HC56M2S0:S19.2E:22000:1010=2:1011=deu@4:1013:D95,648,D05,9C4,1702,1833,98C:13101:1:1115:0 +Eurosport HD,EurospHD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:1535=27:0;1539=deu@106:32:1833,9C4,9AF,98C:132:133:6:0 +Eurosport Deutschland;SES Astra:12226:HC34M2S0:S19.2E:27500:101=2:103=deu@4:102:0:31200:1:1091:0 +tagesschau24;ARD:10744:HC56M2S0:S19.2E:22000:101=2:102=deu@3:0:0:28721:1:1051:0 +Einsfestival HD;ARD:12422:HC34M2S0:S19.2E:27500:1601=27:1602=deu@3;1606=deu@106:1604:0:28396:1:1201:0 +Einsfestival;ARD:10744:HC56M2S0:S19.2E:22000:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28722:1:1051:0 +EinsPlus;ARD:10744:HC56M2S0:S19.2E:22000:301=2:302=deu@3,303=mis@3;306=deu@106:304:0:28723:1:1051:0 +zdf.kultur HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6410=27:6420=deu@3,6421=mis@3,6423=mul@3;6422=deu@106:6430:0:11140:1:1011:0 +zdf.kultur;ZDFvision:11953:HC34M2S0:S19.2E:27500:1110=2:1120=deu@3,1121=mis@3,1122=mul@3;1125=deu@106:1130:0:28016:1:1079:0 +zdf_neo HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6310=27:6320=deu@3,6321=mis@3,6323=mul@3;6322=deu@106:6330:0:11130:1:1011:0 +zdf_neo;ZDFvision:11953:HC34M2S0:S19.2E:27500:660=2:670=deu@3,671=mis@3,672=mul@3;675=deu@106:680:0:28014:1:1079:0 +SIXX;ProSiebenSat.1:12460:HC34M2S0:S19.2E:27500:767=2:768=deu@3:35:0:776:133:5:0 +:Sky +Sky Cinema,Cinema;SKY:11797:HC34M2S0:S19.2E:27500:511=2:512=deu@3,513=eng@3;515=deu@106:32:1702,1722,1833,1834,1836,9C4,9C7,9AF,98C,1861:10:133:2:0 +Sky Cinema +1,Cinema1;SKY:11797:HC34M2S0:S19.2E:27500:1791=2:1792=deu@3,1793=eng@3;1795=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:11:133:2:0 +Sky Cinema +24,Cinema24;SKY:11797:HC34M2S0:S19.2E:27500:2303=2:2304=deu@3,2305=eng@3;2307=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:43:133:2:0 +Sky Action,Action;SKY:11797:HC34M2S0:S19.2E:27500:767=2:768=deu@3,769=eng@3;771=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:9:133:2:0 +Sky Comedy,Comedy;SKY:11797:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3,2561=eng@3;2563=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:8:133:2:0 +Sky Atlantic HD,AtlanticHD;SKY:11993:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106,1284=eng@106:32:1833,9C4,9AF,98C:110:133:13:0 +Fox Serie,Fox;SKY:12070:HC34M2S0:S19.2E:27500:1279=2:1280=deu@3,1281=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:16:133:1:0 +History HD,HistHD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106:32:1833,9C4,9AF,98C:113:133:13:0 +Sky Emotion,Emotion;SKY:11797:HC34M2S0:S19.2E:27500:2815=2:2816=deu@3,2817=eng@3;2819=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:20:133:2:0 +Sky Nostalgie,Nostalgie;SKY:11719:HC34M2S0:S19.2E:27500:1535=2:1536=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:516:133:3:0 +Sky Hits,SkyHits;SKY:11719:HC34M2S0:S19.2E:27500:1023=2:1024=deu@3,1025=eng@3;1027=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:41:133:3:0 +Discovery Channel,Discovery;SKY:12031:HC34M2S0:S19.2E:27500:3071=2:3072=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:14:133:4:0 +National Geographic,NatGeo;SKY:12031:HC34M2S0:S19.2E:27500:3327=2:3328=deu@3,3329=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:13:133:4:0 +Disney Channel,Disney;SKY:11758:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:34:133:17:0 +TNT Serie,TNTSerie;SKY:12070:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3,2561=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:50:133:1:0 :@1000 New channels diff --git a/config.c b/config.c index 3dc9fe84..7a153cb1 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 2.37 2013/03/10 14:56:51 kls Exp $ + * $Id: config.c 2.38 2013/03/18 08:57:50 kls Exp $ */ #include "config.h" @@ -518,7 +518,7 @@ void cSetup::Store(const char *Name, double &Value, const char *Plugin) bool cSetup::Load(const char *FileName) { - if (cConfig::Load(FileName, true)) { + if (cConfig::Load(FileName)) { bool result = true; for (cSetupLine *l = First(); l; l = Next(l)) { bool error = false; diff --git a/config.h b/config.h index f7b3795f..b55498ff 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 2.74 2013/03/11 11:07:59 kls Exp $ + * $Id: config.h 2.75 2013/03/16 15:12:14 kls Exp $ */ #ifndef __CONFIG_H @@ -22,8 +22,8 @@ // VDR's own version number: -#define VDRVERSION "1.7.41" -#define VDRVERSNUM 10741 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.42" +#define VDRVERSNUM 10742 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/cutter.c b/cutter.c index 8566c720..05bb0f9f 100644 --- a/cutter.c +++ b/cutter.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: cutter.c 2.24 2013/02/17 14:11:03 kls Exp $ + * $Id: cutter.c 2.25 2013/03/18 09:40:49 kls Exp $ */ #include "cutter.h" @@ -362,11 +362,22 @@ bool cCuttingThread::SwitchFile(bool Force) return true; } +class cHeapBuffer { +private: + uchar *buffer; +public: + cHeapBuffer(int Size) { buffer = MALLOC(uchar, Size); } + ~cHeapBuffer() { free(buffer); } + operator uchar * () { return buffer; } + }; + bool cCuttingThread::FramesAreEqual(int Index1, int Index2) { + cHeapBuffer Buffer1(MAXFRAMESIZE); + cHeapBuffer Buffer2(MAXFRAMESIZE); + if (!Buffer1 || !Buffer2) + return false; bool Independent; - uchar Buffer1[MAXFRAMESIZE]; - uchar Buffer2[MAXFRAMESIZE]; int Length1; int Length2; if (LoadFrame(Index1, Buffer1, Independent, Length1) && LoadFrame(Index2, Buffer2, Independent, Length2)) { @@ -386,12 +397,14 @@ bool cCuttingThread::FramesAreEqual(int Index1, int Index2) void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index) { + cHeapBuffer Buffer(MAXFRAMESIZE); + if (!Buffer) + return; bool Processed[MAXPID] = { false }; cPacketStorage PacketStorage; int64_t LastPts = lastVidPts + delta;// adding one frame length to fully cover the very last frame Processed[patPmtParser.Vpid()] = true; // we only want non-video packets for (int NumIndependentFrames = 0; NumIndependentFrames < 2; Index++) { - uchar Buffer[MAXFRAMESIZE]; bool Independent; int len; if (LoadFrame(Index, Buffer, Independent, len)) { @@ -534,8 +547,12 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn bool SeamlessBegin = LastEndIndex >= 0 && FramesAreEqual(LastEndIndex, BeginIndex); bool SeamlessEnd = NextBeginIndex >= 0 && FramesAreEqual(EndIndex, NextBeginIndex); // Process all frames from BeginIndex (included) to EndIndex (excluded): + cHeapBuffer Buffer(MAXFRAMESIZE); + if (!Buffer) { + error = "malloc"; + return false; + } for (int Index = BeginIndex; Running() && Index < EndIndex; Index++) { - uchar Buffer[MAXFRAMESIZE]; bool Independent; int Length; if (LoadFrame(Index, Buffer, Independent, Length)) { diff --git a/dvbdevice.c b/dvbdevice.c index 1fba1661..ab6149f2 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 2.87 2013/03/13 11:23:53 kls Exp $ + * $Id: dvbdevice.c 2.88 2013/03/16 15:23:35 kls Exp $ */ #include "dvbdevice.h" @@ -549,7 +549,9 @@ int cDvbTuner::GetSignalStrength(void) const // Use the subsystemId to identify individual devices in case they need // special treatment to map their Signal value into the range 0...0xFFFF. switch (subsystemId) { - case 0x13C21019: MaxSignal = 670; break; // TT-budget S2-3200 (DVB-S/DVB-S2) + case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2) + case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2) + MaxSignal = 670; break; } int s = int(Signal) * 100 / MaxSignal; if (s > 100) @@ -628,15 +630,18 @@ int cDvbTuner::GetSignalQuality(void) const // Use the subsystemId to identify individual devices in case they need // special treatment to map their Snr value into the range 0...0xFFFF. switch (subsystemId) { - case 0x13C21019: if (frontendType == SYS_DVBS2) { // TT-budget S2-3200 (DVB-S/DVB-S2) + case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2) + case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2) + if (frontendType == SYS_DVBS2) { MinSnr = 10; MaxSnr = 70; } else MaxSnr = 200; break; - case 0x20130245: // PCTV Systems PCTV 73ESE - case 0x2013024F: MaxSnr = 255; break; // PCTV Systems nanoStick T2 290e + case 0x20130245: // PCTV Systems PCTV 73ESE + case 0x2013024F: // PCTV Systems nanoStick T2 290e + MaxSnr = 255; break; } int a = int(constrain(Snr, MinSnr, MaxSnr)) * 100 / (MaxSnr - MinSnr); int b = 100 - (Unc * 10 + (Ber / 256) * 5); diff --git a/menu.c b/menu.c index 77326972..31d25d08 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 2.81 2013/03/04 14:11:47 kls Exp $ + * $Id: menu.c 2.82 2013/03/18 09:11:48 kls Exp $ */ #include "menu.h" @@ -4566,6 +4566,8 @@ const char *cReplayControl::NowReplaying(void) const char *cReplayControl::LastReplayed(void) { + if (!Recordings.GetByName(fileName)) + fileName = NULL; return fileName; } diff --git a/po/fi_FI.po b/po/fi_FI.po index 37571576..f44dd72f 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -4,7 +4,7 @@ # Hannu Savolainen , 2002 # Jaakko Hyvätti , 2002, 2003 # Niko Tarnanen , 2003 -# Rolf Ahrenberg , 2003-2008, 2010-2013 +# Rolf Ahrenberg , 2003-2008, 2010-2013 # Matti Lehtimäki , 2013 # msgid "" diff --git a/po/sr_SR.po b/po/sr_RS.po similarity index 69% rename from po/sr_SR.po rename to po/sr_RS.po index 140bd463..2968b913 100644 --- a/po/sr_SR.po +++ b/po/sr_RS.po @@ -2,14 +2,15 @@ # Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Milan Cvijanović , 2010 +# Zoran Turalija , 2013 # msgid "" msgstr "" "Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" -"PO-Revision-Date: 2011-01-09 15:57+0100\n" -"Last-Translator: Milan Cvijanović \n" +"PO-Revision-Date: 2013-03-16 15:05+0100\n" +"Last-Translator: Zoran Turalija \n" "Language-Team: Serbian \n" "Language: sr\n" "MIME-Version: 1.0\n" @@ -23,13 +24,13 @@ msgid "Channel not available!" msgstr "Kanal nije dostupan!" msgid "Can't start Transfer Mode!" -msgstr "Nemoguće započeti Prenos!!" +msgstr "Nemoguće započeti 'Transfer Mode' režim!" msgid "off" msgstr "isključi" msgid "on" -msgstr "" +msgstr "uključi" msgid "auto" msgstr "automatski" @@ -41,19 +42,19 @@ msgid "Polarization" msgstr "Polarizacija" msgid "System" -msgstr "Sistem" +msgstr "Sistem (standard)" msgid "Srate" -msgstr "Srate" +msgstr "Srate (symbol rate)" msgid "Inversion" msgstr "Inverzija" msgid "CoderateH" -msgstr "CoderateH" +msgstr "CoderateH (FEC)" msgid "CoderateL" -msgstr "CoderateL" +msgstr "CoderateL (FEC)" msgid "Modulation" msgstr "Modulacija" @@ -71,13 +72,13 @@ msgid "Hierarchy" msgstr "Hijerarhija" msgid "Rolloff" -msgstr "" +msgstr "Rolloff" msgid "StreamId" -msgstr "" +msgstr "StreamId" msgid "Starting EPG scan" -msgstr "Počinjem EPG pretragu" +msgstr "Počinje EPG pretraživanje" msgid "Content$Movie/Drama" msgstr "Film/Drama" @@ -89,7 +90,7 @@ msgid "Content$Adventure/Western/War" msgstr "Avantura/Vestern/Ratni" msgid "Content$Science Fiction/Fantasy/Horror" -msgstr "Naučno Fantastični/Fantazija/Horor" +msgstr "Naučna fantastika/Fantazija/Horor" msgid "Content$Comedy" msgstr "Komedija" @@ -101,76 +102,76 @@ msgid "Content$Romance" msgstr "Romansa" msgid "Content$Serious/Classical/Religious/Historical Movie/Drama" -msgstr "Ozbiljan/Klasični/Religiozan/Istorijski Film/Drama" +msgstr "Ozbiljan/Klasični/Religiozan/Istorijski/Drama" msgid "Content$Adult Movie/Drama" -msgstr "Za odrasle Film/Drama" +msgstr "Film za odrasle/Drama" msgid "Content$News/Current Affairs" -msgstr "Vesti/Trenutni poslovi" +msgstr "Vesti/Aktuelni događaji" msgid "Content$News/Weather Report" -msgstr "Vesti/Vremenski izvještaj" +msgstr "Vesti/Vremenski izveštaj" msgid "Content$News Magazine" -msgstr "Magazin Vesti" +msgstr "Novosti" msgid "Content$Documentary" msgstr "Dokumentarni" msgid "Content$Discussion/Inverview/Debate" -msgstr "Diskusije/Intervjui/Debate" +msgstr "Diskusija/Razgovor/Debata" msgid "Content$Show/Game Show" -msgstr "Zabavni/Igre Zabavne" +msgstr "Zabavni/Igre" msgid "Content$Game Show/Quiz/Contest" -msgstr "Igre Zabavne/Kviz/Takmičenja" +msgstr "Igre/Kviz/Takmičenje" msgid "Content$Variety Show" -msgstr "Cirkus" +msgstr "Kolaž program" msgid "Content$Talk Show" -msgstr "Talk šou" +msgstr "Diskusiona emisija" msgid "Content$Sports" msgstr "Sport" msgid "Content$Special Event" -msgstr "Specijalne emisije" +msgstr "Specijalna emisija" msgid "Content$Sport Magazine" -msgstr "Sportski Magazin" +msgstr "Sportski magazin" msgid "Content$Football/Soccer" -msgstr "Futball/Igrač" +msgstr "Fudbal" msgid "Content$Tennis/Squash" msgstr "Tenis/Skvoš" msgid "Content$Team Sports" -msgstr "Timski Sport" +msgstr "Timski sportovi" msgid "Content$Athletics" msgstr "Atletika" msgid "Content$Motor Sport" -msgstr "Moto Sport" +msgstr "Moto-sport" msgid "Content$Water Sport" msgstr "Sportovi na vodi" msgid "Content$Winter Sports" -msgstr "Zimski Sportovi" +msgstr "Zimski sportovi" msgid "Content$Equestrian" -msgstr "Jahački" +msgstr "Konjički sport" msgid "Content$Martial Sports" -msgstr "Vojni Sportovi" +msgstr "Borilački sportovi" msgid "Content$Children's/Youth Programme" -msgstr "Dečiji/Program za Mlade" +msgstr "Dečiji program/Program za mlade" msgid "Content$Pre-school Children's Programme" msgstr "Predškolski dečiji program" @@ -182,10 +183,10 @@ msgid "Content$Entertainment Programme for 10 to 16" msgstr "Zabavni program za uzrast od 10 do 16" msgid "Content$Informational/Educational/School Programme" -msgstr "Informativni/Edukacioni/Školski Program" +msgstr "Informativni/Edukativni/Školski program" msgid "Content$Cartoons/Puppets" -msgstr "Crtići/Lutkarski" +msgstr "Crtani/Lutkarski" msgid "Content$Music/Ballet/Dance" msgstr "Muzički/Balet/Ples" @@ -194,16 +195,16 @@ msgid "Content$Rock/Pop" msgstr "Rok/Pop" msgid "Content$Serious/Classical Music" -msgstr "Ozbiljna/Klasična Muzika" +msgstr "Ozbiljna/Klasična muzika" msgid "Content$Folk/Tradional Music" -msgstr "Narodna/Izvorna Muzika" +msgstr "Narodna/Izvorna muzika" msgid "Content$Jazz" msgstr "Džez" msgid "Content$Musical/Opera" -msgstr "Mjuzikli/Opera" +msgstr "Mjuzikl/Opera" msgid "Content$Ballet" msgstr "Balet" @@ -212,116 +213,116 @@ msgid "Content$Arts/Culture" msgstr "Umetnost/Kultura" msgid "Content$Performing Arts" -msgstr "" +msgstr "Izvođačka umetnost" msgid "Content$Fine Arts" -msgstr "" +msgstr "Likovna umetnost" msgid "Content$Religion" msgstr "Religija" msgid "Content$Popular Culture/Traditional Arts" -msgstr "Moderna umetnost/Tradicionalna umetnost" +msgstr "Pop kultura/Tradicionalna umetnost" msgid "Content$Literature" -msgstr "Literarni" +msgstr "Književnost" msgid "Content$Film/Cinema" -msgstr "Film/Kino" +msgstr "Film/Bioskop" msgid "Content$Experimental Film/Video" -msgstr "" +msgstr "Eksperimentalni film/video" msgid "Content$Broadcasting/Press" -msgstr "" +msgstr "Radiodifuzija/Štampa" msgid "Content$New Media" -msgstr "" +msgstr "Novi mediji" msgid "Content$Arts/Culture Magazine" -msgstr "" +msgstr "Umetnički/Kulturni magazin" msgid "Content$Fashion" -msgstr "Sadržaj$Moda" +msgstr "Moda" msgid "Content$Social/Political/Economics" -msgstr "Sadržaj$Socijalni/Politički/Ekonomski" +msgstr "Socijalni/Politički/Ekonomski" msgid "Content$Magazine/Report/Documentary" -msgstr "Sadržaj$Magazin/Reportaža/Dokumentarni" +msgstr "Magazin/Reportaža/Dokumentarni" msgid "Content$Economics/Social Advisory" -msgstr "" +msgstr "Ekonomija/Socijalno savetovanje" msgid "Content$Remarkable People" -msgstr "Neverovatni Ljudi" +msgstr "Znamenite ličnosti" msgid "Content$Education/Science/Factual" -msgstr "" +msgstr "Obrazovni/Naučni/Objektivni" msgid "Content$Nature/Animals/Environment" -msgstr "" +msgstr "Priroda/Životinje/Okruženje" msgid "Content$Technology/Natural Sciences" -msgstr "" +msgstr "Tehnologija/Prirodne nauke" msgid "Content$Medicine/Physiology/Psychology" -msgstr "" +msgstr "Medicina/Fiziologija/Psihologija" msgid "Content$Foreign Countries/Expeditions" -msgstr "" +msgstr "Strane zemlje/Ekspedicije" msgid "Content$Social/Spiritual Sciences" -msgstr "" +msgstr "Socijalne/Duhovne nauke" msgid "Content$Further Education" -msgstr "" +msgstr "Dalje obrazovanje" msgid "Content$Languages" -msgstr "" +msgstr "Jezici" msgid "Content$Leisure/Hobbies" -msgstr "" +msgstr "Razonoda/Hobi" msgid "Content$Tourism/Travel" -msgstr "" +msgstr "Turizam/Putovanja" msgid "Content$Handicraft" -msgstr "" +msgstr "Zanatstvo" msgid "Content$Motoring" -msgstr "" +msgstr "Vožnja" msgid "Content$Fitness & Health" -msgstr "" +msgstr "Fitnes i zdravlje" msgid "Content$Cooking" -msgstr "" +msgstr "Kuvanje" msgid "Content$Advertisement/Shopping" -msgstr "" +msgstr "Reklama/Kupovina" msgid "Content$Gardening" -msgstr "" +msgstr "Baštovanstvo" msgid "Content$Original Language" -msgstr "" +msgstr "Originalni jezik" msgid "Content$Black & White" -msgstr "Crno i Belo" +msgstr "Crno-belo" msgid "Content$Unpublished" msgstr "Neobjavljeno" msgid "Content$Live Broadcast" -msgstr "Prenos Uživo" +msgstr "Prenos uživo" #, c-format msgid "ParentalRating$from %d" -msgstr "Roditeljska ocena$od %d" +msgstr "od %d" msgid "No title" -msgstr "Nema naslova" +msgstr "Bez naslova" #. TRANSLATORS: The name of the language, as written natively msgid "LanguageName$English" @@ -332,47 +333,47 @@ msgid "LanguageCode$eng" msgstr "scc" msgid "Phase 1: Detecting RC code type" -msgstr "Faza 1: detekcija koda daljinskog upravljača" +msgstr "Faza 1: detekcija kôda daljinskog upravljača" msgid "Press any key on the RC unit" -msgstr "Pritisnite jedan taster na daljinskom upravljaču" +msgstr "Pritisnite bilo koje dugme na daljinskom upravljaču" msgid "RC code detected!" -msgstr "Kod daljinskog upravljača je prepoznat!" +msgstr "Kôd daljinskog upravljača je prepoznat!" msgid "Do not press any key..." -msgstr "Ne pritiskaj nijedan taster..." +msgstr "Ne pritiskajte dugmad..." msgid "Phase 2: Learning specific key codes" -msgstr "Faza 2: Učenje posebnih kodova" +msgstr "Faza 2: Učenje posebnih kôdova" #, c-format msgid "Press key for '%s'" -msgstr "Pritisnite taster za '%s'" +msgstr "Pritisnite dugme za '%s'" msgid "Press 'Up' to confirm" -msgstr "Pritisni 'Gore' za prihvatanje" +msgstr "Pritisnite 'Gore' da potvrdite" msgid "Press 'Down' to continue" -msgstr "Pritisni 'Dole' za nastavak" +msgstr "Pritisnite 'Dole' da nastavite" msgid "(press 'Up' to go back)" -msgstr "(pritisni 'Gore' za nazad)" +msgstr "(pritisnite 'Gore' za nazad)" msgid "(press 'Down' to end key definition)" -msgstr "(pritisni 'Dole' za kraj)" +msgstr "(pritisnite 'Dole' za kraj)" msgid "(press 'Menu' to skip this key)" -msgstr "pritisni 'Meni' da preskočite ovu tipku" +msgstr "(pritisnite 'Meni' da preskočite ovo dugme)" msgid "Learning Remote Control Keys" -msgstr "Učenje rasporeda tastera daljinskog upravljača" +msgstr "Učenje rasporeda dugmadi daljinskog upravljača" msgid "Phase 3: Saving key codes" -msgstr "Faza 3: Snimanje kodova tastera" +msgstr "Faza 3: Snimanje kôdova dugmadi" msgid "Press 'Up' to save, 'Down' to cancel" -msgstr "'Gore' za snimi, 'Dole' za prekid" +msgstr "Pritisnite 'Gore' da snimite, 'Dole' da odustanete" msgid "Key$Up" msgstr "Gore" @@ -411,7 +412,7 @@ msgid "Key$Info" msgstr "Info" msgid "Key$Play/Pause" -msgstr "" +msgstr "Start/Pauza" msgid "Key$Play" msgstr "Start" @@ -423,7 +424,7 @@ msgid "Key$Stop" msgstr "Stop" msgid "Key$Record" -msgstr "Snimaj" +msgstr "Snimi" msgid "Key$FastFwd" msgstr "Napred" @@ -438,7 +439,7 @@ msgid "Key$Prev" msgstr "Prethodno" msgid "Key$Power" -msgstr "Power" +msgstr "Isključi" msgid "Key$Channel+" msgstr "Kanal+" @@ -474,13 +475,13 @@ msgid "Key$Timers" msgstr "Tajmeri" msgid "Key$Recordings" -msgstr "Snimke" +msgstr "Snimci" msgid "Key$Setup" msgstr "Podešavanje" msgid "Key$Commands" -msgstr "Naredbe" +msgstr "Komande" msgid "Key$User0" msgstr "Korisnik0" @@ -513,13 +514,13 @@ msgid "Key$User9" msgstr "Korisnik9" msgid "Free To Air" -msgstr "Slobodno" +msgstr "FTA (nekodiran)" msgid "encrypted" -msgstr "kriptirano" +msgstr "kodiran" msgid "Edit channel" -msgstr "Ispravke kanala" +msgstr "Izmeni postavke kanala" msgid "Name" msgstr "Naziv" @@ -531,31 +532,31 @@ msgid "Frequency" msgstr "Frekvencija" msgid "Vpid" -msgstr "Vpid" +msgstr "Vpid (video)" msgid "Ppid" -msgstr "Ppid" +msgstr "Ppid (PCR)" msgid "Apid1" -msgstr "Apid1" +msgstr "Apid1 (audio 1)" msgid "Apid2" -msgstr "Apid2" +msgstr "Apid2 (audio 2)" msgid "Dpid1" -msgstr "Dpid1" +msgstr "Dpid1 (AC3 1)" msgid "Dpid2" -msgstr "Dpid2" +msgstr "Dpid2 (AC3 2)" msgid "Spid1" -msgstr "Spid1" +msgstr "Spid1 (titl 1)" msgid "Spid2" -msgstr "Spid2" +msgstr "Spid2 (titl 2)" msgid "Tpid" -msgstr "Tpid" +msgstr "Tpid (teletekst)" msgid "CA" msgstr "Kodiranje (CA)" @@ -564,13 +565,13 @@ msgid "Sid" msgstr "Sid" msgid "Channel settings are not unique!" -msgstr "Postavke programa nisu jedinstvene!" +msgstr "Postavke kanala nisu jedinstvene!" msgid "Channels" msgstr "Kanali" msgid "Button$Edit" -msgstr "Promeni" +msgstr "Izmeni" msgid "Button$New" msgstr "Novi" @@ -582,38 +583,38 @@ msgid "Button$Mark" msgstr "Označi" msgid "Channel is being used by a timer!" -msgstr "Kanal je trenutno zauzet tajmerom!" +msgstr "Kanal je zauzet tajmerom za snimanje!" msgid "Delete channel?" msgstr "Obrisati kanal?" msgid "Edit folder" -msgstr "" +msgstr "Izmeni direktorijum" msgid "New folder" -msgstr "Novi direktorij" +msgstr "Novi direktorijum" msgid "Sub folder" -msgstr "Pod Direktorij" +msgstr "Poddirektorijum" msgid "Folder name already exists!" -msgstr "Ime direktorija već postoji" +msgstr "Naziv direktorijuma već postoji!" #, c-format msgid "Folder name must not contain '%c'!" -msgstr "Naziv direktorija ne smije sadržavati '%c'! " +msgstr "Naziv direktorijuma ne sme da sadrži '%c'!" msgid "Button$Select" -msgstr "" +msgstr "Izaberi" msgid "Delete folder and all sub folders?" -msgstr "Obriši direktorij i sve poddirektorije" +msgstr "Obriši direktorijum i sve poddirektorijume?" msgid "Delete folder?" -msgstr "" +msgstr "Izbriši direktorijum?" msgid "Edit timer" -msgstr "Uređivanje tajmera" +msgstr "Izmeni tajmer" msgid "Active" msgstr "Aktivan" @@ -631,7 +632,7 @@ msgid "Stop" msgstr "Kraj" msgid "VPS" -msgstr "VPS" +msgstr "VPS (PDC)" msgid "Priority" msgstr "Prioritet" @@ -643,34 +644,34 @@ msgid "File" msgstr "Datoteka" msgid "Button$Folder" -msgstr "" +msgstr "Direktorijum" msgid "Button$Single" -msgstr "" +msgstr "Jedinstven" msgid "Button$Repeating" -msgstr "" +msgstr "Ponavljajući" msgid "First day" msgstr "Prvi dan" msgid "Select folder" -msgstr "Odaberi direktorij" +msgstr "Izaberi direktorijum" msgid "Timers" msgstr "Tajmeri" msgid "Button$On/Off" -msgstr "Taster$uključi/isključi" +msgstr "Uključi/Isključi" msgid "Button$Info" -msgstr "Taster$Info" +msgstr "Info" msgid "Delete timer?" -msgstr "Obriši tajmer?" +msgstr "Izbrisati tajmer?" msgid "Timer still recording - really delete?" -msgstr "Tajmer još snima - zaista obriši?" +msgstr "Tajmer još snima - stvarno izbrisati?" msgid "Event" msgstr "Emisija" @@ -685,10 +686,10 @@ msgid "Button$Switch" msgstr "Prebaci" msgid "What's on now?" -msgstr "Trenutno na programu ?" +msgstr "Šta je trenutno na programu?" msgid "What's on next?" -msgstr "Šta je sledeće?" +msgstr "Šta je sledeće na programu?" msgid "Button$Next" msgstr "Sledi" @@ -697,14 +698,14 @@ msgid "Button$Now" msgstr "Trenutno" msgid "Button$Schedule" -msgstr "TV Raspored" +msgstr "Raspored" msgid "Can't switch channel!" msgstr "Nemoguće promeniti kanal!" #, c-format msgid "Schedule - %s" -msgstr "TV Raspored - %s" +msgstr "Raspored - %s" #, c-format msgid "This event - %s" @@ -718,7 +719,7 @@ msgstr "Svi doga #, c-format msgid "Please enter %d digits!" -msgstr "Molim unesi %d brojeve!" +msgstr "Molimo unesite %d brojeve!" msgid "CAM not responding!" msgstr "CAM ne reaguje!" @@ -730,34 +731,34 @@ msgid "Button$Play" msgstr "Start" msgid "Button$Rewind" -msgstr "Početak" +msgstr "Na početak" msgid "Recordings" -msgstr "" +msgstr "Snimci" msgid "Button$Open" -msgstr "" +msgstr "Otvori" msgid "Commands" -msgstr "" +msgstr "Komande" msgid "Delete recording?" -msgstr "Obriši snimku?" +msgstr "Izbriši snimak?" msgid "Recording is being edited - really delete?" -msgstr "" +msgstr "Snimak je izmenjen - stvarno izbrisati?" msgid "Error while deleting recording!" -msgstr "Greška prilikom brisanja snimke!" +msgstr "Greška prilikom brisanja snimka!" msgid "Recording commands" -msgstr "Naredbe snimanja" +msgstr "Komande snimanja" msgid "never" -msgstr "Nikada" +msgstr "nikada" msgid "skin dependent" -msgstr "Zavisi od skin-a" +msgstr "zavisi od stila (skin-a)" msgid "always" msgstr "uvek" @@ -769,52 +770,52 @@ msgid "Setup.OSD$Language" msgstr "Jezik" msgid "Setup.OSD$Skin" -msgstr "Izgled" +msgstr "Stil (skin)" msgid "Setup.OSD$Theme" msgstr "Tema" msgid "Setup.OSD$Left (%)" -msgstr "" +msgstr "Levo (%)" msgid "Setup.OSD$Top (%)" -msgstr "" +msgstr "Gore (%)" msgid "Setup.OSD$Width (%)" -msgstr "" +msgstr "Širina (%)" msgid "Setup.OSD$Height (%)" -msgstr "" +msgstr "Visina (%)" msgid "Setup.OSD$Message time (s)" -msgstr "Dužina prikaza poruka (s)" +msgstr "Trajanje prikaza poruke (s)" msgid "Setup.OSD$Use small font" -msgstr "Koristi mala slova" +msgstr "Upotrebi mala slova" msgid "Setup.OSD$Anti-alias" msgstr "Anti-alias" msgid "Setup.OSD$Default font" -msgstr "Zadani font" +msgstr "Podrazumevani font" msgid "Setup.OSD$Small font" msgstr "Mali font" msgid "Setup.OSD$Fixed font" -msgstr "Nepromenjiv font" +msgstr "Fiksni font" msgid "Setup.OSD$Default font size (%)" -msgstr "" +msgstr "Veličina podrazumevanog fonta (%)" msgid "Setup.OSD$Small font size (%)" -msgstr "" +msgstr "Veličina malog fonta (%)" msgid "Setup.OSD$Fixed font size (%)" -msgstr "" +msgstr "Veličina fiksnog fonta (%)" msgid "Setup.OSD$Channel info position" -msgstr "Pozicija informacija o programu" +msgstr "Pozicija informacija o kanalu" msgid "bottom" msgstr "dno" @@ -823,61 +824,61 @@ msgid "top" msgstr "vrh" msgid "Setup.OSD$Channel info time (s)" -msgstr "Vreme prikaza informacije o kanalu (s)" +msgstr "Trajanje prikaza informacija o kanalu (s)" msgid "Setup.OSD$Info on channel switch" msgstr "Informacije kod promene kanala" msgid "Setup.OSD$Timeout requested channel info" -msgstr "Dužina prikaza informacije o kanalu" +msgstr "Zatvori zatražene informacije o kanalu" msgid "Setup.OSD$Scroll pages" -msgstr "Listaj po stranicama" +msgstr "Skrolovanje stranica (klizač)" msgid "Setup.OSD$Scroll wraps" msgstr "Skoči s kraja na početak" msgid "Setup.OSD$Menu key closes" -msgstr "Taster Meni zatvara" +msgstr "Dugme 'Meni' zatvara" msgid "Setup.OSD$Recording directories" -msgstr "Direktorij za snimke" +msgstr "Direktorijum za snimke" msgid "Setup.OSD$Folders in timer menu" -msgstr "" +msgstr "Direktorijumi u meniju tajmera" msgid "Setup.OSD$Always sort folders first" -msgstr "" +msgstr "Uvek sortiraj direktorijume prve" msgid "Setup.OSD$Number keys for characters" -msgstr "" +msgstr "Pišite pomoću numeričkih dugmića (kao SMS)" msgid "Setup.OSD$Color key 0" -msgstr "" +msgstr "Obojeno dugme 0" msgid "Setup.OSD$Color key 1" -msgstr "" +msgstr "Obojeno dugme 1" msgid "Setup.OSD$Color key 2" -msgstr "" +msgstr "Obojeno dugme 2" msgid "Setup.OSD$Color key 3" -msgstr "" +msgstr "Obojeno dugme 3" msgid "EPG" -msgstr "EPG (TV Raspored¨)" +msgstr "EPG (elektronski programski vodič)" msgid "Button$Scan" msgstr "Pretraži" msgid "Setup.EPG$EPG scan timeout (h)" -msgstr "Vreme do EPG pregleda (h)" +msgstr "Interval do ažuriranja EPG (h)" msgid "Setup.EPG$EPG bugfix level" -msgstr "Nivo ispravaka EPG grešaka" +msgstr "Nivo EPG korekcije grešaka" msgid "Setup.EPG$EPG linger time (min)" -msgstr "Vreme EPG zadržavanja (min)" +msgstr "Vreme zadržavanja starih EPG podataka (min)" msgid "Setup.EPG$Set system time" msgstr "Podesi sistemsko vreme" @@ -887,32 +888,32 @@ msgstr "Koristi vreme sa transpondera" #. TRANSLATORS: note the plural! msgid "Setup.EPG$Preferred languages" -msgstr "Odaberi jezike" +msgstr "Željeni jezici (EPG)" #. TRANSLATORS: note the singular! msgid "Setup.EPG$Preferred language" -msgstr "Odaberi jezik" +msgstr "Željeni jezik (EPG)" msgid "pan&scan" -msgstr "proširi i ispitaj" +msgstr "pan&scan" msgid "letterbox" -msgstr "pravougaonik" +msgstr "letterbox" msgid "center cut out" msgstr "izreži sredinu" msgid "no" -msgstr "" +msgstr "ne" msgid "names only" -msgstr "samo imena" +msgstr "samo nazivi" msgid "PIDs only" -msgstr "Samo PID-ovi" +msgstr "samo PID-ovi" msgid "names and PIDs" -msgstr "imena i (PIDs)" +msgstr "nazivi i PID-ovi" msgid "add new channels" msgstr "dodaj nove kanale" @@ -933,7 +934,7 @@ msgid "Setup.DVB$Primary DVB interface" msgstr "Primarni DVB uređaj" msgid "Setup.DVB$Standard compliance" -msgstr "" +msgstr "Usklađenost sa standardom" msgid "Setup.DVB$Video format" msgstr "Video format" @@ -954,7 +955,7 @@ msgid "Setup.DVB$Audio language" msgstr "Audio jezik" msgid "Setup.DVB$Display subtitles" -msgstr "Pokaži titlove" +msgstr "Prikaži titlove" msgid "Setup.DVB$Subtitle languages" msgstr "Jezici titla" @@ -963,7 +964,7 @@ msgid "Setup.DVB$Subtitle language" msgstr "Jezik titla" msgid "Setup.DVB$Subtitle offset" -msgstr "Pomak titla" +msgstr "Pomeranje titla" msgid "Setup.DVB$Subtitle foreground transparency" msgstr "Providnost titla" @@ -978,20 +979,20 @@ msgid "Setup.LNB$Use DiSEqC" msgstr "Koristi DiSEqC" msgid "Setup.LNB$SLOF (MHz)" -msgstr "SLOF (MHz)" +msgstr "Frekvencija prebacivanja (SLOF) (MHz)" msgid "Setup.LNB$Low LNB frequency (MHz)" -msgstr "Donja LNB frekv. (MHz)" +msgstr "Donja LNB frekvencija (MHz)" msgid "Setup.LNB$High LNB frequency (MHz)" -msgstr "Gornja LNB frekv. (MHz)" +msgstr "Gornja LNB frekvencija (MHz)" #, c-format msgid "Setup.LNB$Device %d connected to sat cable" -msgstr "" +msgstr "Uređaj %d je priključen na satelitski kabl" msgid "Setup.LNB$own" -msgstr "" +msgstr "sopstven" msgid "CAM reset" msgstr "Ponovno pokreni CAM" @@ -1018,25 +1019,25 @@ msgid "Can't open CAM menu!" msgstr "Otvaranje CAM menija neuspešno!" msgid "CAM is in use - really reset?" -msgstr "CAM u upotrebi - ponovno pokrenuti?" +msgstr "CAM u upotrebi - stvarno ponovno pokrenuti?" msgid "Can't reset CAM!" msgstr "Ponovno pokretanje CAM-a neuspešno!" msgid "do not pause live video" -msgstr "" +msgstr "ne zaustavljaj signal uživo" msgid "confirm pause live video" -msgstr "" +msgstr "potvrdi zaustavljanje signala uživo" msgid "pause live video" -msgstr "" +msgstr "zaustavi signal uživo" msgid "confirm" msgstr "potvrdi" msgid "yes" -msgstr "" +msgstr "da" msgid "Recording" msgstr "Snimanje" @@ -1045,16 +1046,16 @@ msgid "Setup.Recording$Margin at start (min)" msgstr "Rezerva na početku snimanja (min)" msgid "Setup.Recording$Margin at stop (min)" -msgstr "Rezerva na kraju (min)" +msgstr "Rezerva na kraju snimanja (min)" msgid "Setup.Recording$Default priority" -msgstr "Zadani prioritet" +msgstr "Podrazumevani prioritet" msgid "Setup.Recording$Default lifetime (d)" -msgstr "Zadano trajanje (d)" +msgstr "Podrazumevano trajanje (d)" msgid "Setup.Recording$Pause key handling" -msgstr "" +msgstr "Funkcija dugme za pauzu" msgid "Setup.Recording$Pause priority" msgstr "Prioritet pauze" @@ -1081,49 +1082,49 @@ msgid "Setup.Recording$Instant rec. time (min)" msgstr "Trajanje trenutnog snimanja (min)" msgid "Setup.Recording$present event" -msgstr "" +msgstr "aktuelni događaj" msgid "Setup.Recording$Max. video file size (MB)" -msgstr "Maks. veličina datoteke (MB)" +msgstr "Maksimalna veličina datoteke (MB)" msgid "Setup.Recording$Split edited files" -msgstr "Podeli uređene datoteke" +msgstr "Podeli izmenjene datoteke" msgid "Setup.Recording$Delete timeshift recording" -msgstr "Briši vremenski pomak snimke" +msgstr "Izbriši odloženi (timeshift) snimak" msgid "Replay" msgstr "Reprodukcija" msgid "Setup.Replay$Multi speed mode" -msgstr "Višestruke brzine reprodukcije" +msgstr "Višestruka brzina reprodukcije" msgid "Setup.Replay$Show replay mode" msgstr "Prikaži režim reprodukcije" msgid "Setup.Replay$Show remaining time" -msgstr "" +msgstr "Prikaži preostalo vreme" msgid "Setup.Replay$Progress display time (s)" -msgstr "" +msgstr "Trajanje prikazivanja progresa (s)" msgid "Setup.Replay$Pause replay when setting mark" -msgstr "" +msgstr "Pauziraj reprodukciju prilikom obeležavanja" msgid "Setup.Replay$Resume ID" -msgstr "ID nastavka" +msgstr "ID reprodukcije" msgid "Miscellaneous" msgstr "Razno" msgid "Setup.Miscellaneous$Min. event timeout (min)" -msgstr "Min. vreme pauze (min)" +msgstr "Min. vreme između tajmera (min)" msgid "Setup.Miscellaneous$Min. user inactivity (min)" -msgstr "Min. vreme neaktivnosti (min)" +msgstr "Min. vreme neaktivnosti pre gašenja VDR-a (min)" msgid "Setup.Miscellaneous$SVDRP timeout (s)" -msgstr "SVDRP vreme (s)" +msgstr "Gašenje SVDRP-a usled neaktivnosti (s)" msgid "Setup.Miscellaneous$Zap timeout (s)" msgstr "Zap ističe (s)" @@ -1132,10 +1133,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Upis kanala ističe (ms)" msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" -msgstr "" +msgstr "Pauza ponavljanja komande daljinskog (ms)" msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" -msgstr "" +msgstr "Kašnjenje ponavljanja komande daljinskog (ms)" msgid "Setup.Miscellaneous$Initial channel" msgstr "Početni kanal" @@ -1147,10 +1148,10 @@ msgid "Setup.Miscellaneous$Initial volume" msgstr "Početna jačina tona" msgid "Setup.Miscellaneous$Channels wrap" -msgstr "" +msgstr "Prelazak sa kraja na početak liste kanala" msgid "Setup.Miscellaneous$Show channel names with source" -msgstr "" +msgstr "Prikaži nazive kanala sa izvorom" msgid "Setup.Miscellaneous$Emergency exit" msgstr "Izlaz u slučaju nužde" @@ -1159,7 +1160,7 @@ msgid "Plugins" msgstr "Dodaci" msgid "This plugin has no setup parameters!" -msgstr "Ovaj dodatak nema parametara!" +msgstr "Ovaj dodatak nema parametare za podešavanje!" msgid "Setup" msgstr "Podesi" @@ -1168,14 +1169,14 @@ msgid "Restart" msgstr "Restart sistema" msgid "Really restart?" -msgstr "Ponovo pokretanje ???" +msgstr "Stvarno restartovati sistem?" #. TRANSLATORS: note the leading and trailing blanks! msgid " Stop recording " msgstr " Zaustavi snimanje " msgid "Schedule" -msgstr "Raspored Programa" +msgstr "Raspored" #. TRANSLATORS: note the leading blank! msgid " Stop replaying" @@ -1192,65 +1193,65 @@ msgstr "Nastavi" #. TRANSLATORS: note the leading blank! msgid " Cancel editing" -msgstr "Zaustavi ispravke" +msgstr "Odustani od izmena" msgid "Stop recording?" msgstr "Zaustavi snimanje?" msgid "Cancel editing?" -msgstr "Otkaži ispravke?" +msgstr "Odustani od izmena?" msgid "No audio available!" -msgstr "Ton nedostupan" +msgstr "Ton nedostupan!" msgid "No subtitles" msgstr "Bez titlova" msgid "No subtitles available!" -msgstr "Titlovi nisu dostupni!" +msgstr "Nema titlova!" msgid "Not enough disk space to start recording!" msgstr "Nedovoljno prostora na disku za snimanje!" msgid "No free DVB device to record!" -msgstr "" +msgstr "Nema slobodnog DVB uređaja za snimanje!" msgid "Pausing live video..." -msgstr "Zaustavljanje izravnog prenosa..." +msgstr "Zaustavljanje signala uživo..." msgid "Delete timeshift recording?" -msgstr "" +msgstr "Izbriši odloženi (timeshift) snimak?" #. TRANSLATORS: note the trailing blank! msgid "Jump: " msgstr "Skoči: " msgid "No editing marks defined!" -msgstr "Nijedna tačka rezanja nije određena!" +msgstr "Nijedna tačka označavanja nije određena!" msgid "No editing sequences defined!" -msgstr "" +msgstr "Nijedan označeni deo nije određen!" msgid "Can't start editing process!" -msgstr "Ne mogu započeti uređivanje!" +msgstr "Nije moguće započeti uređivanje!" msgid "Editing process started" msgstr "Uređivanje započelo" msgid "Editing process already active!" -msgstr "Uređivanje je već u toku!!" +msgstr "Uređivanje je već u toku!" msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&" -msgstr "abcćdđefghijklmnopqrstuvwxyzŞŸ0123456789-.,#~\\^$[]|()*+?{}/:%@&" +msgstr " abcčćdđefghijklmnopqrsštuvwxyzž0123456789-.,#~\\^$[]|()*+?{}/:%@&" msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9" -msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9" +msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcčć2\tdefđ3\tghi4\tjkl5\tmno6\tpqrsš7\ttuv8\twxyzž9" msgid "Button$ABC/abc" msgstr "ABC/abc" msgid "Button$Overwrite" -msgstr "Prepiši" +msgstr "Zameni" msgid "Button$Insert" msgstr "Ubaci" @@ -1259,7 +1260,7 @@ msgid "Plugin" msgstr "Dodatak" msgid "Up/Dn for new location - OK to move" -msgstr "Gore/Dole na novu poziciju - OK za prihvati" +msgstr "Gore/Dole za novu poziciju - OK za potvrdu" msgid "Channel locked (recording)!" msgstr "Kanal zaključan (snimanje)!" @@ -1274,36 +1275,36 @@ msgid "Index file regeneration complete" msgstr "Obnavljanje index datoteke završeno" msgid "Index file regeneration failed!" -msgstr "" +msgstr "Obnavljanje index datoteke neuspešno!" msgid "Can't shutdown - option '-s' not given!" msgstr "Gašenje nemoguće - nedostaje opcija '-s'!" msgid "Editing - shut down anyway?" -msgstr "Ispravke u toku - u svakom slučaju isključi ?" +msgstr "Uređivanje u toku - svejedno isključi?" msgid "Recording - shut down anyway?" -msgstr "Snimanje u toku - u svakom slučaju isključi ?" +msgstr "Snimanje u toku - svejedno isključi?" #, c-format msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Snimanje za %ld minuta - u svakom slučaju isključi?" +msgstr "Snimanje za %ld minuta - svejedno isključi?" msgid "shut down anyway?" -msgstr "u svakom slučaju isključi?" +msgstr "svejedno isključi?" #, c-format msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Dodatak %s budi se u %ld min, nastavi?" +msgstr "Dodatak %s se budi za %ld min, nastavi?" msgid "Editing - restart anyway?" -msgstr "Uređivanje u toku - ponovno pokreni!!!?" +msgstr "Uređivanje u toku - svejedno ponovno pokreni?" msgid "Recording - restart anyway?" -msgstr "Snimanje je u toku - ponovno pokreni!!!?" +msgstr "Snimanje u toku - svejedno ponovno pokreni!!!?" msgid "restart anyway?" -msgstr "ponovo pokreni?" +msgstr "svejedno ponovo pokreni?" #. TRANSLATORS: note the trailing blank! msgid "Volume " @@ -1313,25 +1314,25 @@ msgid "Classic VDR" msgstr "Klasični VDR" msgid "DISK" -msgstr "" +msgstr "DISK" msgid "LOAD" -msgstr "" +msgstr "OPTEREĆENJE" msgid "TIMERS" -msgstr "" +msgstr "TAJMERI" msgid "DEVICES" -msgstr "" +msgstr "UREĐAJI" msgid "LIVE" -msgstr "" +msgstr "UŽIVO" msgid "PLAY" -msgstr "" +msgstr "REPRODUKCIJA" msgid "ST:TNG Panels" -msgstr "ST:TNG Panele" +msgstr "ST:TNG paneli" #. TRANSLATORS: the first character of each weekday, beginning with monday msgid "MTWTFSS" @@ -1363,35 +1364,35 @@ msgid "Sunday" msgstr "Nedelja" msgid "Upcoming recording!" -msgstr "Predstojeće snimanje!" +msgstr "Uskoro počinje snimanje!" msgid "Pause live video?" -msgstr "" +msgstr "Zaustavi signal uživo?" msgid "Recording started" msgstr "Snimanje započelo" msgid "VDR will shut down later - press Power to force" -msgstr "VDR će se isključiti kasnije - pritisni Power-taster za prisilno isključenje" +msgstr "VDR će se isključiti kasnije - pritisnite dugme 'Power' za prisilno isključenje" msgid "Press any key to cancel shutdown" -msgstr "Pritisni taster za prekid isključenja" +msgstr "Pritisnite bilo koje dugme da otkažete isključenje" msgid "Switching primary DVB..." -msgstr "Prebacivanje primarnog DVB uređaja..." +msgstr "Promena primarnog DVB uređaja..." msgid "Editing process failed!" -msgstr "Uređivanje neuspšjeno!" +msgstr "Uređivanje neuspešeno!" msgid "Editing process finished" msgstr "Uređivanje završeno" msgid "Press any key to cancel restart" -msgstr "Pritisni jedan taster za poništenje restart-a" +msgstr "Pritisnite bilo koje dugme da otkažete ponovno pokretanje" #, c-format msgid "VDR will shut down in %s minutes" -msgstr "VDR se isključuje za %s minuta" +msgstr "VDR će se isključiti za %s minuta" msgid "Disk" msgstr "Disk" diff --git a/vdr.5 b/vdr.5 index 86b798c3..c6ee6b42 100644 --- a/vdr.5 +++ b/vdr.5 @@ -8,7 +8,7 @@ .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.5 2.33 2013/03/11 13:17:12 kls Exp $ +.\" $Id: vdr.5 2.34 2013/03/18 12:37:17 kls Exp $ .\" .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files" .SH NAME @@ -45,7 +45,11 @@ Such a delimiter will not appear in the Channels menu. A \fBchannel definition\fR is a line with channel data, where the fields are separated by ':' characters. Example: +.TS +tab (@); +l. \fBRTL Television,RTL;RTL World:12187:hC34M2O0S0:S19.2E:27500:163=2:104=deu;106=deu:105:0:12003:1:1089:0\fR +.TE The line number of a channel definition (not counting group separators, and based on a possible previous '@...' parameter)