Added support for SAT>IP devices.

HISTORY

@@ -484,3 +484,7 @@ VDR Plugin 'femon' Revision History
 2014-01-18: Version 2.0.2
 
 - Added initial support for CAMs.
+
+2014-03-08: Version 2.0.3
+
+- Added support for SAT>IP devices.

femon.c

@@ -22,7 +22,7 @@
 #define GITVERSION ""
 #endif
 
-static const char VERSION[]       = "2.0.2" GITVERSION;
+static const char VERSION[]       = "2.0.3" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 

femonosd.c

@@ -478,6 +478,53 @@ 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;
@@ -594,6 +641,23 @@ 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);
@@ -696,7 +760,9 @@ void cFemonOsd::Show(void)
 
   m_DeviceSource = DEVICESOURCE_DVBAPI;
   if (channel) {
-     if (channel->IsSourceType('I'))
+     if (channel->IsSourceType('Y') || channel->IsSourceType('Z'))
+        m_DeviceSource = DEVICESOURCE_SATIP;
+     else if (channel->IsSourceType('I'))
         m_DeviceSource = DEVICESOURCE_IPTV;
      else if (channel->IsSourceType('V'))
         m_DeviceSource = DEVICESOURCE_PVRINPUT;
@@ -765,7 +831,9 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool li
 
   m_DeviceSource = DEVICESOURCE_DVBAPI;
   if (channel) {
-     if (channel->IsSourceType('I'))
+     if (channel->IsSourceType('Y') || channel->IsSourceType('Z'))
+        m_DeviceSource = DEVICESOURCE_SATIP;
+     else if (channel->IsSourceType('I'))
         m_DeviceSource = DEVICESOURCE_IPTV;
      else if (channel->IsSourceType('V'))
         m_DeviceSource = DEVICESOURCE_PVRINPUT;

femonosd.h

@@ -26,6 +26,7 @@ class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
   enum eDeviceSourceType {
     DEVICESOURCE_DVBAPI = 0,
+    DEVICESOURCE_SATIP,
     DEVICESOURCE_IPTV,
     DEVICESOURCE_PVRINPUT,
     DEVICESOURCE_COUNT

femontools.c

@@ -9,6 +9,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+#include <ctype.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -590,3 +591,90 @@ 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,6 +26,9 @@
 
 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
 
+#define stSatipSat  ('Z' << 24)
+#define stSatipTerr ('Y' << 24)
+
 cDvbDevice *getDvbDevice(cDevice* device);
 
 cString getFrontendInfo(cDvbDevice *device);
@@ -85,4 +88,20 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
@@ -180,6 +180,18 @@ 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 ""
 
@@ -389,3 +401,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"
@@ -178,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -387,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"
@@ -178,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -387,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
@@ -178,6 +178,18 @@ 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"
 
@@ -387,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
@@ -180,6 +180,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -389,3 +401,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2010-10-10 10:10+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+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,6 +181,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -390,3 +402,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -182,6 +182,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -391,3 +403,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
@@ -178,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Kodavimo dažnis"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -387,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
@@ -178,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -387,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
@@ -178,6 +178,18 @@ 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"
 
@@ -388,3 +400,8 @@ msgstr "Mbit/s"
 msgid "kbit/s"
 msgstr "kbit/s"
 
+msgid "SISO"
+msgstr ""
+
+msgid "MISO"
+msgstr ""

po/uk_UA.po

@@ -4,18 +4,17 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Монітор інформації про DVB сигнал"
@@ -113,12 +112,8 @@ msgstr "Визначення границі зеленої поділки, як
 msgid "OSD update interval [0.1s]"
 msgstr "Інтервал оновлення повідомлень [0.1с]"
 
-msgid ""
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-"Define an interval for OSD updates. The smaller interval generates higher "
+msgstr "Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше завантаження процесора."
-"CPU load."
-msgstr ""
-"Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше "
-"завантаження процесора."
 
 msgid "Analyze stream"
 msgstr "Аналіз потоку"
@@ -129,19 +124,14 @@ msgstr "Визначення, чи проводити аналіз DVB пото
 msgid "Calculation interval [0.1s]"
 msgstr "Інтервал обчислення [0.1с]"
 
-msgid ""
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
-"Define an interval for calculation. The bigger interval generates more "
+msgstr "Визначення інтервалу обчислення. Більший інтервал дає стабільніші значення."
-"stable values."
-msgstr ""
-"Визначення інтервалу обчислення. Більший інтервал дає стабільніші значення."
 
 msgid "Use SVDRP service"
 msgstr "Використати SVDRP сервіс"
 
 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr ""
+msgstr "Визначення чи буде використовуватися SVDRP сервіс в налаштуваннях клієнта/сервера"
-"Визначення чи буде використовуватися SVDRP сервіс в налаштуваннях клієнта/"
-"сервера"
 
 msgid "SVDRP service port"
 msgstr "Порт SVDRP сервісу"
@@ -188,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Шв. кодування"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -397,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "Language: zh_CN\n"
@@ -178,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "码速率"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -387,3 +399,9 @@ 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.2\n"
+"Project-Id-Version: vdr-femon 2.0.3\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-01-08 01:18+0200\n"
+"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-01-08 01:18+0200\n"
+"PO-Revision-Date: 2014-03-08 03:08+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
 "Language: zh_TW\n"
@@ -178,6 +178,18 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "碼速率"
 
+msgid "SignalSource"
+msgstr ""
+
+msgid "PilotTones"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Protocol"
 msgstr ""
 
@@ -387,3 +399,9 @@ msgstr "兆位/秒"
 
 msgid "kbit/s"
 msgstr "千字節/秒"
+
+msgid "SISO"
+msgstr ""
+
+msgid "MISO"
+msgstr ""