Refactored the SAT>IP support.

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.

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");
 

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'))
+     if (channel->IsSourceType('I'))
-        m_DeviceSource = DEVICESOURCE_SATIP;
-     else 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'))
+     if (channel->IsSourceType('I'))
-        m_DeviceSource = DEVICESOURCE_SATIP;
-     else 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;

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

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);
-}

femontools.h

@@ -26,8 +26,7 @@
 
 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
 
-#define stSatipSat  ('Z' << 24)
+#define SATIP_DEVICE "SAT>IP"
-#define stSatipTerr ('Y' << 24)
 
 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

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: German <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Füley István <ifuley at tigercomp dot ro>\n"
 "Language-Team: Hungarian <ifuley at tigercomp dot ro>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: Russian <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "rýchlos» kódovania"
 
-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 ""

po/uk_UA.po

@@ -4,10 +4,10 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\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 ""

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: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2014-03-15 03:15+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"PO-Revision-Date: 2014-03-15 03:15+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\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 ""