From b69b71f242e24cf4e9355d361b09d2ed5cc324bc Mon Sep 17 00:00:00 2001 From: leslie Date: Thu, 27 Dec 2007 22:01:33 +0100 Subject: [PATCH] release 0.8.5 --- HISTORY | 17 +++ Makefile | 6 +- cam.c | 53 ++++++- cam.h | 2 + common.h | 40 ----- data.c | 4 +- data.h | 2 +- po/de_DE.po | 61 +------- po/fi_FI.po | 61 +------- po/fr_FR.po | 61 +------- po/hu_HU.po | 188 ++++++++++++++++++++++++ po/it_IT.po | 61 +------- po/nl_NL.po | 61 +------- po/pl_PL.po | 61 +------- po/ru_RU.po | 62 +------- po/sc.pot | 61 +------- po/sv_SE.po | 61 +------- sc.c | 10 +- scsetup.h | 1 + smartcard.c | 6 +- system.h | 2 +- systems/cardclient/camd.c | 3 +- systems/nagra/nagra2-0101.c | 18 +-- systems/nagra/nagra2-0501.c | 49 ++++-- systems/nagra/nagra2-4101.c | 4 +- systems/nagra/nagra2.c | 21 +-- systems/sc-conax/sc-conax.c | 2 +- systems/sc-viaccess/sc-viaccess.c | 10 +- systems/sc-videoguard2/sc-videoguard2.c | 9 +- testing/compat.c | 11 +- testing/testECM.c | 1 + testing/testEMM.c | 1 - testing/testN2Emu.c | 3 + version.h | 4 +- 34 files changed, 393 insertions(+), 624 deletions(-) delete mode 100644 common.h create mode 100644 po/hu_HU.po diff --git a/HISTORY b/HISTORY index f503e82..126ee56 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,23 @@ VDR Plugin 'sc' Revision History -------------------------------- +10.11.2007: Version 0.8.5 +- Added new Nagra2 0501 AU sheme. +- Added Nagra2 NA 'temporarily' fixes. +- For simplicity the high provider id is used always now, when loading an EEP + file in Nagra2 emu. e.g. for provider 0901 you have to rename the file to + EEP09_102.bin. +- Added an option to start AutoUpdate even if no audio/video pids are set (e.g. + EPG scan). Has to be enabled from the plugin setup menu. +- Fixed cardclient camd35 EMM request length check. +- Fixed smartcard Viaccess ATR check and transcription errors in smartcard NDS + camcrypt. Thanks to dr.aus. +- Fixed saving ScCaps to config if all cards are disabled. +- Fixed sasc-ng compile (FFdecsa dir). +- Obmit error messages about (optional) config files (e.g. *.KID). +- Added some glue for gcc 2.95 compile. +- Added Hungarian translations. + 30.09.2007: Version 0.8.4 - Added Nagra2 4101 Bx support. - Added smartcard NDS Videoguard2 code (untested). Needs NDS seed and boxid in diff --git a/Makefile b/Makefile index 96bd6a1..d0552cc 100644 --- a/Makefile +++ b/Makefile @@ -177,10 +177,10 @@ $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS) -march=$(CPUOPT) -DPARALLEL_MODE=$(PARALLEL)" -C $(FFDECSADIR) all $(I18Npot): $(shell grep -rl '\(tr\|trNOOP\)(\".*\")' *.c $(SYSDIR)) - xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='' -o $@ $^ + xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='' -o $@ $^ %.po: $(I18Npot) - msgmerge -U --no-wrap -F --backup=none -q $@ $< + msgmerge -U --no-wrap --no-location --backup=none -q $@ $< @touch $@ %.mo: %.po @@ -206,7 +206,7 @@ clean-systems: clean-core: @$(MAKE) -C testing clean - @test -d $(FFDECSADIR) && $(MAKE) -C $(FFDECSADIR) clean + @if test -d $(FFDECSADIR); then $(MAKE) -C $(FFDECSADIR) clean; fi @-rm -f $(LIBDIR)/libsc-*-$(SCAPIVERS).so.$(APIVERSION) @-rm -f $(LIBDIR)/libvdr-$(PLUGIN).a $(LIBDIR)/libsc-*.a @-rm -f $(OBJS) $(DEPFILE) i18n.c *.so *.tar.gz core* *~ diff --git a/cam.c b/cam.c index a4b35b3..63195be 100644 --- a/cam.c +++ b/cam.c @@ -354,6 +354,10 @@ private: cPidFilter *catfilt; int catVers; // + enum ePreMode { pmNone, pmStart, pmWait, pmActive, pmStop }; + ePreMode prescan; + cTimeMs pretime; + // cPidFilter *AddFilter(int Pid, int Section, int Mask, int Mode, int IdleTime, bool Crc); void SetChains(void); void ClearChains(void); @@ -367,13 +371,14 @@ public: void EcmStatus(const cEcmInfo *ecm, bool on); void Up(void); void Down(void); + void PreScan(void); }; cLogger::cLogger(int CardNum, bool soft) :cAction("logger",CardNum) { cardNum=CardNum; softCSA=soft; - catfilt=0; up=false; + catfilt=0; up=false; prescan=pmNone; Priority(10); } @@ -401,11 +406,18 @@ void cLogger::Down(void) PRINTF(L_CORE_AUEXTRA,"%d: DOWN",cardNum); ClearChains(); DelAllFilter(); - catfilt=0; up=false; + catfilt=0; up=false; prescan=pmNone; } Unlock(); } +void cLogger::PreScan(void) +{ + Lock(); + prescan=pmStart; Up(); + Unlock(); +} + void cLogger::EcmStatus(const cEcmInfo *ecm, bool on) { Lock(); @@ -423,7 +435,9 @@ void cLogger::EcmStatus(const cEcmInfo *ecm, bool on) break; } } + if(prescan>=pmWait) prescan=pmStop; SetChains(); + prescan=pmNone; Unlock(); } @@ -431,7 +445,7 @@ void cLogger::SetChains(void) { for(cLogChain *chain=chains.First(); chain; chain=chains.Next(chain)) { bool act=false; - if(ScSetup.AutoUpdate>1) act=true; + if(ScSetup.AutoUpdate>1 || prescan==pmActive) act=true; else if(ScSetup.AutoUpdate==1) { for(cEcmInfo *e=active.First(); e; e=active.Next(e)) if((e->emmCaId && chain->caid==e->emmCaId) || chain->caid==e->caId) { @@ -439,7 +453,7 @@ void cLogger::SetChains(void) } } if(act) StartChain(chain); - else StopChain(chain,false); + else StopChain(chain,prescan==pmStop); } } @@ -530,7 +544,9 @@ void cLogger::Process(cPidFilter *filter, unsigned char *data, int len) } } SetChains(); + if(prescan==pmStart) { prescan=pmWait; pretime.Set(2000); } } + if(prescan==pmWait && pretime.TimedOut()) { prescan=pmActive; SetChains(); } } else { HEXDUMP(L_HEX_EMM,data,len,"EMM pid 0x%04x",filter->Pid()); @@ -1355,6 +1371,14 @@ void cCam::Tune(const cChannel *channel) else PRINTF(L_CORE_PIDS,"%d: tune to same source/transponder",cardNum); } +void cCam::PostTune(void) +{ + if(ScSetup.PrestartAU) { + LogStartup(); + if(logger) logger->PreScan(); + } +} + void cCam::SetPid(int type, int pid, bool on) { cMutexLock lock(this); @@ -1439,7 +1463,7 @@ void cCam::HouseKeeping(void) if(handler->IsRemoveable()) RemHandler(handler); handler=next; } - if(handlerList.Count()<1) { + if(handlerList.Count()<1 && !ScSetup.PrestartAU) { delete hookman; hookman=0; delete logger; logger=0; } @@ -1450,13 +1474,19 @@ bool cCam::GetPrgCaids(int source, int transponder, int prg, caid_t *c) return device->GetPrgCaids(source,transponder,prg,c); } -void cCam::LogEcmStatus(const cEcmInfo *ecm, bool on) +void cCam::LogStartup(void) { cMutexLock lock(this); - if(!logger && on && ScSetup.AutoUpdate) { + if(!logger && ScSetup.AutoUpdate) { logger=new cLogger(cardNum,IsSoftCSA()); LogStatsUp(); } +} + +void cCam::LogEcmStatus(const cEcmInfo *ecm, bool on) +{ + cMutexLock lock(this); + if(on) LogStartup(); if(logger) logger->EcmStatus(ecm,on); } @@ -2617,8 +2647,13 @@ void cScDvbDevice::Capture(void) objdump -T /vdr | grep -E "(useDevice|nextCardIndex)" Insert the symbol names below. */ +#if __GNUC__ >= 3 vdr_nci=(int *)dlsym(RTLD_DEFAULT,"_ZN7cDevice13nextCardIndexE"); vdr_ud =(int *)dlsym(RTLD_DEFAULT,"_ZN7cDevice9useDeviceE"); +#else + vdr_nci=(int *)dlsym(RTLD_DEFAULT,"_7cDevice.nextCardIndex"); + vdr_ud =(int *)dlsym(RTLD_DEFAULT,"_7cDevice.useDevice"); +#endif if(vdr_nci && vdr_ud) { vdr_save_ud=*vdr_ud; *vdr_ud=1<<30; } } @@ -2705,7 +2740,9 @@ bool cScDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) lrucaid[0].prg=Channel->Sid(); lruMutex.Unlock(); if(cam) cam->Tune(Channel); - return cDvbDevice::SetChannelDevice(Channel,LiveView); + bool ret=cDvbDevice::SetChannelDevice(Channel,LiveView); + if(ret && cam) cam->PostTune(); + return ret; } bool cScDvbDevice::GetPrgCaids(int source, int transponder, int prg, caid_t *c) diff --git a/cam.h b/cam.h index 50121f3..3471872 100644 --- a/cam.h +++ b/cam.h @@ -114,6 +114,7 @@ private: cEcmHandler *GetHandler(int sid, bool needZero, bool noshift); void RemHandler(cEcmHandler *handler); int GetFreeIndex(void); + void LogStartup(void); public: cCam(cScDvbDevice *dev, int CardNum); virtual ~cCam(); @@ -129,6 +130,7 @@ public: bool Active(void); void HouseKeeping(void); void Tune(const cChannel *channel); + void PostTune(void); void SetPid(int type, int pid, bool on); void Stop(void); void AddPrg(cPrg *prg); diff --git a/common.h b/common.h deleted file mode 100644 index 5396444..0000000 --- a/common.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Softcam plugin to VDR (C++) - * - * This code is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This code is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - */ - -#ifndef ___COMMON_H -#define ___COMMON_H - -// Debugging -#define DEBUG -//#define DEBUG_DYN -#define DEBUG_LOG_FILE "/var/tmp/logger.log" - -#ifdef DEBUG -#define d(x) { (x); } -#else -#define d(x) ; -#endif - -#ifdef DEBUG_DYN -#define dyn(x) { (x); } -#else -#define dyn(x) ; -#endif - -#endif //___COMMON_H diff --git a/data.c b/data.c index b05204e..8973686 100644 --- a/data.c +++ b/data.c @@ -144,7 +144,7 @@ cFileMap *cFileMaps::GetFileMap(const char *name, const char *domain, bool rw) // -- cConfRead ---------------------------------------------------------------- -bool cConfRead::ConfRead(const char *type, const char *filename) +bool cConfRead::ConfRead(const char *type, const char *filename, bool missingok) { bool res=false; FILE *f=fopen(filename,"r"); @@ -164,7 +164,7 @@ bool cConfRead::ConfRead(const char *type, const char *filename) } fclose(f); } - else PRINTF(L_GEN_ERROR,"Failed to open file '%s': %s",filename,strerror(errno)); + else if(!missingok) PRINTF(L_GEN_ERROR,"Failed to open file '%s': %s",filename,strerror(errno)); return res; } diff --git a/data.h b/data.h index 2d0e727..02ca51d 100644 --- a/data.h +++ b/data.h @@ -70,7 +70,7 @@ extern cFileMaps filemaps; class cConfRead { public: virtual ~cConfRead() {} - bool ConfRead(const char *type, const char *filename); + bool ConfRead(const char *type, const char *filename, bool missingok=false); virtual bool ParseLine(const char *line, bool fromCache)=0; }; diff --git a/po/de_DE.po b/po/de_DE.po index e06fa00..cb87c27 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "aus" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Aktuelle Keys:" -#: sc.c:563 msgid "Key update status:" msgstr "Key update Status:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [Gefundene Keys]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [Neue Keys]" -#: sc.c:593 msgid "Smartcard" msgstr "Smartcard" -#: sc.c:598 msgid "Reset card" msgstr "Karte reseten" -#: sc.c:604 msgid "Really reset card?" msgstr "Karte wirklich reseten?" -#: sc.c:643 msgid "Module config" msgstr "Modul Einstellungen" -#: sc.c:646 msgid "Reset module to default" msgstr "Modul auf Standard zurücksetzen" -#: sc.c:680 msgid "Really reset module to default?" msgstr "Wirklich Modul auf Standard zurücksetzen?" -#: sc.c:721 msgid "Module" msgstr "Modul" -#: sc.c:736 msgid "Message logging" msgstr "Meldungsprotokolierung" -#: sc.c:739 msgid "Disable ALL modules" msgstr "ALLE Module ausschalten" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "ALLE Module auf Standard zurücksetzen" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "Wirklich ALLE Module ausschalten?" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "Wirklich ALLE Module auf Standard zurücksetzen?" -#: sc.c:801 msgid "Cryptsystem options" msgstr "Cryptsystem Optionen" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "Cryptsystem Optionen..." -#: sc.c:859 msgid "Message logging..." msgstr "Meldungsprotokolierung..." -#: sc.c:864 msgid "Smartcard interface" msgstr "Smartcard Interface" -#: sc.c:866 msgid "(empty)" msgstr "(leer)" -#: sc.c:869 msgid "Status information..." msgstr "Status Informationen..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "ECM Zwischenspeicher leeren" -#: sc.c:871 msgid "Reload files" msgstr "Dateien neu laden" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "ECM Zwischenspeicher wirklich leeren?" -#: sc.c:917 msgid "Really reload files?" msgstr "Dateien wirklich neu laden?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Aktiv! Kann Dateien jetzt nicht neu laden" -#: sc.c:1033 msgid "(none)" msgstr "(keiner)" -#: sc.c:1198 msgid "active CAIDs" msgstr "aktive CAIDs" -#: sc.c:1198 msgid "all CAIDs" msgstr "alle CAIDs" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "Keys updaten (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "AU starten bei EPG-Scan" + msgid "Concurrent FF streams" msgstr "Gleichzeitige FF Streams" -#: sc.c:1202 msgid "Force TransferMode" msgstr "Transfermodus erzwingen" -#: sc.c:1203 msgid "Prefer local systems" msgstr "Lokale Systeme bevorzugen" -#: sc.c:1204 msgid "Active on DVB card" msgstr "Aktiv auf DVB Karte" -#: sc.c:1205 msgid "Ignore CAID" msgstr "Ignoriere CAID" -#: sc.c:1207 msgid "Log to console" msgstr "Meldungen auf Konsole" -#: sc.c:1208 msgid "Log to file" msgstr "Meldungen in Datei" -#: sc.c:1209 msgid "Filename" msgstr "Dateiname" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "Dateigrößenlimit (KB)" -#: sc.c:1211 msgid "Log to syslog" msgstr "Meldungen in Syslog" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "Ein Software emuliertes CAM" -#: system.c:250 msgid "undisclosed key" msgstr "unbekannter Key" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "Cardclient: sofort verbinden" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "Nagra: min. ECM Bearbeitungszeit" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "nicht ändern" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "ausschalten" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "SC-Cryptoworks: Altersbeschränkung" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "alle erlauben" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "UNIQUE blocken" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "SHARED blocken" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "alle blocken" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "SC-Seca: EMM updates" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "SC-Seca: PPV aktivieren" diff --git a/po/fi_FI.po b/po/fi_FI.po index 0176172..cfbfad2 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "pois" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Nykyiset avaimet:" -#: sc.c:563 msgid "Key update status:" msgstr "Tilausten päivitys:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [Löydetyt päivitykset]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [Uudet päivitykset]" -#: sc.c:593 msgid "Smartcard" msgstr "Älykortti" -#: sc.c:598 msgid "Reset card" msgstr "Nollaa kortti" -#: sc.c:604 msgid "Really reset card?" msgstr "Nollataanko kortti?" -#: sc.c:643 msgid "Module config" msgstr "Moduulin asetukset" -#: sc.c:646 msgid "Reset module to default" msgstr "Nollaa moduuli oletusarvoihin" -#: sc.c:680 msgid "Really reset module to default?" msgstr "Nollataanko moduuli oletusarvoihin?" -#: sc.c:721 msgid "Module" msgstr "Moduuli" -#: sc.c:736 msgid "Message logging" msgstr "Viestien tulostus" -#: sc.c:739 msgid "Disable ALL modules" msgstr "Poista kaikki moduulit käytöstä" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "Nollaa kaikki moduulit oletusarvoihin" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "Poistetaanko kaikki moduulit käytöstä?" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "Nollataanko kaikki moduulit oletusarvoihin?" -#: sc.c:801 msgid "Cryptsystem options" msgstr "Salausjärjestelmien asetukset" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "Salausjärjestelmien asetukset..." -#: sc.c:859 msgid "Message logging..." msgstr "Viestien tulostus..." -#: sc.c:864 msgid "Smartcard interface" msgstr "Älykorttiliitäntä" -#: sc.c:866 msgid "(empty)" msgstr "(tyhjä)" -#: sc.c:869 msgid "Status information..." msgstr "Tilannetiedot..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "Tyhjennä ECM-välimuisti" -#: sc.c:871 msgid "Reload files" msgstr "Lataa avaintiedostot uudelleen" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "Tyhjennetäänkö ECM-välimuisti?" -#: sc.c:917 msgid "Really reload files?" msgstr "Ladataanko avaintiedostot uudelleen?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Aktiivinen! Uudelleen lataus ei onnistu" -#: sc.c:1033 msgid "(none)" msgstr "(ei)" -#: sc.c:1198 msgid "active CAIDs" msgstr "aktiiviset CAID:t" -#: sc.c:1198 msgid "all CAIDs" msgstr "kaikki CAID:t" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "Tilausten päivitys (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "Yhtäaikainen salauksenpurku (FF)" -#: sc.c:1202 msgid "Force TransferMode" msgstr "Pakota siirtotila" -#: sc.c:1203 msgid "Prefer local systems" msgstr "Suosi paikallista salauksenpurkua" -#: sc.c:1204 msgid "Active on DVB card" msgstr "Aktiivinen DVB-kortilla" -#: sc.c:1205 msgid "Ignore CAID" msgstr "Jätä huomioimatta CAID" -#: sc.c:1207 msgid "Log to console" msgstr "Tulosta konsoliin" -#: sc.c:1208 msgid "Log to file" msgstr "Tulosta tiedostoon" -#: sc.c:1209 msgid "Filename" msgstr "Tiedoston nimi" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "Tiedoston maksimikoko (KB)" -#: sc.c:1211 msgid "Log to syslog" msgstr "Tulosta systeemilokiin" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "Ohjelmistopohjainen salauksenpurku" -#: system.c:250 msgid "undisclosed key" msgstr "tuntematon avain" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "Korttiasiakas: yhdistä välittömästi" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "Nagra: Min. ECM-prosessointiaika" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "älä koske" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "poista" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "SC-Cryptoworks: Ikäraja" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "salli kaikki" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "estä uniikit" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "estä jaetut" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "estä kaikki" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "SC-Seca: EMM-päivitykset" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "SC-Seca: Aktivoi PPV" diff --git a/po/fr_FR.po b/po/fr_FR.po index 2ae8a28..fb682c6 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "off" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Clé courante:" -#: sc.c:563 msgid "Key update status:" msgstr "Mise à jour des clés Statut:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [Clés trouvées]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [Nouvelles clés]" -#: sc.c:593 msgid "Smartcard" msgstr "Smartcard" -#: sc.c:598 msgid "Reset card" msgstr "Réinitialiser la carte" -#: sc.c:604 msgid "Really reset card?" msgstr "Réinitialiser vraiment la carte?" -#: sc.c:643 msgid "Module config" msgstr "" -#: sc.c:646 msgid "Reset module to default" msgstr "" -#: sc.c:680 msgid "Really reset module to default?" msgstr "" -#: sc.c:721 msgid "Module" msgstr "" -#: sc.c:736 msgid "Message logging" msgstr "" -#: sc.c:739 msgid "Disable ALL modules" msgstr "" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "" -#: sc.c:801 msgid "Cryptsystem options" msgstr "" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "" -#: sc.c:859 msgid "Message logging..." msgstr "" -#: sc.c:864 msgid "Smartcard interface" msgstr "Interface Smartcard" -#: sc.c:866 msgid "(empty)" msgstr "(vide)" -#: sc.c:869 msgid "Status information..." msgstr "Statut information..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "" -#: sc.c:871 msgid "Reload files" msgstr "Recharger les fichiers" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "" -#: sc.c:917 msgid "Really reload files?" msgstr "Vraiment recharger les fichiers?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Actif ! Je ne peux pas recharger maintenant" -#: sc.c:1033 msgid "(none)" msgstr "(aucune)" -#: sc.c:1198 msgid "active CAIDs" msgstr "CAIDs actifs" -#: sc.c:1198 msgid "all CAIDs" msgstr "tous les CAIDs" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "Mise à jour des Clés (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "" -#: sc.c:1204 msgid "Active on DVB card" msgstr "Actif sur la carte DVB" -#: sc.c:1205 msgid "Ignore CAID" msgstr "" -#: sc.c:1207 msgid "Log to console" msgstr "" -#: sc.c:1208 msgid "Log to file" msgstr "" -#: sc.c:1209 msgid "Filename" msgstr "" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "" -#: sc.c:1211 msgid "Log to syslog" msgstr "" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "Un logiciel emulateur de CAM" -#: system.c:250 msgid "undisclosed key" msgstr "Clé non-révélée" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "Cardclient: connecter immediatement" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "Nagra: min. durée du processus ECM" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "Ne pas modifier" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "Désactiver" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "SC-Cryptoworks: Autorisation parentale" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "Permettre tous" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "Bloquer UNIQUE" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "Bloquer PARTAGE" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "Bloquer TOUS" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "SC-Seca: Mise à jour EMM" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "SC-Seca: activer PPV" diff --git a/po/hu_HU.po b/po/hu_HU.po new file mode 100644 index 0000000..d608902 --- /dev/null +++ b/po/hu_HU.po @@ -0,0 +1,188 @@ +# VDR plugin language source file. +# Copyright (C) 2007 somebody +# This file is distributed under the same license as the VDR package. +# +msgid "" +msgstr "" +"Project-Id-Version: VDR 1.5.11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-11-08 12:39+0100\n" +"PO-Revision-Date: 2007-11-01 16:45+0200\n" +"Last-Translator: jv\n" +"Language-Team: somebody\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "off" +msgstr "ki" + +msgid "SoftCAM" +msgstr "SoftCAM" + +msgid "Current keys:" +msgstr "Jelenleg használt kulcs:" + +msgid "Key update status:" +msgstr "Kulcsfrissítés állapota:" + +#. TRANSLATORS: 2 leading spaces! +msgid " [Seen keys]" +msgstr " [Talált kulcsok]" + +#. TRANSLATORS: 2 leading spaces! +msgid " [New keys]" +msgstr " [Új kulcsok]" + +msgid "Smartcard" +msgstr "Smartcard" + +msgid "Reset card" +msgstr "Kártya újraindítása" + +msgid "Really reset card?" +msgstr "Valóban újraindítjuk?" + +msgid "Module config" +msgstr "Modul konfig" + +msgid "Reset module to default" +msgstr "Modul alapállapotba" + +msgid "Really reset module to default?" +msgstr "Valóban resetáljuk a modult?" + +msgid "Module" +msgstr "Modul" + +msgid "Message logging" +msgstr "Üzenetek naplózása" + +msgid "Disable ALL modules" +msgstr "Összes modul ki" + +msgid "Reset ALL modules to default" +msgstr "Összes modul alapállapotba" + +msgid "Really disable ALL modules?" +msgstr "Valóban kapcsoljuk ki az összes modult?" + +msgid "Really reset ALL modules to default?" +msgstr "Valóban összes modul alapállapotba?" + +msgid "Cryptsystem options" +msgstr "Kriptorendszer opciók" + +msgid "Cryptsystem options..." +msgstr "Kriptorendszer opciók..." + +msgid "Message logging..." +msgstr "Üzenetek naplózása..." + +msgid "Smartcard interface" +msgstr "Smartcard interfész" + +msgid "(empty)" +msgstr "(üres)" + +msgid "Status information..." +msgstr "Státusz információ" + +msgid "Flush ECM cache" +msgstr "ECM tár üritése" + +msgid "Reload files" +msgstr "Fileok újraolvasása" + +msgid "Really flush ECM cache?" +msgstr "Valóban üritsük az ECM tárat?" + +msgid "Really reload files?" +msgstr "Biztos, hogy újraolvassuk a fileokat?" + +msgid "Active! Can't reload files now" +msgstr "SC aktív! Nem tud újraolvasni." + +msgid "(none)" +msgstr "(nincs)" + +msgid "active CAIDs" +msgstr "aktív CAIDok" + +msgid "all CAIDs" +msgstr "minden CAID" + +msgid "Update keys (AU)" +msgstr "Kulcsok automatikus frissítése (AU)" + +msgid "Start AU on EPG scan" +msgstr "" + +msgid "Concurrent FF streams" +msgstr "Párhuzamos FF streamek" + +msgid "Force TransferMode" +msgstr "Force TransferMode" + +msgid "Prefer local systems" +msgstr "Helyi rendszerek előnyben" + +msgid "Active on DVB card" +msgstr "Aktív a következő DVB kártyán" + +msgid "Ignore CAID" +msgstr "CAID mellőzése" + +msgid "Log to console" +msgstr "Naplózás a konzolon" + +msgid "Log to file" +msgstr "Naplózás fileba" + +msgid "Filename" +msgstr "File neve" + +msgid "Filesize limit (KB)" +msgstr "Fileméret limit (KB)" + +msgid "Log to syslog" +msgstr "Naplózás a rendszelogba" + +msgid "A software emulated CAM" +msgstr "Szoftveresen emulált CAM" + +msgid "undisclosed key" +msgstr "rejtett kulcs" + +msgid "Cardclient: connect immediately" +msgstr "Kliens: csatlakozzon azonnal" + +msgid "Nagra: min. ECM processing time" +msgstr "Nagra: min. ECM feldolgozási idő" + +msgid "don't touch" +msgstr "ne bántsd" + +msgid "disable" +msgstr "kikapcsolva" + +msgid "SC-Cryptoworks: Parental rating" +msgstr "SC-Cryptoworks: Szülői zár" + +msgid "allow ALL" +msgstr "engedélyezd MIND" + +msgid "block UNIQUE" +msgstr "tiltsd az EGYEDIt" + +msgid "block SHARED" +msgstr "tiltsd a MEGOSZTOTTat" + +msgid "block ALL" +msgstr "tiltsd MINDET" + +msgid "SC-Seca: EMM updates" +msgstr "SC-Seca: EMM frissítés" + +msgid "SC-Seca: activate PPV" +msgstr "SC-Seca: aktiváld a PPV-t" diff --git a/po/it_IT.po b/po/it_IT.po index cc5fccb..dc64af7 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Chiave in uso:" -#: sc.c:563 msgid "Key update status:" msgstr "" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [Chiavi trovate]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [Nuove chiavi]" -#: sc.c:593 msgid "Smartcard" msgstr "" -#: sc.c:598 msgid "Reset card" msgstr "" -#: sc.c:604 msgid "Really reset card?" msgstr "" -#: sc.c:643 msgid "Module config" msgstr "" -#: sc.c:646 msgid "Reset module to default" msgstr "" -#: sc.c:680 msgid "Really reset module to default?" msgstr "" -#: sc.c:721 msgid "Module" msgstr "" -#: sc.c:736 msgid "Message logging" msgstr "" -#: sc.c:739 msgid "Disable ALL modules" msgstr "" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "" -#: sc.c:801 msgid "Cryptsystem options" msgstr "" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "" -#: sc.c:859 msgid "Message logging..." msgstr "" -#: sc.c:864 msgid "Smartcard interface" msgstr "" -#: sc.c:866 msgid "(empty)" msgstr "(nessuna)" -#: sc.c:869 msgid "Status information..." msgstr "" -#: sc.c:870 msgid "Flush ECM cache" msgstr "" -#: sc.c:871 msgid "Reload files" msgstr "" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "" -#: sc.c:917 msgid "Really reload files?" msgstr "Ricarica il file delle chiavi?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Chiave in uso!" -#: sc.c:1033 msgid "(none)" msgstr "(nessuno)" -#: sc.c:1198 msgid "active CAIDs" msgstr "" -#: sc.c:1198 msgid "all CAIDs" msgstr "" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "" -#: sc.c:1204 msgid "Active on DVB card" msgstr "" -#: sc.c:1205 msgid "Ignore CAID" msgstr "" -#: sc.c:1207 msgid "Log to console" msgstr "" -#: sc.c:1208 msgid "Log to file" msgstr "" -#: sc.c:1209 msgid "Filename" msgstr "" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "" -#: sc.c:1211 msgid "Log to syslog" msgstr "" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "" -#: system.c:250 msgid "undisclosed key" msgstr "" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "" diff --git a/po/nl_NL.po b/po/nl_NL.po index 5c6b287..143180b 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "uit" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Huidige keys:" -#: sc.c:563 msgid "Key update status:" msgstr "Key update status:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr "" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [Nieuwe keys]" -#: sc.c:593 msgid "Smartcard" msgstr "Smartcard" -#: sc.c:598 msgid "Reset card" msgstr "Reset smartcard" -#: sc.c:604 msgid "Really reset card?" msgstr "Werkelijk smartcard resetten?" -#: sc.c:643 msgid "Module config" msgstr "" -#: sc.c:646 msgid "Reset module to default" msgstr "" -#: sc.c:680 msgid "Really reset module to default?" msgstr "" -#: sc.c:721 msgid "Module" msgstr "" -#: sc.c:736 msgid "Message logging" msgstr "" -#: sc.c:739 msgid "Disable ALL modules" msgstr "" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "" -#: sc.c:801 msgid "Cryptsystem options" msgstr "" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "" -#: sc.c:859 msgid "Message logging..." msgstr "" -#: sc.c:864 msgid "Smartcard interface" msgstr "Smartcard interface" -#: sc.c:866 msgid "(empty)" msgstr "(leeg)" -#: sc.c:869 msgid "Status information..." msgstr "Status informatie..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "" -#: sc.c:871 msgid "Reload files" msgstr "Opnieuw laden bestanden?" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "" -#: sc.c:917 msgid "Really reload files?" msgstr "Werkelijk opnieuw laden bestanden?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Actief! Kan bestanden niet herladen" -#: sc.c:1033 msgid "(none)" msgstr "(geen)" -#: sc.c:1198 msgid "active CAIDs" msgstr "actieve CAIDS" -#: sc.c:1198 msgid "all CAIDs" msgstr "alle CAIDs" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "Keys updaten (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "" -#: sc.c:1204 msgid "Active on DVB card" msgstr "Actief op DVB kaart" -#: sc.c:1205 msgid "Ignore CAID" msgstr "" -#: sc.c:1207 msgid "Log to console" msgstr "" -#: sc.c:1208 msgid "Log to file" msgstr "" -#: sc.c:1209 msgid "Filename" msgstr "" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "" -#: sc.c:1211 msgid "Log to syslog" msgstr "" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "In software geëmuleerde CAM" -#: system.c:250 msgid "undisclosed key" msgstr "onbekende key" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "Cardclient: direct contact maken" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "Nagra: min. ECM bewerkingstijd" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "niet wijzigen" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "uitschakelen" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "SC-Cryptoworks: Leeftijdsadvies" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "ALLES toestaan" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "UNIEKE blokkeren" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "GEDEELDE blokkeren" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "ALLES blokkeren" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "SC-Seca: EMM updates" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "SC-Seca: activeer PPV" diff --git a/po/pl_PL.po b/po/pl_PL.po index e124f63..5e5e4d7 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "wy³±cz" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Obecne klucze:" -#: sc.c:563 msgid "Key update status:" msgstr "Stan aktualizacji kluczy:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [widzianych kluczy]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [nowych kluczy]" -#: sc.c:593 msgid "Smartcard" msgstr "Smartcard" -#: sc.c:598 msgid "Reset card" msgstr "Resetuj kartê" -#: sc.c:604 msgid "Really reset card?" msgstr "Na pewno zrestartowaæ kartê?" -#: sc.c:643 msgid "Module config" msgstr "" -#: sc.c:646 msgid "Reset module to default" msgstr "" -#: sc.c:680 msgid "Really reset module to default?" msgstr "" -#: sc.c:721 msgid "Module" msgstr "" -#: sc.c:736 msgid "Message logging" msgstr "" -#: sc.c:739 msgid "Disable ALL modules" msgstr "" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "" -#: sc.c:801 msgid "Cryptsystem options" msgstr "" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "" -#: sc.c:859 msgid "Message logging..." msgstr "" -#: sc.c:864 msgid "Smartcard interface" msgstr "Interfejs Smartcard" -#: sc.c:866 msgid "(empty)" msgstr "(puste)" -#: sc.c:869 msgid "Status information..." msgstr "Informacje o stanie..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "" -#: sc.c:871 msgid "Reload files" msgstr "Prze³aduj pliki" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "" -#: sc.c:917 msgid "Really reload files?" msgstr "Na pewno prze³adowaæ klucze?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Aktywny! Nie mo¿na teraz prze³adowaæ plików." -#: sc.c:1033 msgid "(none)" msgstr "(brak)" -#: sc.c:1198 msgid "active CAIDs" msgstr "aktywne CAID" -#: sc.c:1198 msgid "all CAIDs" msgstr "wszystkie CAID" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "Aktualizuj klucze (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "" -#: sc.c:1204 msgid "Active on DVB card" msgstr "Aktywny na karcie DVB" -#: sc.c:1205 msgid "Ignore CAID" msgstr "" -#: sc.c:1207 msgid "Log to console" msgstr "" -#: sc.c:1208 msgid "Log to file" msgstr "" -#: sc.c:1209 msgid "Filename" msgstr "" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "" -#: sc.c:1211 msgid "Log to syslog" msgstr "" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "Programowo emulowany CAM" -#: system.c:250 msgid "undisclosed key" msgstr "niejawny klucz" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "Klient karty: pod³±cz natychmiast" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "Nagra: min. czas przetwarzania ECM" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "nie dotykaj" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "wy³±cz" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "SC-Cryptoworks: wska¼nik rodzica" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "dopu¶æ wszystkie" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "blokuj unikaty" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "blokuj dzielone" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "blokuj wszystkie" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "SC-Seca: aktualizacje EMM" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "SC-Seca: aktywuj PPV" diff --git a/po/ru_RU.po b/po/ru_RU.po index a17c015..785adc1 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-09-17 23:03+0200\n" "Last-Translator: \n" "Language-Team: ru\n" @@ -15,229 +15,175 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "ÒëÚÛ" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "¸áßÞÛì×ãÕÜëÕ ÚÛîçØ:" -#: sc.c:563 msgid "Key update status:" msgstr "¾ÑÝÞÒÛÕÝØÕ ÚÛîçÕÙ:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [ÚÛîçÕÙ ÝÐÙÔÕÝÞ]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [ÝÞÒëå ÚÛîçÕÙ]" -#: sc.c:593 msgid "Smartcard" msgstr "ºÐàâÞçÚÐ" -#: sc.c:598 msgid "Reset card" msgstr "ÁÑàÞáØâì ÚÐàâÞçÚã" -#: sc.c:604 msgid "Really reset card?" msgstr "´ÕÙáâÒØâÕÛìÝÞ áÑàÞáØâì ÚÐàâÞçÚã?" -#: sc.c:643 msgid "Module config" msgstr "½ÐáâàÞÙÚÐ ÜÞÔãÛï" -#: sc.c:646 msgid "Reset module to default" msgstr "ÁÑàÞá ÜÞÔãÛï ßÞ ãÜÞÛçÐÝØî" -#: sc.c:680 msgid "Really reset module to default?" msgstr "´ÕÙáâÒØâÕÛìÝÞ áÑàÞáØâì ÜÞÔãÛì ßÞ ãÜÞÛçÐÝØî?" -#: sc.c:721 msgid "Module" msgstr "¼ÞÔãÛì" -#: sc.c:736 msgid "Message logging" msgstr "¿àÞâÞÚÞÛØàÞÒÐÝØÕ áÞÞÑéÕÝØÙ" -#: sc.c:739 msgid "Disable ALL modules" msgstr "²ëÚÛîçØâì ÒáÕ ÜÞÔãÛØ" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "ÁÑàÞáØâì ÒáÕ ÜÞÔãÛØ ßÞ ãÜÞÛçÐÝØî" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "´ÕÙáâÒØâÕÛìÝÞ ÒëÚÛîçØâì ÒáÕ ÜÞÔãÛØ?" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "´ÕÙáâÒØâÕÛìÝÞ áÑàÞáØâì ÒáÕ ÜÞÔãÛØ ßÞ ãÜÞÛçÐÝØî?" -#: sc.c:801 msgid "Cryptsystem options" msgstr "¾ßæØØ ÚàØßâÞáØáâÕÜ" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "¾ßæØØ ÚàØßâÞáØáâÕÜ..." -#: sc.c:859 msgid "Message logging..." msgstr "¿àÞâÞÚÞÛØàÞÒÐÝØÕ áÞÞÑéÕÝØÙ..." -#: sc.c:864 msgid "Smartcard interface" msgstr "ºÐàâÞçÝëÙ ÜÞÔãÛì" -#: sc.c:866 msgid "(empty)" msgstr "(ßãáâÞ)" -#: sc.c:869 msgid "Status information..." msgstr "ÁÞáâÞïÝØÕ..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "¾çØáâØâì Úíè ECM" -#: sc.c:871 msgid "Reload files" msgstr "¿ÕàÕ×ÐÓàã×Øâì äÐÙÛë" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "´ÕÙáâÒØâÕÛìÝÞ ÞçØáâØâì Úíè ECM?" -#: sc.c:917 msgid "Really reload files?" msgstr "´ÕÙáâÒØâÕÛìÝÞ ßÕàÕ×ÐÓàã×Øâì äÐÙÛë?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "·ÐÝïâ! ½Õ ÜÞÓã ßÕàÕ×ÐÓàã×Øâì äÐÙÛë" -#: sc.c:1033 msgid "(none)" msgstr "(ÝÕâ)" -#: sc.c:1198 msgid "active CAIDs" msgstr "ÐÚâØÒÝëÕ CAID" -#: sc.c:1198 msgid "all CAIDs" msgstr "ÒáÕ CAID" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "¾ÑÝÞÒÛïâì ÚÛîçØ (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "¿ÐàÐÛÛÕÛìÝëÕ ßÞâÞÚØ FF" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "¿àÕÔßÞçØâÐâì ÛÞÚÐÛìÝëÕ áØáâÕÜë" -#: sc.c:1204 msgid "Active on DVB card" msgstr "°ÚâØÒÝëÙ ÝÐ ßÛÐâÕ DVB" -#: sc.c:1205 msgid "Ignore CAID" msgstr "¸ÓÝÞàØàÞÒÐâì CAID" -#: sc.c:1207 msgid "Log to console" msgstr "ÁÞÞÑéÕÝØï Ò ÚÞÝáÞÛÕ" -#: sc.c:1208 msgid "Log to file" msgstr "ÁÞÞÑéÕÝØï Ò äÐÙÛ" -#: sc.c:1209 msgid "Filename" msgstr "½Ð×ÒÐÝØÕ äÐÙÛÐ" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "»ØÜØâ äÐÙÛÐ (Ú±)" -#: sc.c:1211 msgid "Log to syslog" msgstr "ÁÞÞÑéÕÝØï Ò Syslog" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "¿àÞÓàÐÜÝëÙ íÜãÛïâÞà CAM" -#: system.c:250 msgid "undisclosed key" msgstr "ÝÕØ×ÒÕáâÝëÙ ÚÛîç" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "Cardclient: áÞÕÔØÝØâì ÝÕÜÕÔÛÕÝÝÞ" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "Nagra: ÜØÝ. ÒàÕÜï ÞÑàÐÑÞâÚØ ECM" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "ÝÕ Ø×ÜÕÝïâì" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "ÒëÚÛîçØâì" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "SC-Cryptoworks: ÒÞ×àÐáâÝÞÕ ÞÓàÐÝØçÕÝØÕ" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "ÒáÕ àÐ×àÕèØâì" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "ÑÛÞÚØàÞÒÐâì UNIQUE" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "ÑÛÞÚØàÞÒÐâì SHARED" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "ÒáÕ ÑÛÞÚØàÞÒÐâì" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "SC-Seca: ÞÑÝÞÒÛÕÝØï EMM" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "SC-Seca: ÐÚâØÒØàÞÒÐâì PPV" - diff --git a/po/sc.pot b/po/sc.pot index 04f1efb..31df669 100644 --- a/po/sc.pot +++ b/po/sc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-11-08 12:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,228 +16,175 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "" -#: sc.c:548 msgid "Current keys:" msgstr "" -#: sc.c:563 msgid "Key update status:" msgstr "" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr "" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr "" -#: sc.c:593 msgid "Smartcard" msgstr "" -#: sc.c:598 msgid "Reset card" msgstr "" -#: sc.c:604 msgid "Really reset card?" msgstr "" -#: sc.c:643 msgid "Module config" msgstr "" -#: sc.c:646 msgid "Reset module to default" msgstr "" -#: sc.c:680 msgid "Really reset module to default?" msgstr "" -#: sc.c:721 msgid "Module" msgstr "" -#: sc.c:736 msgid "Message logging" msgstr "" -#: sc.c:739 msgid "Disable ALL modules" msgstr "" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "" -#: sc.c:801 msgid "Cryptsystem options" msgstr "" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "" -#: sc.c:859 msgid "Message logging..." msgstr "" -#: sc.c:864 msgid "Smartcard interface" msgstr "" -#: sc.c:866 msgid "(empty)" msgstr "" -#: sc.c:869 msgid "Status information..." msgstr "" -#: sc.c:870 msgid "Flush ECM cache" msgstr "" -#: sc.c:871 msgid "Reload files" msgstr "" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "" -#: sc.c:917 msgid "Really reload files?" msgstr "" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "" -#: sc.c:1033 msgid "(none)" msgstr "" -#: sc.c:1198 msgid "active CAIDs" msgstr "" -#: sc.c:1198 msgid "all CAIDs" msgstr "" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "" -#: sc.c:1204 msgid "Active on DVB card" msgstr "" -#: sc.c:1205 msgid "Ignore CAID" msgstr "" -#: sc.c:1207 msgid "Log to console" msgstr "" -#: sc.c:1208 msgid "Log to file" msgstr "" -#: sc.c:1209 msgid "Filename" msgstr "" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "" -#: sc.c:1211 msgid "Log to syslog" msgstr "" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "" -#: system.c:250 msgid "undisclosed key" msgstr "" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index f620518..1145838 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-13 19:11+0200\n" +"POT-Creation-Date: 2007-10-27 17:16+0200\n" "PO-Revision-Date: 2007-08-27 12:45+0200\n" "Last-Translator: somebody\n" "Language-Team: somebody\n" @@ -14,228 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: sc.c:117 sc.c:1198 msgid "off" msgstr "av" -#: sc.c:546 sc.c:852 msgid "SoftCAM" msgstr "SoftCAM" -#: sc.c:548 msgid "Current keys:" msgstr "Aktuell nyckel:" -#: sc.c:563 msgid "Key update status:" msgstr "Nyckeluppdateringsstatus:" #. TRANSLATORS: 2 leading spaces! -#: sc.c:567 msgid " [Seen keys]" msgstr " [Påträffade nycklar]" #. TRANSLATORS: 2 leading spaces! -#: sc.c:569 msgid " [New keys]" msgstr " [Nya nycklar]" -#: sc.c:593 msgid "Smartcard" msgstr "Smartcard" -#: sc.c:598 msgid "Reset card" msgstr "Nollställ kortet" -#: sc.c:604 msgid "Really reset card?" msgstr "Bekräfta nollställning av kortet?" -#: sc.c:643 msgid "Module config" msgstr "" -#: sc.c:646 msgid "Reset module to default" msgstr "" -#: sc.c:680 msgid "Really reset module to default?" msgstr "" -#: sc.c:721 msgid "Module" msgstr "" -#: sc.c:736 msgid "Message logging" msgstr "" -#: sc.c:739 msgid "Disable ALL modules" msgstr "" -#: sc.c:740 msgid "Reset ALL modules to default" msgstr "" -#: sc.c:763 msgid "Really disable ALL modules?" msgstr "" -#: sc.c:771 msgid "Really reset ALL modules to default?" msgstr "" -#: sc.c:801 msgid "Cryptsystem options" msgstr "" -#: sc.c:858 msgid "Cryptsystem options..." msgstr "" -#: sc.c:859 msgid "Message logging..." msgstr "" -#: sc.c:864 msgid "Smartcard interface" msgstr "Smartcard-gränssnitt" -#: sc.c:866 msgid "(empty)" msgstr "(tom)" -#: sc.c:869 msgid "Status information..." msgstr "Statusinformation..." -#: sc.c:870 msgid "Flush ECM cache" msgstr "" -#: sc.c:871 msgid "Reload files" msgstr "Ladda om filer" -#: sc.c:898 msgid "Really flush ECM cache?" msgstr "" -#: sc.c:917 msgid "Really reload files?" msgstr "Bekräfta omladdning av filer?" -#: sc.c:924 msgid "Active! Can't reload files now" msgstr "Aktiv! Kan inte ladda om filer nu" -#: sc.c:1033 msgid "(none)" msgstr "(ingen)" -#: sc.c:1198 msgid "active CAIDs" msgstr "aktiva CAID" -#: sc.c:1198 msgid "all CAIDs" msgstr "alla CAID" -#: sc.c:1200 msgid "Update keys (AU)" msgstr "Nyckeluppdatering (AU)" -#: sc.c:1201 +msgid "Start AU on EPG scan" +msgstr "" + msgid "Concurrent FF streams" msgstr "" -#: sc.c:1202 msgid "Force TransferMode" msgstr "" -#: sc.c:1203 msgid "Prefer local systems" msgstr "" -#: sc.c:1204 msgid "Active on DVB card" msgstr "Aktiv på DVB-kort" -#: sc.c:1205 msgid "Ignore CAID" msgstr "Ignorera CAID" -#: sc.c:1207 msgid "Log to console" msgstr "" -#: sc.c:1208 msgid "Log to file" msgstr "" -#: sc.c:1209 msgid "Filename" msgstr "" -#: sc.c:1210 msgid "Filesize limit (KB)" msgstr "" -#: sc.c:1211 msgid "Log to syslog" msgstr "" -#: sc.c:1281 msgid "A software emulated CAM" msgstr "En mjukvaruemulerad CAM" -#: system.c:250 msgid "undisclosed key" msgstr "ej avslöjad nyckel" -#: systems/cardclient/cc.c:241 msgid "Cardclient: connect immediately" msgstr "" -#: systems/nagra/nagra1.c:977 msgid "Nagra: min. ECM processing time" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:81 msgid "don't touch" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:82 msgid "disable" msgstr "" -#: systems/sc-cryptoworks/sc-cryptoworks.c:86 msgid "SC-Cryptoworks: Parental rating" msgstr "" -#: systems/sc-seca/sc-seca.c:81 msgid "allow ALL" msgstr "" -#: systems/sc-seca/sc-seca.c:82 msgid "block UNIQUE" msgstr "" -#: systems/sc-seca/sc-seca.c:83 msgid "block SHARED" msgstr "" -#: systems/sc-seca/sc-seca.c:84 msgid "block ALL" msgstr "" -#: systems/sc-seca/sc-seca.c:100 msgid "SC-Seca: EMM updates" msgstr "" -#: systems/sc-seca/sc-seca.c:101 msgid "SC-Seca: activate PPV" msgstr "" diff --git a/sc.c b/sc.c index 8668245..b76b687 100644 --- a/sc.c +++ b/sc.c @@ -78,7 +78,7 @@ #endif // SC API version number for loading shared libraries -#define SCAPIVERS 9 +#define SCAPIVERS 10 const char *ScVersion = SCVERSION; @@ -454,7 +454,7 @@ void cOptMInt::Store(const char *PreStr) char b[256]; int p=0; for(int i=0; i1 ? "%x ":"%d ",storage[i]); + if(storage[i] || mode==0) p+=snprintf(b+p,sizeof(b)-p,mode>1 ? "%x ":"%d ",storage[i]); ScPlugin->SetupStore(FullName(PreStr),p>0?b:0); } @@ -955,6 +955,7 @@ cScSetup::cScSetup(void) memset(CaIgnore,0,sizeof(CaIgnore)); LocalPriority = 0; ForceTransfer = 1; + PrestartAU = 0; } void cScSetup::Check(void) @@ -968,7 +969,7 @@ void cScSetup::Check(void) } PRINTF(L_CORE_LOAD,"** Plugin config:"); - PRINTF(L_CORE_LOAD,"** Key updates (AU) are %s",AutoUpdate?(AutoUpdate==1?"enabled (active CAIDs)":"enabled (all CAIDs)"):"DISABLED"); + PRINTF(L_CORE_LOAD,"** Key updates (AU) are %s (%sprestart)",AutoUpdate?(AutoUpdate==1?"enabled (active CAIDs)":"enabled (all CAIDs)"):"DISABLED",PrestartAU?"":"no "); PRINTF(L_CORE_LOAD,"** Local systems %stake priority over cached remote",LocalPriority?"":"DON'T "); PRINTF(L_CORE_LOAD,"** Concurrent FF recordings are %sallowed",ConcurrentFF?"":"NOT "); PRINTF(L_CORE_LOAD,"** %sorce transfermode with digital audio",ForceTransfer?"F":"DON'T f"); @@ -1196,8 +1197,9 @@ public: cScPlugin::cScPlugin(void) { static const char *logg[] = { trNOOP("off"),trNOOP("active CAIDs"),trNOOP("all CAIDs") }; - ScOpts=new cOpts(0,6); + ScOpts=new cOpts(0,7); ScOpts->Add(new cOptSel ("AutoUpdate" ,trNOOP("Update keys (AU)") ,&ScSetup.AutoUpdate,3,logg)); + ScOpts->Add(new cOptBool ("PrestartAU" ,trNOOP("Start AU on EPG scan") ,&ScSetup.PrestartAU)); ScOpts->Add(new cOptBool ("ConcurrentFF" ,trNOOP("Concurrent FF streams"),&ScSetup.ConcurrentFF)); ScOpts->Add(new cOptBool ("ForceTranfer" ,trNOOP("Force TransferMode") ,&ScSetup.ForceTransfer)); ScOpts->Add(new cOptBool ("LocalPriority",trNOOP("Prefer local systems") ,&ScSetup.LocalPriority)); diff --git a/scsetup.h b/scsetup.h index 49b7ce5..2c09c8c 100644 --- a/scsetup.h +++ b/scsetup.h @@ -33,6 +33,7 @@ public: int CaIgnore[MAXCAIGN]; int LocalPriority; int ForceTransfer; + int PrestartAU; public: cScSetup(void); void Check(void); diff --git a/smartcard.c b/smartcard.c index 1cbd15c..5391daa 100644 --- a/smartcard.c +++ b/smartcard.c @@ -999,11 +999,11 @@ int cSmartCard::Procedure(unsigned char ins, int restLen) if((buff&0xFE)==(ins&0xFE)) r=restLen; else if((~buff&0xFE)==(ins&0xFE)) r=1; else { - LBPUT("cannot handle procedure %02x (ins=%02x)\n",buff,ins); + LBPUT("cannot handle procedure %02x (ins=%02x)",buff,ins); return -1; } if(r>restLen) { - LBPUT("data overrun r=%d restLen=%d\n",r,restLen); + LBPUT("data overrun r=%d restLen=%d",r,restLen); return -1; } } @@ -1177,7 +1177,7 @@ void cSmartCards::LoadData(const char *cfgdir) { mutex.Lock(); dataList.Clear(); - ConfRead("smartcard data",AddDirectory(cfgdir,DATAFILE)); + ConfRead("smartcard data",AddDirectory(cfgdir,DATAFILE),true); mutex.Unlock(); } diff --git a/system.h b/system.h index 154a159..4841ec9 100644 --- a/system.h +++ b/system.h @@ -206,7 +206,7 @@ public: char type[32]; snprintf(type,sizeof(type),"%s card infos",SysName); cString cname=AddDirectory(cfgdir,kidName); - ConfRead(type,cname); + ConfRead(type,cname,true); PRINTF(L_CORE_LOAD,"loaded %d %s cards from %s",this->Count(),SysName,*cname); return HaveCards(); } diff --git a/systems/cardclient/camd.c b/systems/cardclient/camd.c index 166ad23..212f786 100644 --- a/systems/cardclient/camd.c +++ b/systems/cardclient/camd.c @@ -536,7 +536,7 @@ void cCardClientCamd35::HandleEMMRequest(const struct CmdBlock *cb) if(!emmProcessing || emmCmd06) PRINTF(L_CC_CAMD35,"got cmd 02, doing cmd02 EMM"); emmCmd06=false; } - else if(cb->udp_header.cmd==0x05 && cb->udp_header.len>=112) { + else if(cb->udp_header.cmd==0x05 && cb->udp_header.len>=111) { struct EmmReq05 *req=(struct EmmReq05 *)cb->data; numCaids=bswap_32(req->caidCount); for(int i=numCaids-1; i>=0; i--) Caids[i]=bswap_16(req->caids[i]); @@ -550,6 +550,7 @@ void cCardClientCamd35::HandleEMMRequest(const struct CmdBlock *cb) case 0x06: SetCard(new cCardIrdeto(req->ua[3],&req->ua[0])); break; case 0x01: SetCard(new cCardSeca(&req->ua[0])); break; case 0x0d: SetCard(new cCardCryptoworks(&req->ua[0])); break; + case 0x05: SetCard(new cCardViaccess(&req->ua[0])); break; default: LBPUT(" (unhandled)"); break; diff --git a/systems/nagra/nagra2-0101.c b/systems/nagra/nagra2-0101.c index b56fe1a..bb3065e 100644 --- a/systems/nagra/nagra2-0101.c +++ b/systems/nagra/nagra2-0101.c @@ -183,14 +183,14 @@ public: virtual int ProcessBx(unsigned char *data, int len, int pos); }; -static cN2ProvLinkReg staticPL0101; +static cN2ProvLinkReg staticPL0101; cN2Prov0101::cN2Prov0101(int Id, int Flags) :cN2Prov(Id,Flags) { hasWriteHandler=hasReadHandler=true; special05=false; - hwCount=2; + hwCount=4; } bool cN2Prov0101::Algo(int algo, const unsigned char *hd, unsigned char *hw) @@ -238,11 +238,12 @@ bool cN2Prov0101::Algo(int algo, const unsigned char *hd, unsigned char *hw) int cN2Prov0101::ProcessBx(unsigned char *data, int len, int pos) { - if(Init(0x0101,102)) { + if(Init(id,102)) { SetMem(0x80,data,len); SetPc(0x80+pos); SetSp(0x0FFF,0x0FF0); ClearBreakpoints(); + ForceSet(0x0001,0x0f,true); // fix xor 80 AddBreakpoint(0x0000); AddBreakpoint(0x9569); AddBreakpoint(0xA822); // map handler @@ -345,21 +346,12 @@ void cN2Prov0101::Stepper(void) class cN2Prov0901 : public cN2Prov0101 { public: cN2Prov0901(int Id, int Flags); - virtual int ProcessBx(unsigned char *data, int len, int pos); }; -static cN2ProvLinkReg staticPL0901; +static cN2ProvLinkReg staticPL0901; cN2Prov0901::cN2Prov0901(int Id, int Flags) :cN2Prov0101(Id,Flags) { hwCount=4; } - -int cN2Prov0901::ProcessBx(unsigned char *data, int len, int pos) -{ - if(Init(0x0801,102)) { - return cN2Prov0101::ProcessBx(data,len,pos); - } - return -1; -} diff --git a/systems/nagra/nagra2-0501.c b/systems/nagra/nagra2-0501.c index f398d1c..5c0f4bf 100644 --- a/systems/nagra/nagra2-0501.c +++ b/systems/nagra/nagra2-0501.c @@ -21,19 +21,21 @@ class cMap0501 : public cMapCore { private: + int mId; protected: void DoMap(int f, unsigned char *data=0, int l=0); public: - cMap0501(void); + cMap0501(int Id); }; -cMap0501::cMap0501(void) +cMap0501::cMap0501(int Id) { + mId=Id|0x100; } void cMap0501::DoMap(int f, unsigned char *data, int l) { - PRINTF(L_SYS_MAP,"0501: calling function %02X",f); + PRINTF(L_SYS_MAP,"%04x: calling function %02X",mId,f); switch(f) { case 0x37: l=(l?l:wordsize)<<3; @@ -51,22 +53,28 @@ void cMap0501::DoMap(int f, unsigned char *data, int l) break; default: if(!cMapCore::DoMap(f,data,l)) - PRINTF(L_SYS_MAP,"0501: unsupported call %02x",f); + PRINTF(L_SYS_MAP,"%04x: unsupported call %02x",mId,f); break; } } // -- cN2Prov0501 -------------------------------------------------------------- -class cN2Prov0501 : public cN2Prov, private cMap0501 { +class cN2Prov0501 : public cN2Prov, private cMap0501, public cN2Emu { protected: virtual bool Algo(int algo, const unsigned char *hd, unsigned char *hw); virtual bool NeedsCwSwap(void) { return true; } public: - cN2Prov0501(int Id, int Flags):cN2Prov(Id,Flags) {} + cN2Prov0501(int Id, int Flags); + virtual int ProcessBx(unsigned char *data, int len, int pos); }; -static cN2ProvLinkReg staticPL0501; +static cN2ProvLinkReg staticPL0501; + +cN2Prov0501::cN2Prov0501(int Id, int Flags) +:cN2Prov(Id,Flags) +,cMap0501(Id) +{} bool cN2Prov0501::Algo(int algo, const unsigned char *hd, unsigned char *hw) { @@ -97,15 +105,36 @@ bool cN2Prov0501::Algo(int algo, const unsigned char *hd, unsigned char *hw) return false; } +int cN2Prov0501::ProcessBx(unsigned char *data, int len, int pos) +{ + if(Init(id,120)) { + SetMem(0x80,data,len); + SetPc(0x80+pos); + SetSp(0x0FFF,0x0FE0); + Set(0x0001,0xFF); + Set(0x000E,0xFF); + ClearBreakpoints(); + AddBreakpoint(0x821f); + while(!Run(5000)) { + switch(GetPc()) { + case 0x821f: + GetMem(0x80,data,len); + return a; + } + } + } + return -1; +} + // -- cN2Prov0511 ---------------------------------------------------------------- -static cN2ProvLinkReg staticPL0511; +static cN2ProvLinkReg staticPL0511; // -- cN2Prov1101 ---------------------------------------------------------------- -static cN2ProvLinkReg staticPL1101; +static cN2ProvLinkReg staticPL1101; // -- cN2Prov3101 ---------------------------------------------------------------- -static cN2ProvLinkReg staticPL3101; +static cN2ProvLinkReg staticPL3101; diff --git a/systems/nagra/nagra2-4101.c b/systems/nagra/nagra2-4101.c index 0abe6d6..d2d8187 100644 --- a/systems/nagra/nagra2-4101.c +++ b/systems/nagra/nagra2-4101.c @@ -28,7 +28,7 @@ public: virtual int ProcessBx(unsigned char *data, int len, int pos); }; -static cN2ProvLinkReg staticPL4101; +static cN2ProvLinkReg staticPL4101; cN2Prov4101::cN2Prov4101(int Id, int Flags) :cN2Prov(Id,Flags) @@ -89,4 +89,4 @@ void cN2Prov4101::WriteHandler(unsigned char seg, unsigned short ea, unsigned ch // -- cN2Prov7101 ---------------------------------------------------------------- -static cN2ProvLinkReg staticPL7101; +static cN2ProvLinkReg staticPL7101; diff --git a/systems/nagra/nagra2.c b/systems/nagra/nagra2.c index 53e5950..63f5386 100644 --- a/systems/nagra/nagra2.c +++ b/systems/nagra/nagra2.c @@ -70,9 +70,9 @@ bool cN2Emu::Init(int id, int romv) // ROM01 0x01:0x8000-0xffff if(!AddMapper(new cMapRom(0x8000,buff,0x0C000),0x8000,0x8000,0x01)) return false; // ROM02 0x02:0x8000-0xbfff - if(!AddMapper(new cMapRom(0x8000,buff,0x14000),0x8000,romv==110?0x8000:0x4000,0x02)) return false; + if(!AddMapper(new cMapRom(0x8000,buff,0x14000),0x8000,romv>=110?0x8000:0x4000,0x02)) return false; - snprintf(buff,sizeof(buff),"EEP%02X_%d.bin",(id>>8)&0xFF,romv); + snprintf(buff,sizeof(buff),"EEP%02X_%d.bin",(id>>8)&0xFF|0x01,romv); // Eeprom00 0x00:0x3000-0x37ff OTP 0x80 if(!AddMapper(new cMapRom(0x3000,buff,0x0000),0x3000,0x0800,0x00)) return false; //XXX if(!AddMapper(new cMapEeprom(0x3000,buff,128,0x0000),0x3000,0x0800,0x00)) return false; @@ -310,7 +310,7 @@ public: cN2Prov::cN2Prov(int Id, int Flags) { - keyValid=false; id=Id; flags=Flags; + keyValid=false; id=Id|0x100; flags=Flags; } void cN2Prov::PrintCaps(int c) @@ -604,12 +604,15 @@ cSystemNagra2::~cSystemNagra2() bool cSystemNagra2::ProcessECM(const cEcmInfo *ecm, unsigned char *data) { - if((ecm->provId>>8)==0x09 && data[4]==101) { // BEV rev248 morph - data[0x05]=9; // I _HATE_ this provider - data[0x06]&=0x1F; // specific stuff :( - data[0x07]=data[0x07]&0x10|0x86; - data[0x08]=0; - data[0x09]=data[0x09]&0x80|0x08; +#define NA_SOURCE_START 0x8267 // cSource::FromString("S61.5W"); +#define NA_SOURCE_END 0x85c8 // cSource::FromString("S148W"); + if(ecm->source>=NA_SOURCE_START && ecm->source<=NA_SOURCE_END) { + if(ecm->caId==0x1234) data[5]=0x09; // NA rev 248 morph + else data[5]=0x01; // I _HATE_ this provider + data[6]&=0x1F; // specific stuff :( + data[7]=data[7]&0x10|0x86; + data[8]=0; + data[9]=data[9]&0x80|0x08; } int cmdLen=data[4]-5; diff --git a/systems/sc-conax/sc-conax.c b/systems/sc-conax/sc-conax.c index b20a082..06a9b2e 100644 --- a/systems/sc-conax/sc-conax.c +++ b/systems/sc-conax/sc-conax.c @@ -228,7 +228,7 @@ bool cSmartCardConax::Init(void) } } infoStr.Printf("|%04X|%s|%s-%s|\n",ent.id,ent.name,ent.date[0],ent.date[1]); - infoStr.Printf("| | |%s-%s\n",ent.date[2],ent.date[3]); + infoStr.Printf("| | |%s-%s|\n",ent.date[2],ent.date[3]); } } while((l=GetLen())>0); } diff --git a/systems/sc-viaccess/sc-viaccess.c b/systems/sc-viaccess/sc-viaccess.c index 3907943..dc18fb2 100644 --- a/systems/sc-viaccess/sc-viaccess.c +++ b/systems/sc-viaccess/sc-viaccess.c @@ -141,7 +141,7 @@ cSmartCardViaccess::cSmartCardViaccess(void) bool cSmartCardViaccess::Init(void) { static const unsigned char verifyBytes[] = { 0x90,0x00 }; - if(atr->T!=0 || (atr->histLen<7 && memcmp(atr->hist+(atr->histLen-2),verifyBytes,sizeof(verifyBytes)))) { + if(atr->T!=0 || atr->histLen<7 || memcmp(&atr->hist[5],verifyBytes,sizeof(verifyBytes))) { PRINTF(L_SC_INIT,"doesn't look like a Viaccess card"); return false; } @@ -149,10 +149,12 @@ bool cSmartCardViaccess::Init(void) infoStr.Begin(); infoStr.Strcat("Viaccess smartcard\n"); char *ver=0; - switch((atr->hist[atr->histLen-4]<<8)|atr->hist[atr->histLen-3]) { + switch((atr->hist[3]<<8)|atr->hist[4]) { case 0x6268: ver="2.3"; break; - case 0x6668: ver="2.4(?)"; break; - case 0xa268: + case 0x6468: + case 0x6668: ver="2.4"; break; + case 0xa268: ver="2.5"; break; + case 0xc168: ver="2.6"; break; default: ver="unknown"; break; } diff --git a/systems/sc-videoguard2/sc-videoguard2.c b/systems/sc-videoguard2/sc-videoguard2.c index 05b4c84..1528b75 100644 --- a/systems/sc-videoguard2/sc-videoguard2.c +++ b/systems/sc-videoguard2/sc-videoguard2.c @@ -350,7 +350,7 @@ void cCamCryptVG2::LongMult(unsigned short *pData, unsigned short *pLen, unsigne pData[i]=(unsigned short)carry; carry>>=16; } - if(carry) pData[*pLen++]=carry; + if(carry) pData[(*pLen)++]=carry; } void cCamCryptVG2::PartialMod(unsigned short val, unsigned int count, unsigned short *outkey, const unsigned short *inkey) @@ -392,8 +392,11 @@ static const unsigned char table1[256] = { void cCamCryptVG2::RotateRightAndHash(unsigned char *p) { - for(unsigned int i=0; i<16; i++) - p[i]=table1[ (p[i]>>1) | ((p[(i-1)&15]&1)<<7) ]; + unsigned char t1=p[15]; + for(int i=0; i<16; i++) { + unsigned char t2=t1; + t1=p[i]; p[i]=table1[(t1>>1)|((t2&1)<<7)]; + } } // -- cCmdTable ---------------------------------------------------------------- diff --git a/testing/compat.c b/testing/compat.c index d7c3caa..87b486f 100644 --- a/testing/compat.c +++ b/testing/compat.c @@ -5,7 +5,6 @@ #include #include #define DEBUG -#include "common.h" #include "data.h" #include "sc.h" #include "scsetup.h" @@ -15,6 +14,7 @@ #include "smartcard.h" #include "cam.h" #include "log.h" +#include "version.h" #define LIBSC_PREFIX "libsc-" #define SO_INDICATOR ".so." @@ -104,6 +104,11 @@ int ReadRaw(const char *name, unsigned char *buff, int maxlen) // // +const char *ScVersion = SCVERSION; + +// +// + extern const char *I18nTranslate(const char *s, const char *Plugin) { return s; @@ -133,8 +138,10 @@ cScSetup::cScSetup(void) memset(ScCaps,0,sizeof(ScCaps)); ScCaps[0] = 1; ScCaps[1] = 2; - ConcurrentFF = 1; + ConcurrentFF = 0; memset(CaIgnore,0,sizeof(CaIgnore)); + LocalPriority = 0; + ForceTransfer = 1; } void cScSetup::Check(void) {} diff --git a/testing/testECM.c b/testing/testECM.c index b314dea..775b861 100644 --- a/testing/testECM.c +++ b/testing/testECM.c @@ -14,6 +14,7 @@ int main(int argc, char *argv[]) } DllsLoad(argv[1]); InitAll(argv[2]); + LogAll(); unsigned char ecm[4096]; ReadRaw(argv[5],ecm,sizeof(ecm)); diff --git a/testing/testEMM.c b/testing/testEMM.c index f93d037..5c59c98 100644 --- a/testing/testEMM.c +++ b/testing/testEMM.c @@ -2,7 +2,6 @@ #include #include -#include "common.h" #include "data.h" #include "system.h" #include "compat.h" diff --git a/testing/testN2Emu.c b/testing/testN2Emu.c index 00b1b3b..4c0ef89 100644 --- a/testing/testN2Emu.c +++ b/testing/testN2Emu.c @@ -8,6 +8,7 @@ #include "system-common.h" #include "systems/nagra/cpu.c" #include "systems/nagra/nagra2.c" +#include "systems/nagra/nagra.c" #include "compat.h" @@ -159,6 +160,8 @@ int main(int argc, char *argv[]) } InitAll(argv[1]); + LogAll(); + cLogging::SetModuleOption(LCLASS(L_SYS,L_SYS_DISASM),false); unsigned char data[256]; int len=ReadRaw(argv[4],data,sizeof(data)); if((mode==1 && len!=64) || (mode==2 && len!=96)) { diff --git a/version.h b/version.h index 3bde6fe..6aab704 100644 --- a/version.h +++ b/version.h @@ -21,8 +21,8 @@ #define ___VERSION_H // all release versions must end with 0xFF !! -#define SCVERSNUM 0x000804FF -#define SCVERSION "0.8.4" +#define SCVERSNUM 0x000805FF +#define SCVERSION "0.8.5" extern const char *ScVersion; -- 2.39.5