Updated the APIVERSNUM requirement.

Added missing lithuanian translations

HISTORY

@@ -501,3 +501,21 @@ VDR Plugin 'femon' Revision History
 2014-03-16: Version 2.1.0
 
 - Updated for vdr-2.1.6.
+
+2014-05-10: Version 2.1.1
+
+- Fixed the channel frequency value.
+
+2015-01-10: Version 2.1.2
+
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================
+
+2015-02-19: Version 2.2.0
+
+- Updated for vdr-2.2.0.
+- Updated CA definitions.
+- Fixed the SVDRP service IP menu item (Thanks to Toerless Eckert).
+- Fixed the detaching of receiver during a channel switch.

femon.c

@@ -14,15 +14,15 @@
 #include "femonservice.h"
 #include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 20106
+#if defined(APIVERSNUM) && APIVERSNUM < 20200
-#error "VDR-2.1.6 API version or greater is required!"
+#error "VDR-2.2.0 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-static const char VERSION[]       = "2.1.0" GITVERSION;
+static const char VERSION[]       = "2.2.0" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -371,7 +371,7 @@ void cMenuFemonSetup::Setup(void)
      Add(new cMenuEditIntItem(tr("SVDRP service port"), &data.svdrpport, 1, 65535));
      help.Append(tr("Define the port number of SVDRP service."));
 
-     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, MaxSvdrpIp, ".1234567890"));
+     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, sizeof(data.svdrpip), ".1234567890"));
      help.Append(tr("Define the IP address of SVDRP service."));
      }
 

femonosd.c

@@ -725,29 +725,28 @@ void cFemonOsd::Show(void)
      }
 
   if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
-     cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
+     if (!strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
-     m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
+        cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
-     if (m_Frontend >= 0) {
+        m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
-        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
+        if (m_Frontend >= 0) {
-           if (!femonConfig.usesvdrp)
+           if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
-              error("cFemonOsd::Show() cannot read frontend info.");
+              if (!femonConfig.usesvdrp)
-           close(m_Frontend);
+                 error("cFemonOsd::Show() cannot read frontend info.");
-           m_Frontend = -1;
+              close(m_Frontend);
-           memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+              m_Frontend = -1;
+              memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+              return;
+              }
+           }
+        else if (femonConfig.usesvdrp) {
+           if (!SvdrpConnect() || !SvdrpTune())
+              return;
+           }
+        else {
+           error("cFemonOsd::Show() cannot open frontend device.");
            return;
            }
         }
-     else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
-        // nop
-        }
-     else if (femonConfig.usesvdrp) {
-        if (!SvdrpConnect() || !SvdrpTune())
-           return;
-        }
-     else {
-        error("cFemonOsd::Show() cannot open frontend device.");
-        return;
-        }
      }
   else
      m_Frontend = -1;
@@ -785,55 +784,60 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool li
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
   const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 
-  if (!liveView || !channelNumber || !channel || channel->Number() != channelNumber)
+  if (!device || !liveView)
      return;
 
-  m_DeviceSource = DEVICESOURCE_DVBAPI;
+  if (!channelNumber) {
-  if (channel) {
+     if (m_Receiver) {
+        m_Receiver->Deactivate();
+        DELETENULL(m_Receiver);
+        }
+     return;
+     }
+
+  if (channel && femonConfig.analyzestream) {
+     m_DeviceSource = DEVICESOURCE_DVBAPI;
      if (channel->IsSourceType('I'))
         m_DeviceSource = DEVICESOURCE_IPTV;
      else if (channel->IsSourceType('V'))
         m_DeviceSource = DEVICESOURCE_PVRINPUT;
-     }
 
-  if (m_Frontend >= 0) {
-     close(m_Frontend);
-     m_Frontend = -1;
-     }
-
-  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
-     cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
-     m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
      if (m_Frontend >= 0) {
-        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
+        close(m_Frontend);
-           if (!femonConfig.usesvdrp)
+        m_Frontend = -1;
-              error("cFemonOsd::ChannelSwitch() cannot read frontend info.");
-           close(m_Frontend);
-           m_Frontend = -1;
-           memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
-           return;
-           }
         }
-     else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
-        // nop
-        }
-     else if (femonConfig.usesvdrp) {
-        if (!SvdrpConnect() || !SvdrpTune())
-           return;
-        }
-     else {
-        error("cFemonOsd::ChannelSwitch() cannot open frontend device.");
-        return;
-        }
-     }
 
-  if (m_Receiver) {
+     if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
-     m_Receiver->Deactivate();
+        if (!strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
-     DELETENULL(m_Receiver);
+           cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
-     }
+           m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
-  if (femonConfig.analyzestream && channel) {
+           if (m_Frontend >= 0) {
-     m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
+              if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+                 if (!femonConfig.usesvdrp)
+                    error("cFemonOsd::ChannelSwitch() cannot read frontend info.");
+                 close(m_Frontend);
+                 m_Frontend = -1;
+                 memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+                 return;
+                 }
+              }
+           else if (femonConfig.usesvdrp) {
+              if (!SvdrpConnect() || !SvdrpTune())
+                 return;
+              }
+           else {
+              error("cFemonOsd::ChannelSwitch() cannot open frontend device.");
+              return;
+              }
+           }
+
+        if (m_Receiver) {
+           m_Receiver->Deactivate();
+           DELETENULL(m_Receiver);
+           }
+        m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
      }
 }
 
@@ -917,7 +921,6 @@ bool cFemonOsd::DeviceSwitch(int direction)
                 }
             // Do the actual switch if valid device found
             if (d && ValidDevice) {
-               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0, true);
                cControl::Shutdown();
                if (NeedsDetachAllReceivers)
                   d->DetachAllReceivers();
@@ -932,11 +935,8 @@ bool cFemonOsd::DeviceSwitch(int direction)
                   }
                else if (d->CamSlot() && !d->CamSlot()->IsDecrypting())
                   d->CamSlot()->Assign(NULL);
-               d->SwitchChannel(channel, true);
+               d->SwitchChannel(channel, false);
-               if (d == cDevice::PrimaryDevice())
-                  d->ForceTransferMode();
                cControl::Launch(new cTransferControl(d, channel));
-               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number(), true);
                return (true);
                }
             }

femontools.c

@@ -32,35 +32,48 @@ static cString getCA(int value)
     case 0x0464:            return cString::sprintf("EuroDec (%X)",          value); // EuroDec
     case 0x0500 ... 0x05FF: return cString::sprintf("Viaccess (%X)",         value); // France Telecom
     case 0x0600 ... 0x06FF: return cString::sprintf("Irdeto (%X)",           value); // Irdeto
-    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // News Datacom
+    case 0x0700 ... 0x07FF: return cString::sprintf("DigiCipher 2 (%X)",     value); // Jerrold/GI/Motorola 4DTV
+    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // NDS
     case 0x0B00 ... 0x0BFF: return cString::sprintf("Conax (%X)",            value); // Norwegian Telekom
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips CryptoTec
     case 0x0E00 ... 0x0EFF: return cString::sprintf("PowerVu (%X)",          value); // Scientific Atlanta
     case 0x1000:            return cString::sprintf("RAS (%X)",              value); // Tandberg Television
     case 0x1200 ... 0x12FF: return cString::sprintf("NagraVision (%X)",      value); // BellVu Express
-    case 0x1700 ... 0x17FF: return cString::sprintf("BetaCrypt (%X)",        value); // BetaTechnik
+    case 0x1700 ... 0x17FF: return cString::sprintf("VCAS (%X)",             value); // Verimatrix Inc. former BetaTechnik
     case 0x1800 ... 0x18FF: return cString::sprintf("NagraVision (%X)",      value); // Kudelski SA
     case 0x22F0:            return cString::sprintf("Codicrypt (%X)",        value); // Scopus Network Technologies
     case 0x2600:            return cString::sprintf("BISS (%X)",             value); // European Broadcasting Union
+    case 0x2719:            return cString::sprintf("VanyaCas (%X)",         value); // S-Curious Research & Technology Pvt. Ltd.
     case 0x4347:            return cString::sprintf("CryptOn (%X)",          value); // CryptOn
     case 0x4800:            return cString::sprintf("Accessgate (%X)",       value); // Telemann
     case 0x4900:            return cString::sprintf("China Crypt (%X)",      value); // CryptoWorks
+    case 0x4A02:            return cString::sprintf("Tongfang (%X)",         value); // Tsinghua Tongfang Company
     case 0x4A10:            return cString::sprintf("EasyCas (%X)",          value); // EasyCas
     case 0x4A20:            return cString::sprintf("AlphaCrypt (%X)",       value); // AlphaCrypt
-    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
     case 0x4A60:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
     case 0x4A61:            return cString::sprintf("Neotioncrypt (%X)",     value); // Neotion
     case 0x4A62:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
     case 0x4A63:            return cString::sprintf("Neotion SHL (%X)",      value); // Neotion
     case 0x4A64 ... 0x4A6F: return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
-    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // TPS
+    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
+    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // Thales Broadcast & Multimedia
     case 0x4AA1:            return cString::sprintf("KeyFly (%X)",           value); // SIDSA
-    case 0x4ABF:            return cString::sprintf("DG-Crypt (%X)",         value); // Beijing Compunicate Technology Inc.
+    case 0x4ABF:            return cString::sprintf("CTI-CAS (%X)",          value); // Beijing Compunicate Technology Inc.
+    case 0x4AC1:            return cString::sprintf("Latens (%X)",           value); // Latens Systems
     case 0x4AD0 ... 0x4AD1: return cString::sprintf("X-Crypt (%X)",          value); // XCrypt Inc.
     case 0x4AD4:            return cString::sprintf("OmniCrypt (%X)",        value); // Widevine Technologies, Inc.
-    case 0x4AE0:            return cString::sprintf("RossCrypt (%X)",        value); // Digi Raum Electronics Co. Ltd.
+    case 0x4AE0 ... 0x4AE1: return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x4AE4:            return cString::sprintf("CoreCrypt (%X)",        value); // CoreTrust
+    case 0x4AE5:            return cString::sprintf("PRO-Crypt (%X)",        value); // IK SATPROF
+    case 0x4AEA:            return cString::sprintf("Cryptoguard (%X)",      value); // Gryptoguard AB
+    case 0x4AEB:            return cString::sprintf("Abel Quintic (%X)",     value); // Abel DRM Systems
+    case 0x4AF0:            return cString::sprintf("ABV (%X)",              value); // Alliance Broadcast Vision
     case 0x5500:            return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
-    case 0x5501:            return cString::sprintf("Griffin (%X)",          value); // Griffin
+    case 0x5501:            return cString::sprintf("Griffin (%X)",          value); // Nucleus Systems Ltd.
+    case 0x5581:            return cString::sprintf("Bulcrypt (%X)",         value); // Bulcrypt
+    case 0x7BE1:            return cString::sprintf("DRE-Crypt (%X)",        value); // DRE-Crypt
+    case 0xA101:            return cString::sprintf("RosCrypt-M (%X)",       value); // NIIR
+    case 0xEAD0:            return cString::sprintf("VanyaCas (%X)",         value); // S-Curious Research & Technology Pvt. Ltd.
     default:                break;
     }
   return cString::sprintf("%X", value);
@@ -524,8 +537,9 @@ cString getAC3DialogLevel(int value)
 
 cString getFrequencyMHz(int value)
 {
-   while (value > 20000) value /= 1000;
+  double freq = value;
-   return cString::sprintf("%d %s", value, tr("MHz"));
+  while (freq > 20000.0) freq /= 1000.0;
+  return cString::sprintf("%s %s", *dtoa(freq, "%lg"), tr("MHz"));
 }
 
 cString getAudioSamplingFreq(int value)

po/de_DE.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"

po/es_ES.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Luis Palacios
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"

po/et_EE.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Arthur Konovalov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"

po/fi_FI.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"

po/fr_FR.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nicolas Huillard
 # Michaël Nival <mnival@club-internet.fr>, 2010
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"

po/hu_HU.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # F<>ley Istv<74>n <ifuley at tigercomp dot ro>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: F<>ley Istv<74>n <ifuley at tigercomp dot ro>\n"
 "Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
 "Language: hu\n"

po/it_IT.po

@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Sean Carlos
 # Diego Pierotto <vdr-italian@tiscali.it>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"

po/lt_LT.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Valdemaras Pipiras
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "DVB signalo informacijos stebėjimas (OSD)"
+msgstr "DVB signalo stebėjimas (OSD)"
 
 msgid "Signal Information"
 msgstr "Signalo informacija"
@@ -47,7 +47,7 @@ msgid "ST:TNG"
 msgstr "ST:TNG"
 
 msgid "DeepBlue"
-msgstr "DeepBlue"
+msgstr "Tamsiai mėlyna"
 
 msgid "Moronimo"
 msgstr "Moronimo"
@@ -62,7 +62,7 @@ msgid "Duotone"
 msgstr "Duotone"
 
 msgid "SilverGreen"
-msgstr "SilverGreen"
+msgstr "Sidabro žalia"
 
 msgid "PearlHD"
 msgstr "PearlHD"
@@ -92,10 +92,10 @@ msgid "Define the position of OSD."
 msgstr "Nustatyti ekrano užsklandos poziciją."
 
 msgid "Downscale OSD size [%]"
-msgstr ""
+msgstr "Sumažinti ekrano užsklandos (OSD) dydį [%]"
 
 msgid "Define the downscale ratio for OSD size."
-msgstr ""
+msgstr "Nustatyti ekrano užsklandos (OSD) mažinimo santykį."
 
 msgid "Red limit [%]"
 msgstr "Raudonoji ribą [%]"
@@ -179,7 +179,7 @@ msgid "Coderate"
 msgstr "Kodavimo dažnis"
 
 msgid "Protocol"
-msgstr ""
+msgstr "Protokolas"
 
 msgid "Bitrate"
 msgstr "Kokybė"
@@ -209,7 +209,7 @@ msgid "Audio Stream"
 msgstr "Audio srautas"
 
 msgid "Channel Mode"
-msgstr "kanalo būsena"
+msgstr "Kanalo būsena"
 
 msgid "Sampling Frequency"
 msgstr "Parodomasis dažnis"
@@ -218,13 +218,13 @@ msgid "AC-3 Stream"
 msgstr "AC-3 srautas"
 
 msgid "Bit Stream Mode"
-msgstr "Bitstream būsena"
+msgstr "Srauto būsena"
 
 msgid "Audio Coding Mode"
 msgstr "Audio kodavimas"
 
 msgid "Center Mix Level"
-msgstr "Centerinis Mix lygis"
+msgstr "Centrinis mikserio lygis"
 
 msgid "Surround Mix Level"
 msgstr "Surround Mix lygis"
@@ -239,10 +239,10 @@ msgid "Dialogue Normalization"
 msgstr "Dialogo normalizacija"
 
 msgid "Fixed"
-msgstr "Fest"
+msgstr "Sutvarkyta"
 
 msgid "Analog"
-msgstr "Analog"
+msgstr "Analoginis"
 
 msgid "MPEG-2"
 msgstr "MPEG-2"
@@ -293,7 +293,7 @@ msgid "progressive"
 msgstr "progresyvinis"
 
 msgid "reserved"
-msgstr "belegt"
+msgstr "rezervuota"
 
 msgid "extended"
 msgstr "išplėstas"
@@ -326,22 +326,22 @@ msgid "Music and Effects (ME)"
 msgstr "Muzika ir efektai (ME)"
 
 msgid "Visually Impaired (VI)"
-msgstr " (VI)"
+msgstr "Skirta silpnaregiams (VI)"
 
 msgid "Hearing Impaired (HI)"
-msgstr " (HI)"
+msgstr "Skirta žmoniems su klausos negalia (HI)"
 
 msgid "Dialogue (D)"
 msgstr "Dialogas (D)"
 
 msgid "Commentary (C)"
-msgstr "Komentavimas (C)"
+msgstr "Komentarai (C)"
 
 msgid "Emergency (E)"
 msgstr "Avarinis (E)"
 
 msgid "Voice Over (VO)"
-msgstr "Voice over (VO)"
+msgstr "Įgarsinta (VO)"
 
 msgid "Karaoke"
 msgstr "Karaoke"
@@ -356,10 +356,10 @@ msgid "C"
 msgstr "C"
 
 msgid "L"
-msgstr "L"
+msgstr "K"
 
 msgid "R"
-msgstr "R"
+msgstr "D"
 
 msgid "S"
 msgstr "S"
@@ -380,7 +380,7 @@ msgid "MHz"
 msgstr "MHz"
 
 msgid "free"
-msgstr "frei"
+msgstr "nekoduota"
 
 msgid "Mbit/s"
 msgstr "Mbit/s"

po/ru_RU.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Vyacheslav Dikonov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"

po/sk_SK.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Milan Hrala
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"

po/uk_UA.po

@@ -4,10 +4,10 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"

po/zh_CN.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nan Feng VDR <nfgx@21cn.com>, 2009.2
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "Language: zh_CN\n"

po/zh_TW.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file. 
-# Copyright (C) 2007-2014 Rolf Ahrenberg 
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package. 
 # Nan Feng VDR <nfgx@21cn.com>, 2009.2 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.1.0\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
-"PO-Revision-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
 "Language: zh_TW\n"