Added Spids support.

Minor OSD layout changes.
Updated for vdr-1.5.8.
2023-10-10 11:36:53 +00:00 · 2007-10-14 04:20:00 +03:00 · 2007-08-19 04:20:00 +03:00
17 changed files with 180 additions and 1565 deletions
--- a/13
+++ b/13
@@ -253,6 +253,19 @@ VDR Plugin 'femon' Revision History

 - Fixed a race condition in cFemonReceiver (Thanks to Reinhard Nissl).

+2007-10-14: Version 1.1.4
+
+- Backported from 1.2.2.
+
 2007-08-14: Version 1.2.0

 - Updated for vdr-1.5.7.
+
+2007-08-19: Version 1.2.1
+
+- Updated for vdr-1.5.8.
+
+2007-10-14: Version 1.2.2
+
+- Added Spids support.
+- Minor OSD layout changes.
--- a/14
+++ b/14
@@ -67,6 +67,10 @@ all-redirect: all

 OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o

+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
 ### Implicit rules:

 %.o: %.c
@@ -94,22 +98,20 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<

 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $(wildcard *.c)

 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<

-i18n: $(I18Nmo)
+i18n: $(I18Npot) $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
 	    done

 ### Targets:

-all: libvdr-$(PLUGIN).so i18n
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
--- a/3
+++ b/3
@@ -1,6 +1,7 @@
 This is a DVB Frontend Status Monitor plugin for the Video Disk Recorder (VDR).

-Written by:                  R o l f . A h r e n b e r g @ s c i . f i
+Written by:                  Rolf Ahrenberg
+                             < R o l f . A h r e n b e r g @ s c i . f i >

 Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/femon/

--- a/femon.c
+++ b/femon.c
@@ -14,11 +14,11 @@
 #include "femonservice.h"
 #include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-#error "VDR-1.5.7 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10508
+#error "VDR-1.5.8 API version or greater is required!"
 #endif

-static const char VERSION[]       = "1.2.0";
+static const char VERSION[]       = "1.2.2";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");

@@ -301,18 +301,18 @@ void cMenuFemonSetup::Setup(void)
  int current = Current();

  Clear();
-  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &data.hidemenu,       tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &data.hidemenu));
  Add(new cMenuEditStraItem(  tr("Default display mode"),        &data.displaymode,    eFemonModeMaxNumber, dispmodes));
-  Add(new cMenuEditStraItem(  tr("Skin"),                        &data.skin,           eFemonSkinMaxNumber, skins));
-  Add(new cMenuEditStraItem(  tr("Theme"),                       &data.theme,          eFemonThemeMaxNumber,themes));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &data.position,       tr("bottom"),        tr("top")));
-  Add(new cMenuEditIntItem(   tr("Height"),                      &data.osdheight,      400,                 500));
+  Add(new cMenuEditStraItem(  trVDR("Setup.OSD$Skin"),           &data.skin,           eFemonSkinMaxNumber, skins));
+  Add(new cMenuEditStraItem(  trVDR("Setup.OSD$Theme"),          &data.theme,          eFemonThemeMaxNumber,themes));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &data.position,       trVDR("bottom"),     trVDR("top")));
+  Add(new cMenuEditIntItem(   trVDR("Setup.OSD$Height"),         &data.osdheight,      400,                 500));
  Add(new cMenuEditIntItem(   tr("Horizontal offset"),           &data.osdoffset,      -50,                 50));
-  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &data.showcasystem,   tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &data.showcasystem));
  Add(new cMenuEditIntItem(   tr("Red limit [%]"),               &data.redlimit,       1,                   50));
  Add(new cMenuEditIntItem(   tr("Green limit [%]"),             &data.greenlimit,     51,                  100));
  Add(new cMenuEditIntItem(   tr("OSD update interval [0.1s]"),  &data.updateinterval, 1,                   100));
-  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &data.analyzestream,  tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &data.analyzestream));
  if (femonConfig.analyzestream)
     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &data.calcinterval,   1,                   100));
  Add(new cMenuEditBoolItem(  tr("Use SVDRP service"),           &data.usesvdrp));
--- a/femonclient/vdr-femonclient-0.0.2.tgz
+++ b/femonclient/vdr-femonclient-0.0.2.tgz
--- a/femonclient/vdr-femonclient-0.0.3.tgz
+++ b/femonclient/vdr-femonclient-0.0.3.tgz
--- a/femonosd.c
+++ b/femonosd.c
@@ -43,7 +43,7 @@
 #define OSDHEIGHT                 femonConfig.osdheight   // in pixels
 #define OSDWIDTH                  600                     // in pixels
 #define OSDROWHEIGHT              m_Font->Height()        // in pixels
-#define OSDINFOHEIGHT             (OSDROWHEIGHT * 11)     // in pixels (11 rows)
+#define OSDINFOHEIGHT             (OSDROWHEIGHT * 12)     // in pixels (12 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSPACING                5
 #define OSDCORNERING              10
@@ -308,9 +308,9 @@ void cFemonOsd::DrawInfoWindow(void)
           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
           }
        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Vpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Vpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Ppid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Ppid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        offset += OSDROWHEIGHT;
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
@@ -318,12 +318,12 @@ void cFemonOsd::DrawInfoWindow(void)
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getDpids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getCAids(channel, femonConfig.showcasystem), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Spid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getSpids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Tpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Tpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Sid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Sid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Nid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
@@ -333,66 +333,69 @@ void cFemonOsd::DrawInfoWindow(void)
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Rid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        offset += OSDROWHEIGHT;
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("CA"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getCAids(channel, femonConfig.showcasystem), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+        offset += OSDROWHEIGHT;
        switch (m_FrontendInfo.type) {
          case FE_QPSK:
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s #%d - %s", tr("Satellite Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getFrequencyMHz(channel->Frequency()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Source"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cSource::ToString(channel->Source()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Srate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Srate()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Polarization"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%c", toupper(channel->Polarization())), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getInversion(channel->Inversion()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getCoderate(channel->CoderateH()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               break;

          case FE_QAM:
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s #%d - %s", tr("Cable Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getFrequencyMHz(channel->Frequency()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Source"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cSource::ToString(channel->Source()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Srate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Srate()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getModulation(channel->Modulation()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getInversion(channel->Inversion()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getCoderate(channel->CoderateH()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               break;

          case FE_OFDM:
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s #%d - %s", tr("Terrestrial Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getFrequencyMHz(channel->Frequency()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Transmission"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getTransmission(channel->Transmission()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Bandwidth"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getBandwidth(channel->Bandwidth()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getModulation(channel->Modulation()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getInversion(channel->Inversion()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Coderate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%s (H) %s (L)", *getCoderate(channel->CoderateH()), *getCoderate(channel->CoderateL())), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Hierarchy"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getHierarchy(channel->Hierarchy()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Guard"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getGuard(channel->Guard()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               break;

@@ -431,6 +434,7 @@ void cFemonOsd::DrawInfoWindow(void)
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), m_Receiver ? *cString::sprintf("%d x %d", m_Receiver->VideoHorizontalSize(), m_Receiver->VideoVerticalSize()) : *cString::sprintf("---"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        offset += OSDROWHEIGHT;
+        offset += OSDROWHEIGHT;
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("#%d %s", IS_AUDIO_TRACK(track) ? channel->Apid(int(track - ttAudioFirst)) : channel->Apid(0), IS_AUDIO_TRACK(track) ? channel->Alang(int(track - ttAudioFirst)) : channel->Alang(0)), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        offset += OSDROWHEIGHT;
@@ -450,13 +454,16 @@ void cFemonOsd::DrawInfoWindow(void)
     else if (m_DisplayMode == eFemonModeAC3) {
        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);
-        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s - %s #%d %s", tr("Stream Information"), tr("AC-3 Stream"), IS_DOLBY_TRACK(track) ? channel->Dpid(int(track - ttDolbyFirst)) : channel->Dpid(0), IS_DOLBY_TRACK(track) ? channel->Dlang(int(track - ttDolbyFirst)) : channel->Dlang(0)), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
        if (IS_OSDCORNERING) {
           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
           }
        offset += OSDROWHEIGHT;
        if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("AC-3 Stream"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("#%d %s", channel->Dpid(int(track - ttDolbyFirst)), channel->Dlang(int(track - ttDolbyFirst))), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
+           offset += OSDROWHEIGHT;
           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%s (%s)", *getBitrateKbits(m_Receiver->AC3StreamBitrate()), *getBitrateKbits(m_Receiver->AC3Bitrate())), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
           offset += OSDROWHEIGHT;
@@ -482,7 +489,7 @@ void cFemonOsd::DrawInfoWindow(void)
           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3DolbySurroundMode(m_Receiver->AC3DolbySurroundMode()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
           offset += OSDROWHEIGHT;
           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%s", m_Receiver->AC3LfeOn() ? tr("On") : tr("Off")), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%s", m_Receiver->AC3LfeOn() ? tr("on") : tr("off")), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
           offset += OSDROWHEIGHT;
           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3DialogLevel(m_Receiver->AC3DialogLevel()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
@@ -689,11 +696,7 @@ bool cFemonOsd::DeviceSwitch(int direction)
           cDevice::GetDevice(device)->SwitchChannel(channel, true);
           if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
              cDevice::GetDevice(device)->ForceTransferMode();
-#if defined(APIVERSNUM) && APIVERSNUM < 10500
-           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
-#else
           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
-#endif
           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
           return (true);
           }
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -18,11 +18,7 @@
 #define PTS_DTS_FLAGS 0xC0

 cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
-#if defined(APIVERSNUM) && APIVERSNUM < 10500
-:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
-#else
 :cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
-#endif
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
  m_VideoPid = Vpid;
--- a/femontools.c
+++ b/femontools.c
@@ -164,6 +164,15 @@ cString getDpids(const cChannel *channel)
  return dpids;
 }

+cString getSpids(const cChannel *channel)
+{
+  int value = 0;
+  cString spids = cString::sprintf("%d", channel->Spid(value));
+  while (channel->Spid(++value) && (value < MAXSPIDS))
+    spids = cString::sprintf("%s, %d", *spids, channel->Spid(value));
+  return spids;
+}
+
 cString getCAids(const cChannel *channel, bool identify)
 {
  cString caids;
@@ -186,7 +195,7 @@ cString getCA(int value)
 {
  /* http://www.dvb.org/index.php?id=174 */
  switch (value) {
-    case 0x0000:            return cString::sprintf("%s", tr("Free to Air")); /* Reserved */
+    case 0x0000:            return cString::sprintf("%s", trVDR("Free To Air")); /* Reserved */
    case 0x0001 ... 0x009F:
    case 0x00A2 ... 0x00FF: return cString::sprintf("%s", tr("Fixed")); /* Standardized systems */
    case 0x00A0 ... 0x00A1: return cString::sprintf("%s", tr("Analog")); /* Analog signals */
@@ -208,7 +217,7 @@ cString getCA(int value)
 cString getCoderate(int value)
 {
  switch (value) {
-    case FEC_NONE: return cString::sprintf("%s", tr("None"));
+    case FEC_NONE: return cString::sprintf("%s", tr("none"));
    case FEC_1_2:  return cString::sprintf("1/2");
    case FEC_2_3:  return cString::sprintf("2/3");
    case FEC_3_4:  return cString::sprintf("3/4");
@@ -217,7 +226,7 @@ cString getCoderate(int value)
    case FEC_6_7:  return cString::sprintf("6/7");
    case FEC_7_8:  return cString::sprintf("7/8");
    case FEC_8_9:  return cString::sprintf("8/9");
-    case FEC_AUTO: return cString::sprintf("%s", tr("Auto"));
+    case FEC_AUTO: return cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -227,7 +236,7 @@ cString getTransmission(int value)
  switch (value) {
    case TRANSMISSION_MODE_2K:   return cString::sprintf("2K");
    case TRANSMISSION_MODE_8K:   return cString::sprintf("8K");
-    case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", tr("Auto"));
+    case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -238,7 +247,7 @@ cString getBandwidth(int value)
    case BANDWIDTH_8_MHZ: return cString::sprintf("8 %s", tr("MHz"));
    case BANDWIDTH_7_MHZ: return cString::sprintf("7 %s", tr("MHz"));
    case BANDWIDTH_6_MHZ: return cString::sprintf("6 %s", tr("MHz"));
-    case BANDWIDTH_AUTO:  return cString::sprintf("%s", tr("Auto"));
+    case BANDWIDTH_AUTO:  return cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -246,9 +255,9 @@ cString getBandwidth(int value)
 cString getInversion(int value)
 {
  switch (value) {
-    case INVERSION_OFF:  return cString::sprintf("%s", tr("Off"));
-    case INVERSION_ON:   return cString::sprintf("%s", tr("On"));
-    case INVERSION_AUTO: return cString::sprintf("%s", tr("Auto"));
+    case INVERSION_OFF:  return cString::sprintf("%s", tr("off"));
+    case INVERSION_ON:   return cString::sprintf("%s", tr("on"));
+    case INVERSION_AUTO: return cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -256,11 +265,11 @@ cString getInversion(int value)
 cString getHierarchy(int value)
 {
  switch (value) {
-    case HIERARCHY_NONE: return cString::sprintf("%s", tr("None"));
+    case HIERARCHY_NONE: return cString::sprintf("%s", tr("none"));
    case HIERARCHY_1:    return cString::sprintf("1");
    case HIERARCHY_2:    return cString::sprintf("2");
    case HIERARCHY_4:    return cString::sprintf("4");
-    case HIERARCHY_AUTO: cString::sprintf("%s", tr("Auto"));
+    case HIERARCHY_AUTO: cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -272,7 +281,7 @@ cString getGuard(int value)
    case GUARD_INTERVAL_1_16: return cString::sprintf("1/16");
    case GUARD_INTERVAL_1_8:  return cString::sprintf("1/8");
    case GUARD_INTERVAL_1_4:  return cString::sprintf("1/4");
-    case GUARD_INTERVAL_AUTO: cString::sprintf("%s", tr("Auto"));
+    case GUARD_INTERVAL_AUTO: cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -286,7 +295,7 @@ cString getModulation(int value)
    case QAM_64:   return cString::sprintf("QAM 64");
    case QAM_128:  return cString::sprintf("QAM 128");
    case QAM_256:  return cString::sprintf("QAM 256");
-    case QAM_AUTO: return cString::sprintf("QAM %s", tr("Auto"));
+    case QAM_AUTO: return cString::sprintf("QAM %s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -371,8 +380,8 @@ cString getAC3DolbySurroundMode(int value)
 {
  switch (value) {
    case DSM_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
-    case DSM_NOT_DOLBYSURROUND: return cString::sprintf("%s", tr("no"));
-    case DSM_DOLBYSURROUND:     return cString::sprintf("%s", tr("yes"));
+    case DSM_NOT_DOLBYSURROUND: return cString::sprintf("%s", trVDR("no"));
+    case DSM_DOLBYSURROUND:     return cString::sprintf("%s", trVDR("yes"));
    case DSM_RESERVED:          return cString::sprintf("%s", tr("reserved"));
    }
  return cString::sprintf("---");
--- a/femontools.h
+++ b/femontools.h
@@ -33,6 +33,7 @@ uint32_t getUNC(int cardIndex = 0);

 cString getApids(const cChannel *channel);
 cString getDpids(const cChannel *channel);
+cString getSpids(const cChannel *channel);
 cString getCAids(const cChannel *channel, bool identify = false);
 cString getCA(int value);
 cString getCoderate(int value);
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,519 +17,317 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "DVB Signal Informationsanzeige (OSD)"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signalinformationen"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr "Femon w<>hrend Wiedergabe nicht verf<72>gbar"

-#: femon.c:278
 msgid "basic"
 msgstr "Standard"

-#: femon.c:279
 msgid "transponder"
 msgstr "Transponder"

-#: femon.c:280
 msgid "stream"
 msgstr "Stream"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Klassischer"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Hauptmen<65>eintrag verstecken"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "nein"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "ja"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "Standard Anzeigemodus"

-#: femon.c:306
-msgid "Skin"
-msgstr "Oberfl<66>che"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "Thema"
-
-#: femon.c:308
 msgid "Position"
 msgstr "Position"

-#: femon.c:308
-msgid "bottom"
-msgstr "unten"
-
-#: femon.c:308
-msgid "top"
-msgstr "oben"
-
-#: femon.c:309
-msgid "Height"
-msgstr "H<>he"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Horizontaler Offset"

-#: femon.c:311
 msgid "Show CA system"
 msgstr "CA System anzeigen"

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Grenze Rot [%]"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "Grenze Gr<47>n [%]"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "OSD Updateintervall [0.1s]"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr "Stream analysieren"

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Berechnungsintervall [0.1s]"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr "SVDRP Service verwenden"

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr "SVDRP Service Port"

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr "SVDRP Service IP"

-#: femonosd.c:268
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Transponderinformation"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Satellitenkarte"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Frequenz"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Quelle"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Srate"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisation"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Kabelkarte"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulation"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Terrestrische Karte"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmission"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Bandbreite"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarchie"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Streaminformation"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Video Stream"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr "Bitrate"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Seitenverh<72>ltnis"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Bildrate"

-#: femonosd.c:426
 msgid "Hz"
 msgstr "Hz"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Bildformat"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Aufl<66>sung"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Audio Stream"

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr "MPEG Layer"

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "Abtastrate"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "AC-3 Stream"

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "kHz"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr "Frame Gr<47><72>e"

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Bitstream Modus"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Audiokodierung"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Center Mix Pegel"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Surround Mix Pegel"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Dolby Surround Modus"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "Tieft<66>ner Effekte"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Aus"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "Ein"

-#: femonosd.c:487
+msgid "off"
+msgstr "Aus"
+
 msgid "Dialogue Normalization"
 msgstr "Dialog Normalisierung"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "Frei empfangbar"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fest"

-#: femontools.c:192
 msgid "Analog"
 msgstr "Analog"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "none"
 msgstr "Nichts"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr "belegt"

-#: femontools.c:309
 msgid "unknown"
 msgstr "unbekannt"

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr "Complete Main (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Musik und Effekte (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Sehbehindert (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "H<>rbehindert (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Dialog (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Kommentar (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "Notfall (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "<22>berlagerte Stimme (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Kan1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Kan2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "L"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "R"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "SL"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "SR"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "nicht angegeben"

-#: femontools.c:408
 msgid "free"
 msgstr "frei"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,319 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Monitorizaci<63>n de la se<73>al DVB"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Monitorizaci<63>n de la se<73>al DVB"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr "B<>sico"

-#: femon.c:279
 msgid "transponder"
 msgstr "Transpondedor"

-#: femon.c:280
 msgid "stream"
 msgstr "Flujo"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Cl<43>sico"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Ocultar en el men<65> principal"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "no"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "s<>"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "Modo de visualizaci<63>n estandar"

-#: femon.c:306
-msgid "Skin"
-msgstr "Piel"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "Tema"
-
-#: femon.c:308
 msgid "Position"
 msgstr "Posici<63>n"

-#: femon.c:308
-msgid "bottom"
-msgstr "abajo"
-
-#: femon.c:308
-msgid "top"
-msgstr "arriba"
-
-#: femon.c:309
-msgid "Height"
-msgstr "Altura"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Desplazamiento horizontal"

-#: femon.c:311
 msgid "Show CA system"
 msgstr "Mostrar sistema CA"

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "L<>mite de rojo [%s]"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "L<>mite verde [%]"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "Intervalo de actualizaci<63>n (0,1)"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr "Analizar el flujo"

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Intervalo de c<>lculo (0,1s)"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Informaci<63>n del transpondedor"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "Acceso condicional (CA)"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Tarjeta Sat<61>lite"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Frecuencia"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Fuente"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "T.s<>mbolos"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarizaci<63>n"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Tarjeta Cable"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulaci<63>n"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Tarjeta TDT"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmisi<73>n"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Ancho de banda"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Jerarqu<71>a"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Int.Guarda"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Informaci<63>n del flujo"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Flujo de video"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr "Tasa de bits"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Proporciones de la imagen"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Tasa de frames"

-#: femonosd.c:426
 msgid "Hz"
 msgstr "Hz"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Formato de video"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Resoluci<63>n"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Flujo de audio"

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr "Nivel MPEG"

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "Frecuencia de muestreo"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "Flujo AC-3"

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "kHz"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr "Tama<6D>o de frame"

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Modo bitstream"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Modo de codificaci<63>n de audio"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Nivel sonoro central"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Nivel sonoro surround"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Nivel sonoro Dolby Surround"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "Efectos de baja frecuencia"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Off"
+msgid "on"
+msgstr "on"

-#: femonosd.c:485 femontools.c:250
-msgid "On"
-msgstr "On"
+msgid "off"
+msgstr "off"

-#: femonosd.c:487
 msgid "Dialogue Normalization"
 msgstr "Normalizaci<63>n del di<64>logo"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "Free to air"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fijo"

-#: femontools.c:192
 msgid "Analog"
 msgstr "Anal<61>gico"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+#, fuzzy
+msgid "none"
 msgstr "Ninguno"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+#, fuzzy
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr "reservado"

-#: femontools.c:309
 msgid "unknown"
 msgstr "desconocido"

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr "Principal (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "M<>sica y efectos (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Imagen deteriorada (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Hearing deteriorado"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Di<44>logo (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Comentario (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "Emergencia (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "Voz off (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Can. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Can. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "I"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "D"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "SI"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "SD"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "no indicado"

-#: femontools.c:408
 msgid "free"
 msgstr "libre"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,319 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "DVB Signaalmonitor (OSD)"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signaaliinfo"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr "standard"

-#: femon.c:279
 msgid "transponder"
 msgstr "transponder"

-#: femon.c:280
 msgid "stream"
 msgstr "voog"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Klassikaline"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Peida valik peamen<65><6E>s"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "ei"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "jah"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "Vaikimisi displei moodus"

-#: femon.c:306
-msgid "Skin"
-msgstr "Kest"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "Teema"
-
-#: femon.c:308
 msgid "Position"
 msgstr "Positsioon"

-#: femon.c:308
-msgid "bottom"
-msgstr "all"
-
-#: femon.c:308
-msgid "top"
-msgstr "<22>leval"
-
-#: femon.c:309
-msgid "Height"
-msgstr "K<>rgus"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Horisontaalne nihe"

-#: femon.c:311
 msgid "Show CA system"
 msgstr "N<>ita CA s<>steemi"

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Punase limiit [%]"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "Rohelise limiit [%]"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "Uuendusintervall [0,1s]"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr "Voo anal<61><6C>s"

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Kalkulatsiooni intervall [0,1s]"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Transponderi info"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Satelliidikaart"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Sagedus"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Allikas"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Srate"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisatsioon"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversioon"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Kaablikaart"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulatsioon"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Terrestiaalkaart"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmissioon"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Ribalaius"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarhia"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Voo info"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Videovoog"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr "Bitikiirus"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "K<>lgsuhe"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Kaadrisagedus"

-#: femonosd.c:426
 msgid "Hz"
 msgstr "Hz"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Videoformaat"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Resolutsioon"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Audiovoog"

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr "MPEG tase"

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "S<>mplimissagedus"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "AC-3 voog"

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "kHz"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr "Kaadri suurus"

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Bitivoo t<><74>p"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Audiokodeering"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Keskmise kanali tase"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Surround kanali tase"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Dolby Surround'i t<><74>p"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "LFE kanal"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "V<>ljas"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "Sees"

-#: femonosd.c:487
+msgid "off"
+msgstr "V<>ljas"
+
 msgid "Dialogue Normalization"
 msgstr "Dialoogi normalisatsioon"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "FTA"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fikseeritud"

-#: femontools.c:192
 msgid "Analog"
 msgstr ""

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+#, fuzzy
+msgid "none"
 msgstr "Ei"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+#, fuzzy
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr "reserveeritud"

-#: femontools.c:309
 msgid "unknown"
 msgstr "tundmatu"

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr "T<>iskomplekt (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Muusika ja efektid (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Vaegn<67>gemine (VE)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Vaegkuulmine (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Dialoog (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Kommentaar (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "H<>dateade (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "Pealer<65><72>kimine (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Kan. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Kan. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "L"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "R"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "SL"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "SR"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "m<>rkimata"

-#: femontools.c:408
 msgid "free"
 msgstr "vaba"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,317 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Signaalimittari (OSD)"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signaalimittari"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr "Signaalimittari ei ole k<>ytett<74>viss<73> toiston aikana"

-#: femon.c:278
 msgid "basic"
 msgstr "perus"

-#: femon.c:279
 msgid "transponder"
 msgstr "transponderi"

-#: femon.c:280
 msgid "stream"
 msgstr "l<>hete"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Klassinen"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Piilota valinta p<><70>valikosta"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "ei"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "kyll<6C>"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "Oletusn<73>ytt<74>tila"

-#: femon.c:306
-msgid "Skin"
-msgstr "Ulkoasu"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "Teema"
-
-#: femon.c:308
 msgid "Position"
 msgstr "Sijainti"

-#: femon.c:308
-msgid "bottom"
-msgstr "alareuna"
-
-#: femon.c:308
-msgid "top"
-msgstr "yl<79>reuna"
-
-#: femon.c:309
-msgid "Height"
-msgstr "Korkeus"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Vaakakeskitys"

-#: femon.c:311
 msgid "Show CA system"
 msgstr "N<>yt<79> salausj<73>rjestelm<6C>"

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Punaisen taso [%]"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "Vihre<72>n taso [%]"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "N<>yt<79>n p<>ivitysv<73>li [0.1s]"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr "L<>hetteen analysointi"

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Laskennan p<>ivitysv<73>li [0.1s]"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr "K<>yt<79> SVDRP-palvelua"

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr "SVDRP-palvelun portti"

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr "SVDRP-palvelun IP-osoite"

-#: femonosd.c:268
 msgid "Video"
 msgstr "Kuva"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "<22><>ni"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Transponderin tiedot"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Kuva-PID"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "PCR-PID"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "<22><>ni-PID"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dolby-PID"

-#: femonosd.c:321
-msgid "CA"
-msgstr "Salaus (CA)"
+msgid "Spid"
+msgstr "Tekstitys-PID"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Teksti-TV-PID"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Palvelu-ID"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Verkko-ID"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "L<>hete-ID"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Radio-ID"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Satelliittikortti"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Taajuus"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "L<>hde"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Symbolinopeus"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisaatio"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversio"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "Suojaustaso (HP)"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Kaapelikortti"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulaatio"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Terrestriaalikortti"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmissio"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Kaistanleveys"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Suojaustaso"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarkia"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Suojav<61>li"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "L<>hetteen tiedot"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Kuvaraita"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr "Bittinopeus"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Kuvasuhde"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Ruudunp<6E>ivitystaajuus"

-#: femonosd.c:426
 msgid "Hz"
 msgstr "Hz"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Kuvaformaatti"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Resoluutio"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "<22><>niraita"

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr "MPEG-taso"

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "N<>ytteenottotaajuus"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "AC-3-<2D><>niraita"

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "kHz"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr "Kehyksen koko"

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "L<>hetteen tyyppi"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "<22><>nikoodaus"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Keskikanavan taso"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Tehostekanavien taso"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Dolby Surround -tehoste"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "LFE-kanava"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "poissa"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "p<><70>ll<6C>"

-#: femonosd.c:487
+msgid "off"
+msgstr "poissa"
+
 msgid "Dialogue Normalization"
 msgstr "Dialogin normalisointi"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "salaamaton"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "kiinte<74>"

-#: femontools.c:192
 msgid "Analog"
 msgstr "analoginen"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "none"
 msgstr "ei"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr "varattu"

-#: femontools.c:309
 msgid "unknown"
 msgstr "tuntematon"

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr "P<><50>asiallinen (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Musiikki ja tehosteet (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "N<>k<EFBFBD>rajoitteinen (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Kuulorajoitteinen (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Vuoropuhelu (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Kommentointi (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "H<>t<EFBFBD>tiedote (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "P<><50>lle puhuttu (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "kan. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "kan. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "K"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "V"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "O"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "T"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "TV"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "TO"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "ei ilmaistu"

-#: femontools.c:408
 msgid "free"
 msgstr "vapaa"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Nicolas Huillard\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,317 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Affiche les informations du signal DVB"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signal DVB"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr "basique"

-#: femon.c:279
 msgid "transponder"
 msgstr "transpondeur"

-#: femon.c:280
 msgid "stream"
 msgstr "flux"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Classique"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Masquer dans le menu principal"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "non"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "oui"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "Affichage par d<>faut"

-#: femon.c:306
-msgid "Skin"
-msgstr "Skin"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "Th<54>me"
-
-#: femon.c:308
 msgid "Position"
 msgstr "Position"

-#: femon.c:308
-msgid "bottom"
-msgstr "bas"
-
-#: femon.c:308
-msgid "top"
-msgstr "haut"
-
-#: femon.c:309
-msgid "Height"
-msgstr "Hauteur"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "D<>placement horizontal"

-#: femon.c:311
 msgid "Show CA system"
 msgstr "Syst<73>me CA"

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "Limite du vert (%)"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "Intervalle de mise <20> jour (0,1s)"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr "Analyser le flux"

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Intervalle de calcul (0,1s)"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
 msgid "Video"
 msgstr "Vid<69>o"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Information transpondeur"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "PID Vid<69>o"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "Cryptage"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "PID T<>l<EFBFBD>texte"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Carte Satellite"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Fr<46>quence"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Source"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Fr<46>q. Symbole"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisation"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Carte C<>ble"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulation"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Carte TNT"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmission"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Bande passante"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hi<48>rarchie"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Information flux"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Flux vid<69>o"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr "Bitrate"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Proportions d'image"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Rafra<72>chissement"

-#: femonosd.c:426
 msgid "Hz"
 msgstr "Hz"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Standard vid<69>o"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "R<>solution"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Flux audio"

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr "MPEG Layer"

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "Fr<46>quence d'<27>chantillonage"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "Flux AC-3"

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "kHz"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr "Taille de paquet"

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Mode bitstream"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Mode de codage audio"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Niveau sonore milieu"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Niveau sonore surround"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Mode Dolby Surround"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "Effets de basses"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Non"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "Oui"

-#: femonosd.c:487
+msgid "off"
+msgstr "Non"
+
 msgid "Dialogue Normalization"
 msgstr "Normalisation des dialogues"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "Free To Air"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fixe"

-#: femontools.c:192
 msgid "Analog"
 msgstr "Analogique"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "none"
 msgstr "Aucun"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr "r<>serv<72>"

-#: femontools.c:309
 msgid "unknown"
 msgstr "inconnu"

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr "Principal (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Musique et effets (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Malvoyants (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Malentendants (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Dialogue (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Commentaires (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "Urgence (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "Voix off (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Can. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Can. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "Centre"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "Gauche"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "Droite"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "Surround"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "Surround gauche"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "Surround droit"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "non indiqu<71>"

-#: femontools.c:408
 msgid "free"
 msgstr "libre"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Sean Carlos\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,317 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Visualizza le informazioni sul segnale DVB"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Informazioni sul segnale"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr ""

-#: femon.c:279
 msgid "transponder"
 msgstr ""

-#: femon.c:280
 msgid "stream"
 msgstr ""

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr ""

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Nascondi voce men<65>"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "no"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "si"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "Modo di visualizzazione standard"

-#: femon.c:306
-msgid "Skin"
-msgstr "Stile interfaccia"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "Tema colori"
-
-#: femon.c:308
 msgid "Position"
 msgstr "Posizione"

-#: femon.c:308
-msgid "bottom"
-msgstr "in basso"
-
-#: femon.c:308
-msgid "top"
-msgstr "in alto"
-
-#: femon.c:309
-msgid "Height"
-msgstr "Altezza"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr ""

-#: femon.c:311
 msgid "Show CA system"
 msgstr ""

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "Limite de verde [%]"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "Intervallo di aggiornamento [0.1s]"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr ""

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Intervallo di calcolo [0.1s]"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Informazioni transponder"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "PID Video"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "PID Pcr"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "PID Teletext"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Scheda satellitare"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Frequenza"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Sorgente"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "SymbolRate"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarizzazione"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Scheda via cavo"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulation"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Scheda terrestre"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmission"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Banda passante"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarchy"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr ""

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr ""

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr ""

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr ""

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr ""

-#: femonosd.c:426
 msgid "Hz"
 msgstr "Hz"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr ""

-#: femonosd.c:431
 msgid "Resolution"
 msgstr ""

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr ""

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr ""

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr ""

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "kHz"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr ""

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr ""

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr ""

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr ""

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr ""

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr ""

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr ""

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Off"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "On"

-#: femonosd.c:487
+msgid "off"
+msgstr "Off"
+
 msgid "Dialogue Normalization"
 msgstr ""

-#: femontools.c:189
-msgid "Free to Air"
-msgstr ""
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr ""

-#: femontools.c:192
 msgid "Analog"
 msgstr ""

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr ""

-#: femontools.c:194
 msgid "Viaccess"
 msgstr ""

-#: femontools.c:195
 msgid "Irdeto"
 msgstr ""

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr ""

-#: femontools.c:197
 msgid "Conax"
 msgstr ""

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr ""

-#: femontools.c:199
 msgid "PowerVu"
 msgstr ""

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr ""

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr ""

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr ""

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "none"
 msgstr "None"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr ""

-#: femontools.c:309
 msgid "unknown"
 msgstr ""

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr ""

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr ""

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr ""

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr ""

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr ""

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr ""

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr ""

-#: femontools.c:326
-msgid "Karaoke"
-msgstr ""
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr ""

-#: femontools.c:335
+msgid "Karaoke"
+msgstr ""
+
 msgid "Ch1"
 msgstr ""

-#: femontools.c:335
 msgid "Ch2"
 msgstr ""

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr ""

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr ""

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr ""

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr ""

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr ""

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr ""

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr ""

-#: femontools.c:408
 msgid "free"
 msgstr ""

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2007-10-14 19:34+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,317 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:101
 msgid "Femon not available while replaying"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr ""

-#: femon.c:279
 msgid "transponder"
 msgstr ""

-#: femon.c:280
 msgid "stream"
 msgstr ""

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr ""

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "<22><><EFBFBD>"
-
-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "<22><>"
-
-#: femon.c:305
 msgid "Default display mode"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:306
-msgid "Skin"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:307
-msgid "Theme"
-msgstr "<22><><EFBFBD><EFBFBD>"
-
-#: femon.c:308
 msgid "Position"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"

-#: femon.c:308
-msgid "bottom"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:308
-msgid "top"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:309
-msgid "Height"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr ""

-#: femon.c:311
 msgid "Show CA system"
 msgstr ""

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)"

-#: femon.c:313
 msgid "Green limit [%]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)"

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)"

-#: femon.c:315
 msgid "Analyze stream"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)"

-#: femon.c:318
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
 msgid "Video"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid (<28><><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "<22><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr ""

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr ""

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
 msgstr ""

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr ""

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr ""

-#: femonosd.c:426
 msgid "Hz"
 msgstr "<22><>"

-#: femonosd.c:428
 msgid "Video Format"
 msgstr ""

-#: femonosd.c:431
 msgid "Resolution"
 msgstr ""

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr ""

-#: femonosd.c:440
 msgid "MPEG Layer"
 msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr ""

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr ""

-#: femonosd.c:464 femontools.c:400
 msgid "kHz"
 msgstr "ڳ<>"

-#: femonosd.c:466
 msgid "Frame Size"
 msgstr ""

-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr ""

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr ""

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr ""

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr ""

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr ""

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr ""

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "<22><><EFBFBD><EFBFBD>"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "<22><><EFBFBD>"

-#: femonosd.c:487
+msgid "off"
+msgstr "<22><><EFBFBD><EFBFBD>"
+
 msgid "Dialogue Normalization"
 msgstr ""

-#: femontools.c:189
-msgid "Free to Air"
-msgstr ""
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr ""

-#: femontools.c:192
 msgid "Analog"
 msgstr ""

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr ""

-#: femontools.c:194
 msgid "Viaccess"
 msgstr ""

-#: femontools.c:195
 msgid "Irdeto"
 msgstr ""

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr ""

-#: femontools.c:197
 msgid "Conax"
 msgstr ""

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr ""

-#: femontools.c:199
 msgid "PowerVu"
 msgstr ""

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr ""

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr ""

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr ""

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "none"
 msgstr "<22><><EFBFBD>"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "<22><><EFBFBD><EFBFBD>"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "<22><><EFBFBD>"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
 msgstr ""

-#: femontools.c:309
 msgid "unknown"
 msgstr ""

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
 msgid "Complete Main (CM)"
 msgstr ""

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr ""

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr ""

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr ""

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr ""

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr ""

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr ""

-#: femontools.c:326
-msgid "Karaoke"
-msgstr ""
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr ""

-#: femontools.c:335
+msgid "Karaoke"
+msgstr ""
+
 msgid "Ch1"
 msgstr ""

-#: femontools.c:335
 msgid "Ch2"
 msgstr ""

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr ""

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr ""

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr ""

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr ""

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr ""

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr ""

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr ""

-#: femontools.c:408
 msgid "free"
 msgstr ""

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "<22><><EFBFBD><EFBFBD>/<2F>"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "<22><><EFBFBD><EFBFBD>/<2F>"
Author	SHA1	Message	Date
Rolf Ahrenberg	d6e5a01ada	Added Spids support. Minor OSD layout changes.	2007-10-14 04:20:00 +03:00
Rolf Ahrenberg	c8c639be62	Updated for vdr-1.5.8.	2007-08-19 04:20:00 +03:00