diff --git a/HISTORY b/HISTORY index 67c3f9d..a396097 100644 --- a/HISTORY +++ b/HISTORY @@ -488,3 +488,7 @@ VDR Plugin 'femon' Revision History 2014-03-08: Version 2.0.3 - Added support for SAT>IP devices. + +2014-03-15: Version 2.0.4 + +- Refactored the SAT>IP support. diff --git a/femon.c b/femon.c index b8b77ee..4c2ee4a 100644 --- a/femon.c +++ b/femon.c @@ -22,7 +22,7 @@ #define GITVERSION "" #endif -static const char VERSION[] = "2.0.3" GITVERSION; +static const char VERSION[] = "2.0.4" GITVERSION; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); diff --git a/femonosd.c b/femonosd.c index 0afd9a8..22ddd51 100644 --- a/femonosd.c +++ b/femonosd.c @@ -478,53 +478,6 @@ void cFemonOsd::DrawInfoWindow(void) } break; - case stSatipSat: { - cDvbTransponderParameters dtp(channel->Parameters()); - cSatipTransponderParameters stp(channel->Parameters()); - OSDDRAWINFOLINE(*cString::sprintf("SAT>IP %s #%d - %s", *getSatelliteSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName)); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("Frequency"), *getFrequencyMHz(channel->Frequency())); - OSDDRAWINFORIGHT(trVDR("Modulation"), *getModulation(dtp.Modulation())); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("Srate"), *cString::sprintf("%d", channel->Srate())); - OSDDRAWINFORIGHT(trVDR("Polarization"), *cString::sprintf("%c", toupper(dtp.Polarization()))); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( tr("Coderate"), *getCoderate(dtp.CoderateH())); - OSDDRAWINFORIGHT( tr("SignalSource"), *stp.SignalSource()); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("System"), *getSatelliteSystem(dtp.System())); - if (dtp.System()) { - OSDDRAWINFORIGHT(tr("PilotTones"), *stp.PilotTones()); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT(trVDR("RollOff"), *getRollOff(dtp.RollOff())); - } - } - break; - - case stSatipTerr: { - cDvbTransponderParameters dtp(channel->Parameters()); - cSatipTransponderParameters stp(channel->Parameters()); - OSDDRAWINFOLINE(*cString::sprintf("SAT>IP %s #%d - %s", *getTerrestrialSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName)); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("Frequency"), *getFrequencyMHz(channel->Frequency())); - OSDDRAWINFORIGHT(trVDR("Transmission"), *getTransmission(dtp.Transmission())); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("Bandwidth"), *getBandwidth(dtp.Bandwidth())); - OSDDRAWINFORIGHT(trVDR("Modulation"), *getModulation(dtp.Modulation())); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("Guard"), *getGuard(dtp.Guard())); - OSDDRAWINFORIGHT(tr ("Coderate"), *getCoderate(dtp.CoderateH())); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("System"), *getTerrestrialSystem(dtp.System())); - if (dtp.System()) { - OSDDRAWINFORIGHT(trVDR("StreamId"), *cString::sprintf("%d", dtp.StreamId())); - offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( tr("T2SystemId"), stp.T2SystemId()); - OSDDRAWINFORIGHT(tr("SISO/MISO"), stp.SisoMiso()); - } - } - break; - case stIptv: { OSDDRAWINFOLINE(*cString::sprintf("IPTV #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName)); offset += OSDROWHEIGHT; @@ -641,23 +594,6 @@ void cFemonOsd::Action(void) m_UNC = 0; m_UNCValid = false; break; - case DEVICESOURCE_SATIP: - m_Quality = cDevice::ActualDevice()->SignalQuality(); - m_QualityValid = (m_Quality >= 0); - m_Strength = cDevice::ActualDevice()->SignalStrength(); - m_StrengthValid = (m_Strength >= 0); - m_FrontendName = cDevice::ActualDevice()->DeviceName(); - m_FrontendStatus = (fe_status_t)(cDevice::ActualDevice()->HasLock() ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0); - m_FrontendStatusValid = m_StrengthValid; - m_Signal = uint16_t(m_Strength * 0xFFFF / 100); - m_SignalValid = m_StrengthValid; - m_SNR = uint16_t(m_Quality * 0xFFFF / 100); - m_SNRValid = m_QualityValid; - m_BER = 0; - m_BERValid = false; - m_UNC = 0; - m_UNCValid = false; - break; case DEVICESOURCE_IPTV: m_Quality = cDevice::ActualDevice()->SignalQuality(); m_QualityValid = (m_Quality >= 0); @@ -689,6 +625,23 @@ void cFemonOsd::Action(void) m_BERValid = (ioctl(m_Frontend, FE_READ_BER, &m_BER) >= 0); m_UNCValid = (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC) >= 0); } + else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) { + m_Quality = cDevice::ActualDevice()->SignalQuality(); + m_QualityValid = (m_Quality >= 0); + m_Strength = cDevice::ActualDevice()->SignalStrength(); + m_StrengthValid = (m_Strength >= 0); + m_FrontendName = cDevice::ActualDevice()->DeviceName(); + m_FrontendStatus = (fe_status_t)(cDevice::ActualDevice()->HasLock() ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0); + m_FrontendStatusValid = m_StrengthValid; + m_Signal = uint16_t(m_Strength * 0xFFFF / 100); + m_SignalValid = m_StrengthValid; + m_SNR = uint16_t(m_Quality * 0xFFFF / 100); + m_SNRValid = m_QualityValid; + m_BER = 0; + m_BERValid = false; + m_UNC = 0; + m_UNCValid = false; + } else if (m_SvdrpConnection.handle >= 0) { cmd.handle = m_SvdrpConnection.handle; m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd); @@ -760,9 +713,7 @@ void cFemonOsd::Show(void) m_DeviceSource = DEVICESOURCE_DVBAPI; if (channel) { - if (channel->IsSourceType('Y') || channel->IsSourceType('Z')) - m_DeviceSource = DEVICESOURCE_SATIP; - else if (channel->IsSourceType('I')) + if (channel->IsSourceType('I')) m_DeviceSource = DEVICESOURCE_IPTV; else if (channel->IsSourceType('V')) m_DeviceSource = DEVICESOURCE_PVRINPUT; @@ -781,6 +732,9 @@ void cFemonOsd::Show(void) return; } } + else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) { + // nop + } else if (femonConfig.usesvdrp) { if (!SvdrpConnect() || !SvdrpTune()) return; @@ -831,9 +785,7 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool li m_DeviceSource = DEVICESOURCE_DVBAPI; if (channel) { - if (channel->IsSourceType('Y') || channel->IsSourceType('Z')) - m_DeviceSource = DEVICESOURCE_SATIP; - else if (channel->IsSourceType('I')) + if (channel->IsSourceType('I')) m_DeviceSource = DEVICESOURCE_IPTV; else if (channel->IsSourceType('V')) m_DeviceSource = DEVICESOURCE_PVRINPUT; @@ -857,6 +809,9 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool li return; } } + else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) { + // nop + } else if (femonConfig.usesvdrp) { if (!SvdrpConnect() || !SvdrpTune()) return; diff --git a/femonosd.h b/femonosd.h index 8fa3ab4..e26e7aa 100644 --- a/femonosd.h +++ b/femonosd.h @@ -26,7 +26,6 @@ class cFemonOsd : public cOsdObject, public cThread, public cStatus { private: enum eDeviceSourceType { DEVICESOURCE_DVBAPI = 0, - DEVICESOURCE_SATIP, DEVICESOURCE_IPTV, DEVICESOURCE_PVRINPUT, DEVICESOURCE_COUNT diff --git a/femontools.c b/femontools.c index 47b0f6d..1bd0c87 100644 --- a/femontools.c +++ b/femontools.c @@ -591,90 +591,3 @@ void cFemonBitStream::SkipGolomb() SkipBits(n); } - -// --- cSatipTransponderParameters ------------------------------------------- - -cSatipTransponderParameters::cSatipTransponderParameters(const char *parametersP) -: t2SystemIdM(0), - sisoMisoM(999), - pilotTonesM(0), - signalSourceM(1) -{ - Parse(parametersP); -} - -const char *cSatipTransponderParameters::ParseParameter(const char *strP, int &valueP) -{ - if (*++strP) { - char *p = NULL; - errno = 0; - int n = strtol(strP, &p, 10); - if (!errno && p != strP) { - valueP = n; - if (valueP >= 0) - return p; - } - } - error("invalid value for parameter '%c'", *(strP - 1)); - return NULL; -} - -bool cSatipTransponderParameters::Parse(const char *strP) -{ - while (strP && *strP) { - int ignoreThis; - switch (toupper(*strP)) { - case 'H': - case 'L': - case 'V': - case 'R': strP++; break; - case 'B': - case 'C': - case 'G': - case 'M': - case 'O': - case 'P': - case 'S': - case 'T': - case 'D': - case 'I': - case 'Y': strP = ParseParameter(strP, ignoreThis); break; - case 'N': strP = ParseParameter(strP, pilotTonesM); break; - case 'Q': strP = ParseParameter(strP, t2SystemIdM); break; - case 'X': strP = ParseParameter(strP, sisoMisoM); break; - case 'Z': strP = ParseParameter(strP, signalSourceM); break; - default: return false; - } - } - return true; -} - -cString cSatipTransponderParameters::T2SystemId(void) -{ - return cString::sprintf("%d", t2SystemIdM); -} - -cString cSatipTransponderParameters::SisoMiso(void) -{ - switch (sisoMisoM) { - case 0: return tr("SISO"); - case 1: return tr("MISO"); - default: return trVDR("auto"); - } - return NULL; -} - -cString cSatipTransponderParameters::PilotTones(void) -{ - switch (pilotTonesM) { - case 0: return trVDR("off"); - case 1: return trVDR("on"); - default: return trVDR("auto"); - } - return NULL; -} - -cString cSatipTransponderParameters::SignalSource(void) -{ - return cString::sprintf("%d", signalSourceM); -} diff --git a/femontools.h b/femontools.h index 8d30973..d7fef1b 100644 --- a/femontools.h +++ b/femontools.h @@ -26,8 +26,7 @@ #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d" -#define stSatipSat ('Z' << 24) -#define stSatipTerr ('Y' << 24) +#define SATIP_DEVICE "SAT>IP" cDvbDevice *getDvbDevice(cDevice* device); @@ -88,20 +87,4 @@ public: void SkipSeGolomb() { SkipGolomb(); } }; -class cSatipTransponderParameters { -private: - int t2SystemIdM; - int sisoMisoM; - int pilotTonesM; - int signalSourceM; - const char *ParseParameter(const char *strP, int &valueP); - bool Parse(const char *strP); -public: - cSatipTransponderParameters(const char *parametersP = NULL); - cString T2SystemId(void); - cString SisoMiso(void); - cString PilotTones(void); - cString SignalSource(void); - }; - #endif // __FEMONTOOLS_H diff --git a/po/de_DE.po b/po/de_DE.po index 70ab035..7f06153 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Christian Wieninger\n" "Language-Team: German \n" "Language: de\n" @@ -180,18 +180,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "Signalquelle" - -msgid "PilotTones" -msgstr "Pilottöne" - -msgid "T2SystemId" -msgstr "T2-Systemkennung" - -msgid "SISO/MISO" -msgstr "SISO/MISO" - msgid "Protocol" msgstr "" @@ -401,9 +389,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index d84805c..ad2fadf 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Luis Palacios\n" "Language-Team: Spanish \n" "Language: es\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -399,9 +387,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index 1f6215b..6066ed5 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Arthur Konovalov\n" "Language-Team: Estonian \n" "Language: et\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -399,9 +387,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 0ca9f11..1323a4a 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish \n" "Language: fi\n" @@ -178,18 +178,6 @@ msgstr "Radio-ID" msgid "Coderate" msgstr "Suojaustaso" -msgid "SignalSource" -msgstr "Signaalilähde" - -msgid "PilotTones" -msgstr "Pilottiäänet" - -msgid "T2SystemId" -msgstr "T2-järjestelmä" - -msgid "SISO/MISO" -msgstr "SISO/MISO" - msgid "Protocol" msgstr "Protokolla" @@ -399,9 +387,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index c2e89fd..6f18db3 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Bernard Jaulin \n" "Language-Team: French \n" "Language: fr\n" @@ -180,18 +180,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "Protocole" @@ -401,9 +389,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 9ba5c3e..3657399 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Fley Istvn \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -181,18 +181,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -402,9 +390,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index bb698ba..24820d8 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" "Language: it\n" @@ -182,18 +182,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -403,9 +391,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/lt_LT.po b/po/lt_LT.po index 3138e30..c33a32e 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: Lithuanian \n" "Language: lt\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Kodavimo dažnis" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -399,9 +387,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 4928bc7..34fc995 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Vyacheslav Dikonov\n" "Language-Team: Russian \n" "Language: ru\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -399,9 +387,3 @@ msgstr " msgid "kbit/s" msgstr "/" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/sk_SK.po b/po/sk_SK.po index ae31ab8..a091f17 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Milan Hrala \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "rchlos kdovania" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "Protokol" @@ -399,9 +387,3 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index fe189a4..361cbed 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -4,10 +4,10 @@ # Yarema aka Knedlyk , 2010. msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "Шв. кодування" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "Протокол" @@ -399,9 +387,3 @@ msgstr "Мбіт/c" msgid "kbit/s" msgstr "кбіт/с" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 833f455..1e721a5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: NanFeng \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "码速率" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -399,9 +387,3 @@ msgstr "兆位/秒" msgid "kbit/s" msgstr "千字节/秒" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index f83b56e..be49af2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.3\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-08 03:08+0200\n" -"PO-Revision-Date: 2014-03-08 03:08+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: NanFeng \n" "Language-Team: Chinese (traditional) \n" "Language: zh_TW\n" @@ -178,18 +178,6 @@ msgstr "Rid" msgid "Coderate" msgstr "碼速率" -msgid "SignalSource" -msgstr "" - -msgid "PilotTones" -msgstr "" - -msgid "T2SystemId" -msgstr "" - -msgid "SISO/MISO" -msgstr "" - msgid "Protocol" msgstr "" @@ -399,9 +387,3 @@ msgstr "兆位/秒" msgid "kbit/s" msgstr "千字節/秒" - -msgid "SISO" -msgstr "" - -msgid "MISO" -msgstr ""