Updated HISTORY for the release.

Fixed a crash if no channel available (Thanks to Winfried Köhler)

.gitignore

@@ -0,0 +1,6 @@
+.dependencies
+*.o
+*.so
+*~
+po/*.pot
+po/*.mo

HISTORY

@@ -76,7 +76,7 @@ VDR Plugin 'femon' Revision History
 - Added "Stream Information" display mode.
   Toggle between different modes with 'OK' key:
   .-> basic -> transponder -> stream -.
-  `-----------------------------------<EFBFBD>
+  `-----------------------------------'
 - Added missing german translations (Thanks to Peter Marquardt).
 
 2004-06-06: Version 0.1.2
@@ -150,7 +150,7 @@ VDR Plugin 'femon' Revision History
 
 2005-04-02: Version 0.8.8
 
-- Cleaned up Finnish translations (Thanks to Ville Skytt<EFBFBD>).
+- Cleaned up Finnish translations (Thanks to Ville Skyttä).
 
 2005-04-04: Version 0.8.9
 
@@ -193,7 +193,7 @@ VDR Plugin 'femon' Revision History
 - Modified femon service without incrementing version number.
 - Added "Duotone" theme for 2bpp on screen displays.
 - Fixed crash bug in femonreceiver.
-- Fixed setup page bug (Thanks to Thomas G<EFBFBD>nther for reporting this one).
+- Fixed setup page bug (Thanks to Thomas Günther for reporting this one).
 
 2006-01-25: Version 0.9.6
 
@@ -220,7 +220,7 @@ VDR Plugin 'femon' Revision History
 
 2006-04-23: Version 0.9.10
 
-- Added STRIP option for Makefile (Thanks to Ville Skytt<EFBFBD>).
+- Added STRIP option for Makefile (Thanks to Ville Skyttä).
 - Modified APIVERSION code in Makefile.
 
 2006-04-30: Version 1.0.0
@@ -237,7 +237,7 @@ VDR Plugin 'femon' Revision History
 2006-09-17: Version 1.1.0
 
 - Added support for svdrpservice plugin (Thanks to Frank Schmirler).
-- Added INFO SVDRP command (partially based on patch by Herbert P<EFBFBD>tzl).
+- Added INFO SVDRP command (partially based on patch by Herbert Pötzl).
 - Removed system log option - use SVDRP instead.
 - Added --remove-destination to the 'cp' command in Makefile.
 
@@ -247,7 +247,7 @@ VDR Plugin 'femon' Revision History
 
 2007-05-01: Version 1.1.2
 
-- Fixed opening while replaying (Thanks to Antti Sepp<EFBFBD>l<EFBFBD> for reporting this one).
+- Fixed opening while replaying (Thanks to Antti Seppälä for reporting this one).
 
 2007-05-15: Version 1.1.3
 
@@ -259,7 +259,7 @@ VDR Plugin 'femon' Revision History
 
 2008-01-20: Version 1.1.5
 
-- Updated Italian translation (Thanks to Gringo).
+- Updated Italian translation (Thanks to Diego Pierotto).
 - Added '-Wno-parentheses' to the compiler options.
 
 2007-08-14: Version 1.2.0
@@ -277,13 +277,29 @@ VDR Plugin 'femon' Revision History
 
 2008-01-20: Version 1.2.3
 
-- Updated Italian translation (Thanks to Gringo).
+- Updated Italian translation (Thanks to Diego Pierotto).
 - Added '-Wno-parentheses' to the compiler options.
 - Mapped 'kInfo' as help key in setup menu.
 
 2008-02-18: Version 1.2.4
 
 - Replaced asprintf with cString.
-- Updated French translation (Thanks to Micha<EFBFBD>l Nival).
+- Updated French translation (Thanks to Michaël Nival).
 - Fixed service call with null data.
 - Added setup option to use a single 8 bpp OSD area.
+
+2008-03-27: Version 1.6.0
+
+- Updated for vdr-1.6.0.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Added ST:TNG theme (Thanks to Fabian Förg).
+
+2008-06-20: Version 1.6.1
+
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Fixed a crash if no channel available (Thanks to Winfried Köhler)
+
+2008-10-12: Version 1.6.2
+
+- Converted HISTORY and fi_FI.po to UTF-8.
+- Optimized receiver and OSD thread termination.

femon.c

@@ -15,11 +15,11 @@
 #include "femonservice.h"
 #include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10508
-#error "VDR-1.5.8 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.2.4";
+static const char VERSION[]       = "1.6.2";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -98,8 +98,8 @@ cOsdObject *cPluginFemon::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  if (cReplayControl::NowReplaying())
-     Skins.Message(mtInfo, tr("Femon not available while replaying"));
+  if (cReplayControl::NowReplaying() || (Channels.Count() <= 0))
+     Skins.Message(mtInfo, tr("Femon not available"));
   else
      return cFemonOsd::Instance(true);
   return NULL;
@@ -290,6 +290,7 @@ cMenuFemonSetup::cMenuFemonSetup(void)
 
   themes[eFemonThemeClassic]       = tr("Classic");
   themes[eFemonThemeElchi]         = tr("Elchi");
+  themes[eFemonThemeSTTNG]         = tr("ST:TNG");
   themes[eFemonThemeDeepBlue]      = tr("DeepBlue");
   themes[eFemonThemeMoronimo]      = tr("Moronimo");
   themes[eFemonThemeEnigma]        = tr("Enigma");

femoncfg.c

@@ -62,6 +62,18 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
     0xFFFFEE00, // clrYellow
     0xFF33CC33, // clrGreen
   },
+  {
+    // eFemonThemeSTTNG
+    4,          // bpp
+    0x7F000000, // clrBackground
+    0xFFFCC024, // clrTitleBackground
+    0xFF000000, // clrTitleText
+    0xFF00FCFC, // clrActiveText
+    0xFFFCC024, // clrInactiveText
+    0xFFFC1414, // clrRed
+    0xFFFCC024, // clrYellow
+    0xFF24FC24, // clrGreen
+  },
   {
     // eFemonThemeDeepBlue
     4,          // bpp

femoncfg.h

@@ -56,6 +56,7 @@ enum eFemonThemes
 {
   eFemonThemeClassic,
   eFemonThemeElchi,
+  eFemonThemeSTTNG,
   eFemonThemeDeepBlue,
   eFemonThemeMoronimo,
   eFemonThemeEnigma,

femonosd.c

@@ -128,6 +128,7 @@ cFemonOsd::cFemonOsd()
 cFemonOsd::~cFemonOsd(void)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  m_Sleep.Signal();
   if (Running())
      Cancel(3);
   if (m_SvdrpConnection.handle >= 0) {
@@ -155,7 +156,7 @@ void cFemonOsd::DrawStatusWindow(void)
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 
-  if (m_Osd) {
+  if (m_Osd && channel) {
      m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), femonTheme[femonConfig.theme].clrBackground);
      m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
      m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), *cString::sprintf("%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true)), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
@@ -298,7 +299,7 @@ void cFemonOsd::DrawInfoWindow(void)
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
 
-  if (m_Osd) {
+  if (m_Osd && channel) {
      if (m_DisplayMode == eFemonModeTransponder) {
         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
@@ -557,7 +558,7 @@ void cFemonOsd::Action(void)
        DrawInfoWindow();
        DrawStatusWindow();
        }
-    cCondWait::SleepMs(100 * femonConfig.updateinterval - t.Elapsed());
+    m_Sleep.Wait(max((int)(100 * femonConfig.updateinterval - t.Elapsed()), 3));
     }
 }
 
@@ -605,10 +606,12 @@ void cFemonOsd::Show(void)
         delete m_Receiver;
      if (femonConfig.analyzestream) {
         cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
-        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
-        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        if (channel) {
+           IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+           IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+           m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
+           cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+           }
         }
      Start();
      }
@@ -646,10 +649,12 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
      delete m_Receiver;
   if (femonConfig.analyzestream) {
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
-     IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-     m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     if (channel) {
+        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
      }
 }
 
@@ -663,10 +668,12 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
      delete m_Receiver;
   if (femonConfig.analyzestream) {
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
-     IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-     m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     if (channel) {
+        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
      }
 }
 
@@ -677,25 +684,27 @@ bool cFemonOsd::DeviceSwitch(int direction)
   direction = sgn(direction);
   if (device >= 0) {
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
-        if (direction) {
-           if (++device >= cDevice::NumDevices())
-              device = 0;
-           }
-        else {
-           if (--device < 0)
-              device = cDevice::NumDevices() - 1;
-           }
-        if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
-           Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
-           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
-           cControl::Shutdown();
-           cDevice::GetDevice(device)->SwitchChannel(channel, true);
-           if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
-              cDevice::GetDevice(device)->ForceTransferMode();
-           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
-           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
-           return (true);
+     if (channel) {
+        for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
+           if (direction) {
+              if (++device >= cDevice::NumDevices())
+                 device = 0;
+              }
+           else {
+              if (--device < 0)
+                 device = cDevice::NumDevices() - 1;
+              }
+           if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
+              Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+              cControl::Shutdown();
+              cDevice::GetDevice(device)->SwitchChannel(channel, true);
+              if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
+                 cDevice::GetDevice(device)->ForceTransferMode();
+              cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+              return (true);
+              }
            }
         }
      }
@@ -891,10 +900,13 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
                }
             break;
        case kOk:
+            {
             // toggle between display modes
-            if (++m_DisplayMode == eFemonModeAC3 && !Channels.GetByNumber(cDevice::CurrentChannel())->Dpid(0)) m_DisplayMode++;
+            cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+            if (++m_DisplayMode == eFemonModeAC3 && channel && !channel->Dpid(0)) m_DisplayMode++;
             if (m_DisplayMode >= eFemonModeMaxNumber) m_DisplayMode = 0;
             DrawInfoWindow();
+            }
             break;
        default:
             break;

femonosd.h

@@ -46,6 +46,7 @@ private:
   int m_DisplayMode;
   const cFont *m_Font;
   cTimeMs m_InputTime;
+  cCondWait m_Sleep;
   cMutex* m_Mutex;
   static cBitmap bmStereo, bmMonoLeft, bmMonoRight, bmDD, bmDD20, bmDD51;
   static cBitmap bmNumbers[MAX_BMNUMBERS];

femonreceiver.c

@@ -58,6 +58,7 @@ cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[
 cFemonReceiver::~cFemonReceiver(void)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  m_Sleep.Signal();
   if (Running())
      Cancel(3);
   Detach();
@@ -362,6 +363,6 @@ void cFemonReceiver::Action(void)
         m_AudioPacketCount = 0;
         m_AC3Bitrate   = (10.0 * 8.0 * 184.0 * m_AC3PacketCount)   / femonConfig.calcinterval;
         m_AC3PacketCount = 0;
-        cCondWait::SleepMs(100 * femonConfig.calcinterval - t.Elapsed());
+        m_Sleep.Wait(max((int)(100 * femonConfig.calcinterval - t.Elapsed()), 3));
     }
 }

femonreceiver.h

@@ -47,7 +47,7 @@ enum eDolbySurroundMode {
   DSM_RESERVED          = 3,
   };
 
-enum eReveiverCodes {
+enum eReceiverCodes {
   FR_RESERVED = -1,
   FR_FREE     = -2,
   FR_NOTVALID = -3
@@ -55,40 +55,41 @@ enum eReveiverCodes {
 
 class cFemonReceiver : public cReceiver, public cThread {
 private:
-  int    m_VideoPid;
-  int    m_AudioPid;
-  int    m_AC3Pid;
-  bool   m_VideoValid;
-  int    m_VideoPacketCount;
-  int    m_VideoHorizontalSize;
-  int    m_VideoVerticalSize;
-  int    m_VideoAspectRatio;
-  int    m_VideoFormat;
-  double m_VideoFrameRate;
-  double m_VideoStreamBitrate;
-  double m_VideoBitrate;
-  bool   m_AudioValid;
-  int    m_AudioPacketCount;
-  double m_AudioStreamBitrate;
-  double m_AudioBitrate;
-  int    m_AudioSamplingFreq;
-  int    m_AudioMPEGLayer;
-  bool   m_AC3Valid;
-  int    m_AC3PacketCount;
-  double m_AC3Bitrate;
-  int    m_AC3FrameSize;
-  int    m_AC3SamplingFreq;
-  int    m_AC3StreamBitrate;
-  int    m_AC3BitStreamMode;
-  int    m_AC3AudioCodingMode;
-  int    m_AC3CenterMixLevel;
-  int    m_AC3SurroundMixLevel;
-  int    m_AC3DolbySurroundMode;
-  bool   m_AC3LfeOn;
-  int    m_AC3DialogLevel;  
-  void   GetVideoInfo(uint8_t *mbuf, int count);
-  void   GetAudioInfo(uint8_t *mbuf, int count);
-  void   GetAC3Info(uint8_t *mbuf, int count);
+  cCondWait m_Sleep;
+  int       m_VideoPid;
+  int       m_AudioPid;
+  int       m_AC3Pid;
+  bool      m_VideoValid;
+  int       m_VideoPacketCount;
+  int       m_VideoHorizontalSize;
+  int       m_VideoVerticalSize;
+  int       m_VideoAspectRatio;
+  int       m_VideoFormat;
+  double    m_VideoFrameRate;
+  double    m_VideoStreamBitrate;
+  double    m_VideoBitrate;
+  bool      m_AudioValid;
+  int       m_AudioPacketCount;
+  double    m_AudioStreamBitrate;
+  double    m_AudioBitrate;
+  int       m_AudioSamplingFreq;
+  int       m_AudioMPEGLayer;
+  bool      m_AC3Valid;
+  int       m_AC3PacketCount;
+  double    m_AC3Bitrate;
+  int       m_AC3FrameSize;
+  int       m_AC3SamplingFreq;
+  int       m_AC3StreamBitrate;
+  int       m_AC3BitStreamMode;
+  int       m_AC3AudioCodingMode;
+  int       m_AC3CenterMixLevel;
+  int       m_AC3SurroundMixLevel;
+  int       m_AC3DolbySurroundMode;
+  bool      m_AC3LfeOn;
+  int       m_AC3DialogLevel;  
+  void      GetVideoInfo(uint8_t *mbuf, int count);
+  void      GetAudioInfo(uint8_t *mbuf, int count);
+  void      GetAC3Info(uint8_t *mbuf, int count);
 
 protected:
   virtual void Activate(bool On);

po/de_DE.po

@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-03-23 14:53+0100\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -23,8 +23,8 @@ msgstr "DVB Signal Informationsanzeige (OSD)"
 msgid "Signal Information"
 msgstr "Signalinformationen"
 
-msgid "Femon not available while replaying"
-msgstr "Femon w<EFBFBD>hrend Wiedergabe nicht verf<72>gbar"
+msgid "Femon not available"
+msgstr "Femon nicht verf<72>gbar"
 
 msgid "basic"
 msgstr "Standard"
@@ -44,6 +44,9 @@ msgstr "Klassischer"
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"
 

po/es_ES.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-03-23 14:42+0100\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -21,7 +21,7 @@ msgstr "Monitorizaci
 msgid "Signal Information"
 msgstr "Monitorizaci<63>n de la se<73>al DVB"
 
-msgid "Femon not available while replaying"
+msgid "Femon not available"
 msgstr ""
 
 msgid "basic"
@@ -42,6 +42,9 @@ msgstr "Cl
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"
 

po/et_EE.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-03-23 14:42+0100\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -21,7 +21,7 @@ msgstr "DVB Signaalmonitor (OSD)"
 msgid "Signal Information"
 msgstr "Signaaliinfo"
 
-msgid "Femon not available while replaying"
+msgid "Femon not available"
 msgstr ""
 
 msgid "basic"
@@ -42,6 +42,9 @@ msgstr "Klassikaline"
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"
 

po/fi_FI.po

@@ -5,14 +5,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-03-23 14:42+0100\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
@@ -21,8 +21,8 @@ msgstr "Signaalimittari (OSD)"
 msgid "Signal Information"
 msgstr "Signaalimittari"
 
-msgid "Femon not available while replaying"
-msgstr "Signaalimittari ei ole k<EFBFBD>ytett<EFBFBD>viss<EFBFBD> toiston aikana"
+msgid "Femon not available"
+msgstr "Signaalimittari ei ole käytettävissä"
 
 msgid "basic"
 msgstr "perus"
@@ -31,7 +31,7 @@ msgid "transponder"
 msgstr "transponderi"
 
 msgid "stream"
-msgstr "l<EFBFBD>hete"
+msgstr "lähete"
 
 msgid "AC-3"
 msgstr "AC-3"
@@ -42,6 +42,9 @@ msgstr "Klassinen"
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"
 
@@ -61,103 +64,103 @@ msgid "SilverGreen"
 msgstr "SilverGreen"
 
 msgid "Hide main menu entry"
-msgstr "Piilota valinta p<EFBFBD><EFBFBD>valikosta"
+msgstr "Piilota valinta päävalikosta"
 
 msgid "Define whether the main menu entry is hidden."
-msgstr "M<EFBFBD><EFBFBD>rittele, n<EFBFBD>ytet<EFBFBD><EFBFBD>nk<EFBFBD> laajennoksen valinta p<EFBFBD><EFBFBD>valikossa."
+msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa."
 
 msgid "Use single area (8bpp)"
-msgstr "K<EFBFBD>yt<EFBFBD> yksitt<EFBFBD>ist<EFBFBD> kuva-aluetta (8bpp)"
+msgstr "Käytä yksittäistä kuva-aluetta (8bpp)"
 
 msgid ""
 "Define whether a single 8bpp OSD area is preferred.\n"
 "\n"
 "Required by Truetype fonts and anti-aliasing."
 msgstr ""
-"M<EFBFBD><EFBFBD>rittele, yritet<EFBFBD><EFBFBD>nk<EFBFBD> k<EFBFBD>ytt<EFBFBD><EFBFBD> yksitt<EFBFBD>ist<EFBFBD> 8bpp kuva-aluetta.\n"
+"Määrittele, yritetäänkö käyttää yksittäistä 8bpp kuva-aluetta.\n"
 "\n"
-"Truetype-kirjasimet ja reunan pehmennys vaativat t<EFBFBD>m<EFBFBD>n asetuksen."
+"Truetype-kirjasimet ja reunan pehmennys vaativat tämän asetuksen."
 
 msgid "Default display mode"
-msgstr "Oletusn<EFBFBD>ytt<EFBFBD>tila"
+msgstr "Oletusnäyttötila"
 
 msgid "Define the default display mode at startup."
-msgstr "M<EFBFBD><EFBFBD>rittele k<EFBFBD>ytett<EFBFBD>v<EFBFBD> n<EFBFBD>ytt<EFBFBD>tila k<EFBFBD>ynnistett<EFBFBD>ess<EFBFBD>."
+msgstr "Määrittele käytettävä näyttötila käynnistettäessä."
 
 msgid "Define the used OSD skin."
-msgstr "M<EFBFBD><EFBFBD>rittele k<EFBFBD>ytett<EFBFBD>v<EFBFBD> ulkoasu n<EFBFBD>yt<EFBFBD>lle."
+msgstr "Määrittele käytettävä ulkoasu näytölle."
 
 msgid "Define the used OSD theme."
-msgstr "M<EFBFBD><EFBFBD>rittele k<EFBFBD>ytett<EFBFBD>v<EFBFBD> v<EFBFBD>riteema n<EFBFBD>yt<EFBFBD>lle."
+msgstr "Määrittele käytettävä väriteema näytölle."
 
 msgid "Position"
 msgstr "Sijainti"
 
 msgid "Define the position of OSD."
-msgstr "M<EFBFBD><EFBFBD>rittele n<EFBFBD>yt<EFBFBD>n sijainti."
+msgstr "Määrittele näytön sijainti."
 
 msgid "Define the height of OSD."
-msgstr "M<EFBFBD><EFBFBD>rittele n<EFBFBD>yt<EFBFBD>n korkeus."
+msgstr "Määrittele näytön korkeus."
 
 msgid "Horizontal offset"
 msgstr "Vaakakeskitys"
 
 msgid "Define the horizontal offset of OSD."
-msgstr "M<EFBFBD><EFBFBD>rittele n<EFBFBD>yt<EFBFBD>n vaakakeskitys."
+msgstr "Määrittele näytön vaakakeskitys."
 
 msgid "Show CA system"
-msgstr "N<EFBFBD>yt<EFBFBD> salausj<EFBFBD>rjestelm<EFBFBD>"
+msgstr "Näytä salausjärjestelmä"
 
 msgid "Define whether the CA system is shown as text."
-msgstr "M<EFBFBD><EFBFBD>rittele, n<EFBFBD>ytet<EFBFBD><EFBFBD>n salausj<EFBFBD>rjestelm<EFBFBD> tekstin<EFBFBD>."
+msgstr "Määrittele, näytetään salausjärjestelmä tekstinä."
 
 msgid "Red limit [%]"
 msgstr "Punaisen taso [%]"
 
 msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "M<EFBFBD><EFBFBD>rittele taso punaiselle palkille, jota k<EFBFBD>ytet<EFBFBD><EFBFBD>n huonon signaalin ilmaisimena."
+msgstr "Määrittele taso punaiselle palkille, jota käytetään huonon signaalin ilmaisimena."
 
 msgid "Green limit [%]"
-msgstr "Vihre<EFBFBD>n taso [%]"
+msgstr "Vihreän taso [%]"
 
 msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "M<EFBFBD><EFBFBD>rittele taso vihre<EFBFBD>lle palkille, jota k<EFBFBD>ytet<EFBFBD><EFBFBD>n hyv<EFBFBD>n signaalin ilmaisimena."
+msgstr "Määrittele taso vihreälle palkille, jota käytetään hyvän signaalin ilmaisimena."
 
 msgid "OSD update interval [0.1s]"
-msgstr "N<EFBFBD>yt<EFBFBD>n p<EFBFBD>ivitysv<EFBFBD>li [0.1s]"
+msgstr "Näytön päivitysväli [0.1s]"
 
 msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "M<EFBFBD><EFBFBD>rittele n<EFBFBD>yt<EFBFBD>nvirkistystaajuus. Mit<EFBFBD> pienempi arvo, sit<EFBFBD> suurempi CPU-kuorma."
+msgstr "Määrittele näytönvirkistystaajuus. Mitä pienempi arvo, sitä suurempi CPU-kuorma."
 
 msgid "Analyze stream"
-msgstr "L<EFBFBD>hetteen analysointi"
+msgstr "Lähetteen analysointi"
 
 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "M<EFBFBD><EFBFBD>rittele, analysoidaanko DVB-l<EFBFBD>hetett<EFBFBD> ja lasketaanko bittinopeuksia."
+msgstr "Määrittele, analysoidaanko DVB-lähetettä ja lasketaanko bittinopeuksia."
 
 msgid "Calculation interval [0.1s]"
-msgstr "Laskennan p<EFBFBD>ivitysv<EFBFBD>li [0.1s]"
+msgstr "Laskennan päivitysväli [0.1s]"
 
 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "M<EFBFBD><EFBFBD>rittele laskentaikkunan koko. Mit<EFBFBD> suurempi laskentaikkuna, sit<EFBFBD> todenmukaisemmat lopputulokset."
+msgstr "Määrittele laskentaikkunan koko. Mitä suurempi laskentaikkuna, sitä todenmukaisemmat lopputulokset."
 
 msgid "Use SVDRP service"
-msgstr "K<EFBFBD>yt<EFBFBD> SVDRP-palvelua"
+msgstr "Käytä SVDRP-palvelua"
 
 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "M<EFBFBD><EFBFBD>rittele k<EFBFBD>ytet<EFBFBD><EFBFBD>nk<EFBFBD> SVDRP-palvelua asiakas/palvelin-kokoonpanoissa."
+msgstr "Määrittele käytetäänkö SVDRP-palvelua asiakas/palvelin-kokoonpanoissa."
 
 msgid "SVDRP service port"
 msgstr "SVDRP-palvelun portti"
 
 msgid "Define the port number of SVDRP service."
-msgstr "M<EFBFBD><EFBFBD>rittele SVDRP-palvelun k<EFBFBD>ytt<EFBFBD>m<EFBFBD> portti."
+msgstr "Määrittele SVDRP-palvelun käyttämä portti."
 
 msgid "SVDRP service IP"
 msgstr "SVDRP-palvelun IP-osoite"
 
 msgid "Define the IP address of SVDRP service."
-msgstr "M<EFBFBD><EFBFBD>rittele SVDRP-palvelun k<EFBFBD>ytt<EFBFBD>m<EFBFBD> IP-osoite."
+msgstr "Määrittele SVDRP-palvelun käyttämä IP-osoite."
 
 msgid "Help"
 msgstr "Opaste"
@@ -166,13 +169,13 @@ msgid "Video"
 msgstr "Kuva"
 
 msgid "Audio"
-msgstr "<EFBFBD><EFBFBD>ni"
+msgstr "Ääni"
 
 msgid "Transponder Information"
 msgstr "Transponderin tiedot"
 
 msgid "Apid"
-msgstr "<EFBFBD><EFBFBD>ni-PID"
+msgstr "Ääni-PID"
 
 msgid "Dpid"
 msgstr "Dolby-PID"
@@ -184,7 +187,7 @@ msgid "Nid"
 msgstr "Verkko-ID"
 
 msgid "Tid"
-msgstr "L<EFBFBD>hete-ID"
+msgstr "Lähete-ID"
 
 msgid "Rid"
 msgstr "Radio-ID"
@@ -202,7 +205,7 @@ msgid "Coderate"
 msgstr "Suojaustaso"
 
 msgid "Stream Information"
-msgstr "L<EFBFBD>hetteen tiedot"
+msgstr "Lähetteen tiedot"
 
 msgid "Video Stream"
 msgstr "Kuvaraita"
@@ -214,7 +217,7 @@ msgid "Aspect Ratio"
 msgstr "Kuvasuhde"
 
 msgid "Frame Rate"
-msgstr "Ruudunp<EFBFBD>ivitystaajuus"
+msgstr "Ruudunpäivitystaajuus"
 
 msgid "Hz"
 msgstr "Hz"
@@ -226,16 +229,16 @@ msgid "Resolution"
 msgstr "Resoluutio"
 
 msgid "Audio Stream"
-msgstr "<EFBFBD><EFBFBD>niraita"
+msgstr "Ääniraita"
 
 msgid "MPEG Layer"
 msgstr "MPEG-taso"
 
 msgid "Sampling Frequency"
-msgstr "N<EFBFBD>ytteenottotaajuus"
+msgstr "Näytteenottotaajuus"
 
 msgid "AC-3 Stream"
-msgstr "AC-3-<EFBFBD><EFBFBD>niraita"
+msgstr "AC-3-ääniraita"
 
 msgid "kHz"
 msgstr "kHz"
@@ -244,10 +247,10 @@ msgid "Frame Size"
 msgstr "Kehyksen koko"
 
 msgid "Bit Stream Mode"
-msgstr "L<EFBFBD>hetteen tyyppi"
+msgstr "Lähetteen tyyppi"
 
 msgid "Audio Coding Mode"
-msgstr "<EFBFBD><EFBFBD>nikoodaus"
+msgstr "Äänikoodaus"
 
 msgid "Center Mix Level"
 msgstr "Keskikanavan taso"
@@ -262,7 +265,7 @@ msgid "Low Frequency Effects"
 msgstr "LFE-kanava"
 
 msgid "on"
-msgstr "p<EFBFBD><EFBFBD>ll<EFBFBD>"
+msgstr "päällä"
 
 msgid "off"
 msgstr "poissa"
@@ -271,7 +274,7 @@ msgid "Dialogue Normalization"
 msgstr "Dialogin normalisointi"
 
 msgid "Fixed"
-msgstr "kiinte<EFBFBD>"
+msgstr "kiinteä"
 
 msgid "Analog"
 msgstr "analoginen"
@@ -328,13 +331,13 @@ msgid "NTSC"
 msgstr "NTSC"
 
 msgid "Complete Main (CM)"
-msgstr "P<EFBFBD><EFBFBD>asiallinen (CM)"
+msgstr "Pääasiallinen (CM)"
 
 msgid "Music and Effects (ME)"
 msgstr "Musiikki ja tehosteet (ME)"
 
 msgid "Visually Impaired (VI)"
-msgstr "N<EFBFBD>k<EFBFBD>rajoitteinen (VI)"
+msgstr "Näkörajoitteinen (VI)"
 
 msgid "Hearing Impaired (HI)"
 msgstr "Kuulorajoitteinen (HI)"
@@ -346,10 +349,10 @@ msgid "Commentary (C)"
 msgstr "Kommentointi (C)"
 
 msgid "Emergency (E)"
-msgstr "H<EFBFBD>t<EFBFBD>tiedote (E)"
+msgstr "Hätätiedote (E)"
 
 msgid "Voice Over (VO)"
-msgstr "P<EFBFBD><EFBFBD>lle puhuttu (VO)"
+msgstr "Päälle puhuttu (VO)"
 
 msgid "Karaoke"
 msgstr "Karaoke"

po/fr_FR.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-03-23 14:42+0100\n"
 "PO-Revision-Date: 2008-01-26 09:59+0100\n"
 "Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -21,8 +21,8 @@ msgstr "Affiche les informations du signal DVB"
 msgid "Signal Information"
 msgstr "Signal DVB"
 
-msgid "Femon not available while replaying"
-msgstr "Femon n'est pas disponible lors de la lecture"
+msgid "Femon not available"
+msgstr "Femon n'est pas disponible"
 
 msgid "basic"
 msgstr "basique"
@@ -42,6 +42,9 @@ msgstr "Classique"
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"
 

po/it_IT.po

@@ -2,28 +2,28 @@
 # Copyright (C) 2007 Rolf Ahrenberg
 # This file is distributed under the same license as the VDR package.
 # Sean Carlos
-# Gringo <vdr-italian@tiscali.it>
+# Diego Pierotto <vdr-italian@tiscali.it>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-02-16 01:01+0200\n"
-"PO-Revision-Date: 2007-12-26 19:38+0100\n"
-"Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2008-04-17 00:18+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "Visualizza informazioni segnale DVB"
+msgstr "Mostra info segnale DVB (OSD)"
 
 msgid "Signal Information"
-msgstr "Informazioni segnale"
+msgstr "Info segnale"
 
-msgid "Femon not available while replaying"
-msgstr "Femon non disponibile durante la riproduzione"
+msgid "Femon not available"
+msgstr "Femon non disponibile"
 
 msgid "basic"
 msgstr "base"
@@ -43,6 +43,9 @@ msgstr "Classico"
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"
 
@@ -65,7 +68,7 @@ msgid "Hide main menu entry"
 msgstr "Nascondi voce menu principale"
 
 msgid "Define whether the main menu entry is hidden."
-msgstr ""
+msgstr "Definisci se la voce del menu principale <20> nascosta."
 
 msgid "Use single area (8bpp)"
 msgstr "Utilizza area singola (8bpp)"
@@ -75,87 +78,90 @@ msgid ""
 "\n"
 "Required by Truetype fonts and anti-aliasing."
 msgstr ""
+"Definisci se <20> preferita un'area OSD singola a 8bpp.\n"
+"\n"
+"Richiesto dai caratteri Truetype e anti-aliasing."
 
 msgid "Default display mode"
-msgstr "Modalit<69> visualizz. standard"
+msgstr "Modalit<69> visualizz. predefinita"
 
 msgid "Define the default display mode at startup."
-msgstr ""
+msgstr "Definisci la modalit<69> di visualizz. predefinita all'avvio."
 
 msgid "Define the used OSD skin."
-msgstr ""
+msgstr "Definisci lo stile interfaccia OSD utilizzato."
 
 msgid "Define the used OSD theme."
-msgstr ""
+msgstr "Definisci il tema OSD utilizzato."
 
 msgid "Position"
 msgstr "Posizione"
 
 msgid "Define the position of OSD."
-msgstr ""
+msgstr "Definisci la posizione dell'OSD."
 
 msgid "Define the height of OSD."
-msgstr ""
+msgstr "Definisci l'altezza dell'OSD."
 
 msgid "Horizontal offset"
 msgstr "Limite orizzontale"
 
 msgid "Define the horizontal offset of OSD."
-msgstr ""
+msgstr "Definisci il limite orizzontale dell'OSD."
 
 msgid "Show CA system"
 msgstr "Mostra sistema CA"
 
 msgid "Define whether the CA system is shown as text."
-msgstr ""
+msgstr "Definisci se il sistema CA viene mostrato come testo."
 
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"
 
 msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr ""
+msgstr "Definisci un limite per la barra rossa, usata per indicare un cattivo segnale."
 
 msgid "Green limit [%]"
 msgstr "Limite verde [%]"
 
 msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr ""
+msgstr "Definisci un limite per la barra verde, usata per indicare un buon segnale."
 
 msgid "OSD update interval [0.1s]"
-msgstr "Intervallo aggiornamento OSD [0.1s]"
+msgstr "Intervallo agg. OSD [0.1s]"
 
 msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr ""
+msgstr "Definisci un intervallo per gli agg. OSD. Pi<50> piccolo <20> l'intervallo maggiore sar<61> l'uso di CPU."
 
 msgid "Analyze stream"
 msgstr "Analizza flusso"
 
 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr ""
+msgstr "Definisci se il flusso DVB <20> analizzato e i bitrate calcolati."
 
 msgid "Calculation interval [0.1s]"
-msgstr "Intervallo calcolo [0.1s]"
+msgstr "Intervallo di calcolo [0.1s]"
 
 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr ""
+msgstr "Definisci un intervallo di calcolo. L'intervallo pi<70> grande genera valori pi<70> stabili."
 
 msgid "Use SVDRP service"
 msgstr "Utilizza servizio SVDRP"
 
 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr ""
+msgstr "Definisci se il servizio SVDRP viene usato nelle opzioni client/server."
 
 msgid "SVDRP service port"
 msgstr "Porta servizio SVDRP"
 
 msgid "Define the port number of SVDRP service."
-msgstr ""
+msgstr "Definisci il numero di porta del servizio SVDRP."
 
 msgid "SVDRP service IP"
 msgstr "IP servizio SVDRP"
 
 msgid "Define the IP address of SVDRP service."
-msgstr ""
+msgstr "Definisci l'indirizzo IP del servizio SVDRP."
 
 msgid "Help"
 msgstr "Aiuto"
@@ -170,10 +176,10 @@ msgid "Transponder Information"
 msgstr "Informazioni transponder"
 
 msgid "Apid"
-msgstr "Apid"
+msgstr "PID Audio"
 
 msgid "Dpid"
-msgstr "Dpid"
+msgstr "PID AC3"
 
 msgid "Spid"
 msgstr "Spid"
@@ -188,7 +194,7 @@ msgid "Rid"
 msgstr "Rid"
 
 msgid "Satellite Card"
-msgstr "Scheda satellitare"
+msgstr "Scheda satellite"
 
 msgid "Cable Card"
 msgstr "Scheda via cavo"
@@ -200,7 +206,7 @@ msgid "Coderate"
 msgstr "Coderate"
 
 msgid "Stream Information"
-msgstr "Informazione flusso"
+msgstr "Informazioni flusso"
 
 msgid "Video Stream"
 msgstr "Flusso video"
@@ -209,7 +215,7 @@ msgid "Bitrate"
 msgstr "Bitrate"
 
 msgid "Aspect Ratio"
-msgstr "Dimensione immagine"
+msgstr "Formato immagine"
 
 msgid "Frame Rate"
 msgstr "Frame rate"
@@ -305,10 +311,10 @@ msgid "SkyCrypt"
 msgstr "SkyCrypt"
 
 msgid "none"
-msgstr "Nessuno"
+msgstr "nessuna"
 
 msgid "auto"
-msgstr "Auto"
+msgstr "auto"
 
 msgid "MHz"
 msgstr "MHz"
@@ -326,19 +332,19 @@ msgid "NTSC"
 msgstr "NTSC"
 
 msgid "Complete Main (CM)"
-msgstr "Principale (CM)"
+msgstr "Principale (P)"
 
 msgid "Music and Effects (ME)"
 msgstr "Musica ed effetti (ME)"
 
 msgid "Visually Impaired (VI)"
-msgstr "Immagine alterata (VI)"
+msgstr "Non vedenti (NV)"
 
 msgid "Hearing Impaired (HI)"
-msgstr "Suono deteriorato (HI)"
+msgstr "Non udenti (NU)"
 
 msgid "Dialogue (D)"
-msgstr "Dialogo (D)"
+msgstr "Dialogui (D)"
 
 msgid "Commentary (C)"
 msgstr "Commenti (C)"
@@ -347,7 +353,7 @@ msgid "Emergency (E)"
 msgstr "Emergenza (E)"
 
 msgid "Voice Over (VO)"
-msgstr "Voce off (VO)"
+msgstr "Voce su (VS)"
 
 msgid "Karaoke"
 msgstr "Karaoke"
@@ -390,3 +396,4 @@ msgstr "Mbit/s"
 
 msgid "kbit/s"
 msgstr "kbit/s"
+

po/ru_RU.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.2.4\n"
+"Project-Id-Version: femon 1.6.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-03-23 14:42+0100\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -21,7 +21,7 @@ msgstr "
 msgid "Signal Information"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-msgid "Femon not available while replaying"
+msgid "Femon not available"
 msgstr ""
 
 msgid "basic"
@@ -42,6 +42,9 @@ msgstr ""
 msgid "Elchi"
 msgstr "Elchi"
 
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"